[jboss-cvs] JBossAS SVN: r69001 - in projects/ejb3/trunk/ejb3-installer/src/main/resources: conf and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 15 19:26:21 EST 2008
Author: ALRubinger
Date: 2008-01-15 19:26:20 -0500 (Tue, 15 Jan 2008)
New Revision: 69001
Added:
projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-clustered.txt
projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt
projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-unjar-for-deploy.txt
projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt
Modified:
projects/ejb3/trunk/ejb3-installer/src/main/resources/build-install-ejb3-plugin.xml
Log:
Patch "deploy" directories, allow clustered/unclustered server names to be configurable
Modified: projects/ejb3/trunk/ejb3-installer/src/main/resources/build-install-ejb3-plugin.xml
===================================================================
--- projects/ejb3/trunk/ejb3-installer/src/main/resources/build-install-ejb3-plugin.xml 2008-01-15 22:43:15 UTC (rev 69000)
+++ projects/ejb3/trunk/ejb3-installer/src/main/resources/build-install-ejb3-plugin.xml 2008-01-16 00:26:20 UTC (rev 69001)
@@ -22,14 +22,28 @@
<!-- Configuration -->
<property name="installer.lib" value="${installer.home}/lib" />
+ <property name="installer.deploy" value="${installer.home}/deploy" />
<!-- Includefiles -->
<property name="file.jbossas.remove.includes" value="conf/jbossas-ejb3-files-to-remove.txt" />
<property name="file.jbossas.serverlib.includes" value="conf/jbossas-ejb3-files-to-place-in-serverlib.txt" />
<property name="file.jbossas.client.includes" value="conf/jbossas-ejb3-files-to-place-in-client.txt" />
+ <property name="file.jbossas.deploy.unclustered.includes" value="conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt" />
+ <property name="file.jbossas.deploy.clustered.includes" value="conf/jbossas-ejb3-files-to-place-in-deploy-clustered.txt" />
+ <property name="file.jbossas.unjar.deploy.includes" value="conf/jbossas-ejb3-files-to-unjar-for-deploy.txt" />
+ <property name="file.jbossas.patterns.deploy.includes" value="conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt" />
- <!-- Servers to patch -->
- <property name="servers" value="default;all" />
+ <!-- Servers to patch, semi-colon delimited -->
+ <property name="servers.unclustered" value="default" />
+ <property name="servers.clustered" value="all" />
+ <!--
+
+ Examples
+
+ <property name="servers.unclustered" value="default;my-server;my-server-2" />
+ <property name="servers.clustered" value="all;my-clustered-server;" />
+
+ -->
<!-- Optional Tasks =================================================================== -->
@@ -48,6 +62,7 @@
-->
<target name="init">
+ <!-- Ensure JBOSS_HOME is Set -->
<if>
<isset property="jboss.home" />
<then>
@@ -59,6 +74,7 @@
</else>
</if>
+ <!-- Ensure INSTALLER_HOME is Set -->
<if>
<isset property="installer.home" />
<then>
@@ -70,6 +86,12 @@
</else>
</if>
+ <!-- Make "deploy" directory -->
+ <mkdir dir="${installer.deploy}" />
+
+ <!-- Unpackage deployable files -->
+ <antcall target="unpackage-deployable-files" />
+
</target>
<!--
@@ -85,8 +107,16 @@
<antcall target="install-client" />
<!-- Copy all binaries to "lib" directory of each server -->
- <foreach list="${servers}" delimiter=";" param="serverName" target="install-libs" inheritall="true" />
+ <foreach list="${servers.unclustered}" delimiter=";" param="serverName" target="install-libs" inheritall="true" />
+ <foreach list="${servers.clustered}" delimiter=";" param="serverName" target="install-libs" inheritall="true" />
+ <!-- Copy all deployable files to "deploy" directory of each server -->
+ <foreach list="${servers.unclustered}" delimiter=";" param="serverName" target="install-deploy" inheritall="true" />
+ <foreach list="${servers.clustered}" delimiter=";" param="serverName" target="install-deploy" inheritall="true" />
+
+ <!-- Copy appropriate deployable files to "deploy" directory of cluster-enabled servers -->
+ <foreach list="${servers.clustered}" delimiter=";" param="serverName" target="install-deploy-clustered" inheritall="true" />
+
</target>
<!--
@@ -114,7 +144,7 @@
<echo>Installing EJB3 Binaries to "client" of ${jboss.home}</echo>
- <copy todir="${jboss.home}/client">
+ <copy todir="${jboss.home}/client" verbose="true">
<fileset dir="${installer.lib}" includesfile="${file.jbossas.client.includes}" />
</copy>
@@ -130,10 +160,56 @@
<echo>Installing EJB3 Binaries to "lib" of Server "${serverName}"</echo>
- <copy todir="${jboss.home}/server/${serverName}/lib">
+ <copy todir="${jboss.home}/server/${serverName}/lib" verbose="true">
<fileset dir="${installer.lib}" includesfile="${file.jbossas.serverlib.includes}" />
</copy>
</target>
+ <!--
+
+ Installs required files to the "deploy" directory of
+ the specified "serverName"
+
+ -->
+ <target name="install-deploy">
+
+ <echo>Installing EJB3 Deployables to "deploy" of Server "${serverName}"</echo>
+
+ <copy todir="${jboss.home}/server/${serverName}/deploy" verbose="true">
+ <fileset dir="${installer.deploy}" includesfile="${file.jbossas.deploy.unclustered.includes}" />
+ </copy>
+
+ </target>
+
+ <!--
+
+ Installs required files to the "deploy" directory
+ of the the specified "serverName"
+
+ -->
+ <target name="install-deploy-clustered">
+
+ <echo>Installing EJB3 Deployables to "deploy" of Server "${serverName}"</echo>
+
+ <copy todir="${jboss.home}/server/${serverName}/deploy/cluster" verbose="true">
+ <fileset dir="${installer.deploy}" includesfile="${file.jbossas.deploy.clustered.includes}" />
+ </copy>
+
+ </target>
+
+ <!--
+
+ Unpackages deployable files
+
+ -->
+ <target name="unpackage-deployable-files">
+
+ <unjar dest="${installer.deploy}">
+ <fileset dir="${installer.lib}" includesfile="${file.jbossas.unjar.deploy.includes}" />
+ <patternset includesfile="${file.jbossas.patterns.deploy.includes}" />
+ </unjar>
+
+ </target>
+
</project>
\ No newline at end of file
Added: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-clustered.txt
===================================================================
--- projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-clustered.txt (rev 0)
+++ projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-clustered.txt 2008-01-16 00:26:20 UTC (rev 69001)
@@ -0,0 +1,2 @@
+ejb3-clustered-sfsbcache-service.xml
+ejb3-clustered-sfsbcache-beans.xml
\ No newline at end of file
Property changes on: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-clustered.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt
===================================================================
--- projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt (rev 0)
+++ projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt 2008-01-16 00:26:20 UTC (rev 69001)
@@ -0,0 +1,3 @@
+ejb3-connectors-service.xml
+ejb3-interceptors-aop.xml
+ejb3-timer-service.xml
\ No newline at end of file
Property changes on: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-deploy-unclustered.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-unjar-for-deploy.txt
===================================================================
--- projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-unjar-for-deploy.txt (rev 0)
+++ projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-unjar-for-deploy.txt 2008-01-16 00:26:20 UTC (rev 69001)
@@ -0,0 +1 @@
+jboss-ejb3-core.jar
\ No newline at end of file
Property changes on: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-files-to-unjar-for-deploy.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt
===================================================================
--- projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt (rev 0)
+++ projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt 2008-01-16 00:26:20 UTC (rev 69001)
@@ -0,0 +1,2 @@
+*.xml
+META-INF/*.*
\ No newline at end of file
Property changes on: projects/ejb3/trunk/ejb3-installer/src/main/resources/conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the jboss-cvs-commits
mailing list