Changeset 2714

Timestamp:

01/25/10 22:42:42

Author:

douglm

Message:

deploy target for jboss now copies sars and ear into a new deploy directory

Files:

• trunk/build/platforms/jbossService.xml (modified) (2 diffs)
• trunk/config/bwbuild/jboss/cal.properties (modified) (1 diff)
• trunk/deployment/build.xml (modified) (1 diff)
• trunk/deployment/dumprestore/shellscr/build.xml (modified) (2 diffs)
• trunk/deployment/indexer/shellscr/build.xml (modified) (2 diffs)
• trunk/deployment/sysevlog/shellscr/build.xml (modified) (2 diffs)

trunk/build/platforms/jbossService.xml

@@ -8 +8 @@
-        addExtras: add scripts for runnable versions and META-INF for
-                   jboss services etc.
+        deployService: deploy the service
-     =================================================================== -->
-
@@ -121 +122 @@
-    </copy>
-  </target>
+
+  <target name="deployService">
+    <!-- copy the sar - at the moment copy the uncompressed. -->
+
+    <if>
+      <isset property="org.bedework.appserver.deploy.dir" />
+      <then>
+        <property name="app.dest.home"
+                  location="${org.bedework.temp.shellscr.home}/${propval.app.zip.name}" />
+
+        <delete dir="${org.bedework.appserver.deploy.dir}/${propval.app.zip.name}.sar" />
+        <mkdir dir="${org.bedework.appserver.deploy.dir}/${propval.app.zip.name}.sar" />
+        <copy todir="${org.bedework.appserver.deploy.dir}/${propval.app.zip.name}.sar">
+          <fileset dir="${app.dest.home}"/>
+        </copy>
+      </then>
+    </if>
+  </target>
-</project>

trunk/config/bwbuild/jboss/cal.properties

@@ -112 +112 @@
-
-# where we deploy
-webapps
+bwdeploy
-
-#  where most library files used by all applications go

trunk/deployment/build.xml

@@ -228 +228 @@
-    <!-- copy startup website that sends you to the applications -->
-        <property name="startup.website.dir"
-s
+
-    <delete dir="${startup.website.dir}"/>
-    <mkdir dir="${startup.website.dir}"/>

trunk/deployment/dumprestore/shellscr/build.xml

@@ -7 +7 @@
-<project name="bwdumpres.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
-
-  <dirname property="this.dir" file="${ant.file}"/>
@@ -40 +42 @@
-
-  <target name="deploy" depends="init,build.configured" >
+    <antcall target="deployService" inheritRefs="true" />
-  </target>
-

trunk/deployment/indexer/shellscr/build.xml

@@ -7 +7 @@
-<project name="indexer.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
-
-  <dirname property="this.dir" file="${ant.file}"/>
@@ -40 +42 @@
-
-  <target name="deploy" depends="init,build.configured" >
+    <antcall target="deployService" inheritRefs="true" />
-  </target>
-

trunk/deployment/sysevlog/shellscr/build.xml

@@ -7 +7 @@
-<project name="bwcrawler.deploy" default="deploy" >
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" />
-
-  <dirname property="this.dir" file="${ant.file}"/>
@@ -40 +42 @@
-
-  <target name="deploy" depends="init,build.configured" >
+    <antcall target="deployService" inheritRefs="true" />
-  </target>
-