[jboss-cvs] JBossAS SVN: r80465 - in trunk: jbossmq/src/etc/server/examples/deploy/standalone and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 4 05:30:54 EST 2008
Author: dimitris at jboss.org
Date: 2008-11-04 05:30:54 -0500 (Tue, 04 Nov 2008)
New Revision: 80465
Modified:
trunk/build/build.xml
trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml
trunk/server/src/etc/conf/default/bindings.xml
trunk/server/src/etc/conf/default/jboss-minimal.xml
trunk/server/src/etc/conf/default/jboss-service.xml
trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml
trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml
trunk/testsuite/src/resources/test-configs/web-profile/conf/jboss-service.xml
Log:
JBAS-6158, move the jars shared between the default and all config into the new JBOSS_HOME/server/lib directory, pointed to at by the jboss.shared.lib.url system property
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/build/build.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -266,6 +266,9 @@
<property name="install.minimal.deployers" value="${install.minimal}/deployers"/>
<property name="install.minimal.conf" value="${install.minimal}/conf"/>
+ <!-- libs shared by the default/all configurations -->
+ <property name="install.shared.lib" value="${install.server}/lib"/>
+
<!-- Configuration for the nightly build and test job -->
<property name="run.nightly.sleep" value="1"/> <!-- 1 minute -->
<property name="run.nightly.email.tolist" value="jboss-development at lists.sourceforge.net"/>
@@ -697,38 +700,43 @@
-->
<target name="partition-build" depends="init">
- <!-- Copy server/all to server/default and then remove the services and
- jars outside of the scope of the default config -->
+ <!-- move to the shared library directory the jars common to default/all -->
+ <move todir="${install.shared.lib}">
+ <fileset dir="${install.all.lib}">
+ <exclude name="avalon-framework.jar"/>
+ <exclude name="hibernate-jbosscache2.jar"/>
+ <exclude name="jacorb.jar"/>
+ <exclude name="jbosscache-core.jar"/>
+ <exclude name="jbosscache-pojo.jar"/>
+ <exclude name="jgroups.jar"/>
+ </fileset>
+ </move>
+
+ <!-- Copy server/all to server/default and then remove the services
+ outside of the scope of the default config
+ -->
<copy todir="${install.default}">
<fileset dir="${install.all}">
<exclude name="data/**"/>
+ <exclude name="deploy-hasingleton/**"/>
+ <exclude name="farm/**"/>
+ <exclude name="lib/**"/>
<exclude name="log/**"/>
<exclude name="tmp/**"/>
<exclude name="work/**"/>
- <exclude name="deploy-hasingleton/**"/>
<exclude name="conf/jacorb.properties"/>
- <exclude name="lib/avalon-framework.jar"/>
- <exclude name="lib/jgroups.jar"/>
- <exclude name="lib/jacorb.jar"/>
- <exclude name="lib/jaxr-client.jar" />
- <exclude name="lib/jbosscache-core.jar"/>
- <exclude name="lib/jbosscache-pojo.jar"/>
- <exclude name="lib/hibernate-jbosscache2.jar"/>
- <exclude name="lib/jbossmqha.jar"/>
<exclude name="deploy/cluster/**"/>
<exclude name="deploy/iiop-service.xml"/>
- <exclude name="deploy/jbossweb-ejb.jar"/>
- <exclude name="deploy/jms/hajndi-jms-ds.xml"/>
<exclude name="deploy/deploy.last/**"/>
<exclude name="deploy/httpha-invoker.sar/**"/>
<exclude name="deploy/snmp-adaptor.sar/**"/>
- <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
- <exclude name="farm/**"/>
<exclude name="deploy/juddi-service.sar/**"/>
<exclude name="deploy/messaging/**"/>
- <exclude name="deploy/jms-ds.xml"/>
+ <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ <!-- leave the empty default/lib directory there -->
+ <mkdir dir="${install.default.lib}"/>
<copy todir="${install.default.conf}"
file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
@@ -760,7 +768,7 @@
<copy file="${install.default.conf}/jboss-minimal.xml"
tofile="${install.minimal.conf}/jboss-service.xml"/>
<copy todir="${install.minimal.lib}">
- <fileset dir="${install.default.lib}">
+ <fileset dir="${install.shared.lib}">
<include name="jnpserver.jar" />
<include name="log4j.jar" />
</fileset>
@@ -808,8 +816,7 @@
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
- <include name="wsdl4j.jar"/>
- -->
+ <include name="wsdl4j.jar"/> -->
<include name="jbossmqha.jar"/>
<include name="jmx-connector-client-factory.jar"/>
<include name="namespace.jar"/>
Modified: trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml
===================================================================
--- trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -10,11 +10,12 @@
<server>
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+ <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+ the shared JBOSS_HOME/server/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
+ -->
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Log4j Initialization -->
Modified: trunk/server/src/etc/conf/default/bindings.xml
===================================================================
--- trunk/server/src/etc/conf/default/bindings.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/server/src/etc/conf/default/bindings.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -5,7 +5,7 @@
<classloader><inject bean="bindings-classloader:0.0.0"/></classloader>
<classloader name="bindings-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <root>${jboss.server.lib.url}/jboss-bindingservice.jar</root>
+ <root>${jboss.shared.lib.url}/jboss-bindingservice.jar</root>
</classloader>
<bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
Modified: trunk/server/src/etc/conf/default/jboss-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-minimal.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/server/src/etc/conf/default/jboss-minimal.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -9,10 +9,10 @@
<server>
<!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
+ can be restricted to specific jars by specifying them in the archives
+ attribute.
-->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Log4j Initialization -->
Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/server/src/etc/conf/default/jboss-service.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -8,11 +8,12 @@
<server>
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+ <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+ the shared JBOSS_HOME/server/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
+ -->
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Main Deployer -->
Modified: trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml
===================================================================
--- trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -8,11 +8,12 @@
<server>
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+ <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+ the shared JBOSS_HOME/server/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
+ -->
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- JSR-77 Single JBoss Server Management Domain -->
Modified: trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml
===================================================================
--- trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -8,11 +8,12 @@
<server>
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+ <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+ the shared JBOSS_HOME/server/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
+ -->
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- JSR-77 Single JBoss Server Management Domain -->
Modified: trunk/testsuite/src/resources/test-configs/web-profile/conf/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/web-profile/conf/jboss-service.xml 2008-11-04 10:24:33 UTC (rev 80464)
+++ trunk/testsuite/src/resources/test-configs/web-profile/conf/jboss-service.xml 2008-11-04 10:30:54 UTC (rev 80465)
@@ -8,11 +8,12 @@
<server>
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+ <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+ the shared JBOSS_HOME/server/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
+ -->
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Main Deployer -->
More information about the jboss-cvs-commits
mailing list