[jboss-cvs] JBossAS SVN: r80862 - in trunk: bootstrap/src/main/org/jboss/bootstrap/spi and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 12 17:44:29 EST 2008
Author: dimitris at jboss.org
Date: 2008-11-12 17:44:29 -0500 (Wed, 12 Nov 2008)
New Revision: 80862
Modified:
trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java
trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java
trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java
trunk/build/build.xml
trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java
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/initialize.xml
trunk/server/src/etc/conf/default/jboss-service.xml
trunk/server/src/etc/conf/web/jboss-service.xml
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java
trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml
trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml
Log:
JBAS-6158, introduce jboss.common.base.url and jboss.common.lib.url defaulting to ${jboss.home.url}/common and ${jboss.common.base.url}/lib respectively
Common libraries moved to JBOSS_HOME/common/lib
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java 2008-11-12 22:44:29 UTC (rev 80862)
@@ -223,7 +223,7 @@
log.info("Server Temp Dir: " + config.getServerTempDir());
log.info("Server Config URL: " + config.getServerConfigURL());
log.info("Server Library URL: " + config.getServerLibraryURL());
- log.info("Shared Library URL: " + config.getSharedLibraryURL());
+ log.info("Common Library URL: " + config.getCommonLibraryURL());
log.info("Root Deployment Filename: " + config.getRootDeploymentFilename());
}
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java 2008-11-12 22:44:29 UTC (rev 80862)
@@ -80,7 +80,8 @@
private URL serverHomeURL;
private URL serverLibraryURL;
private URL serverConfigURL;
- private URL sharedLibraryURL;
+ private URL commonBaseURL;
+ private URL commonLibraryURL;
/** Exit on shutdown flag. */
private Boolean exitOnShutdown;
@@ -397,27 +398,48 @@
return serverLibraryURL;
}
- public URL getSharedLibraryURL()
+ public URL getCommonBaseURL()
{
- if (sharedLibraryURL == null)
+ if (commonBaseURL == null)
{
try
{
- sharedLibraryURL = getURL(ServerConfig.SHARED_LIBRARY_URL);
- if (sharedLibraryURL == null)
+ commonBaseURL = getURL(ServerConfig.COMMON_BASE_URL);
+ if (commonBaseURL == null)
{
- sharedLibraryURL = new URL(getServerBaseURL(), ServerConfig.LIBRARY_URL_SUFFIX);
+ commonBaseURL = new URL(getHomeURL(), ServerConfig.COMMON_BASE_URL_SUFFIX);
}
- System.setProperty(ServerConfig.SHARED_LIBRARY_URL, sharedLibraryURL.toString());
+ System.setProperty(ServerConfig.COMMON_BASE_URL, commonBaseURL.toString());
}
catch (MalformedURLException e)
{
throw new NestedRuntimeException(e);
}
}
- return sharedLibraryURL;
+ return commonBaseURL;
}
+ public URL getCommonLibraryURL()
+ {
+ if (commonLibraryURL == null)
+ {
+ try
+ {
+ commonLibraryURL = getURL(ServerConfig.COMMON_LIBRARY_URL);
+ if (commonLibraryURL == null)
+ {
+ commonLibraryURL = new URL(getCommonBaseURL(), ServerConfig.LIBRARY_URL_SUFFIX);
+ }
+ System.setProperty(ServerConfig.COMMON_LIBRARY_URL, commonLibraryURL.toString());
+ }
+ catch (MalformedURLException e)
+ {
+ throw new NestedRuntimeException(e);
+ }
+ }
+ return commonLibraryURL;
+ }
+
public URL getServerConfigURL()
{
if (serverConfigURL == null)
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java 2008-11-12 22:44:29 UTC (rev 80862)
@@ -216,15 +216,24 @@
/**
* Constant that holds the name of the environment property
- * for specifying a library directory shared by the various
- * server configurations.
+ * for specifying the base URL for files and directories
+ * common to different server configurations
*
- * <p>Defaults to <tt><em>SERVER_BASE_URL</em>/lib/</tt>.
+ * <p>Defaults to <tt><em>HOME_URL</em>/common/</tt>
*/
- String SHARED_LIBRARY_URL = "jboss.shared.lib.url";
+ String COMMON_BASE_URL = "jboss.common.base.url";
/**
* Constant that holds the name of the environment property
+ * for specifying a library directory URL that points to libraries
+ * shared by the various server configurations.
+ *
+ * <p>Defaults to <tt><em>COMMON_BASE_URL</em>/lib/</tt>
+ */
+ String COMMON_LIBRARY_URL = "jboss.common.lib.url";
+
+ /**
+ * Constant that holds the name of the environment property
* for specifying the bind address for all jboss services
*
*/
@@ -279,12 +288,17 @@
/////////////////////////////////////////////////////////////////////////
/**
- * The suffix used when generating the default value for {@link #LIBRARY_URL}
- * and {@link #SERVER_LIBRARY_URL}.
+ * The suffix used when generating the default value for {@link #LIBRARY_URL},
+ * {@link #COMMON_LIBRARY_URL} and {@link #SERVER_LIBRARY_URL}.
*/
String LIBRARY_URL_SUFFIX = "lib/";
/**
+ * The suffix used when generating the default value for {@link #COMMON_BASE_URL}
+ */
+ String COMMON_BASE_URL_SUFFIX = "common/";
+
+ /**
* The suffix used when generating the default value for {@link #SERVER_CONFIG_URL}.
*/
String SERVER_CONFIG_URL_SUFFIX = "conf/";
@@ -451,13 +465,20 @@
URL getServerConfigURL();
/**
- * Get the shared library URL.
+ * Get the common base URL.
*
- * @return Shared library URL.
+ * @return Common base URL.
*/
- URL getSharedLibraryURL();
+ URL getCommonBaseURL();
/**
+ * Get the common library URL.
+ *
+ * @return Common library URL.
+ */
+ URL getCommonLibraryURL();
+
+ /**
* Get the current value of the flag that indicates if we are
* using the platform MBeanServer as the main jboss server.
* Both the {@link ServerConfig#PLATFORM_MBEANSERVER}
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/build/build.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -272,8 +272,9 @@
<property name="install.web.deployers" value="${install.web}/deployers"/>
<property name="install.web.conf" value="${install.web}/conf"/>
- <!-- libs shared by the default/all configurations -->
- <property name="install.shared.lib" value="${install.server}/lib"/>
+ <!-- libs shared by the server configurations -->
+ <property name="install.common" value="${install.root}/common"/>
+ <property name="install.common.lib" value="${install.common}/lib"/>
<!-- Configuration for the nightly build and test job -->
<property name="run.nightly.sleep" value="1"/> <!-- 1 minute -->
@@ -706,8 +707,10 @@
-->
<target name="partition-build" depends="init">
- <!-- move to the shared library directory the jars common to default/all -->
- <move todir="${install.shared.lib}">
+ <!-- move to the common library directory the jars common to all configs;
+ the minimal config currently is not point to it
+ -->
+ <move todir="${install.common.lib}">
<fileset dir="${install.all.lib}">
<exclude name="avalon-framework.jar"/>
<exclude name="hibernate-jbosscache2.jar"/>
@@ -777,7 +780,7 @@
todir="${install.minimal.deploy}"
overwrite="true"/>
<copy todir="${install.minimal.lib}">
- <fileset dir="${install.shared.lib}">
+ <fileset dir="${install.common.lib}">
<include name="jnpserver.jar" />
<include name="log4j.jar" />
</fileset>
@@ -793,10 +796,6 @@
<include name="**"/>
<exclude name="jboss-service.xml"/>
</fileset>
- <fileset dir="${install.default.conf}">
- <include name="**"/>
- <exclude name="jboss-service.xml"/>
- </fileset>
<fileset dir="${project.root}/server/output/etc/conf/web">
<include name="jboss-service.xml"/>
</fileset>
Modified: trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java 2008-11-12 22:44:29 UTC (rev 80862)
@@ -203,11 +203,16 @@
return config.getServerLibraryURL();
}
- public URL getSharedLibraryURL()
+ public URL getCommonBaseURL()
{
- return config.getSharedLibraryURL();
+ return config.getCommonBaseURL();
}
+ public URL getCommonLibraryURL()
+ {
+ return config.getCommonLibraryURL();
+ }
+
public URL getServerConfigURL()
{
return config.getServerConfigURL();
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-12 19:54:03 UTC (rev 80861)
+++ trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -15,7 +15,7 @@
specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
- <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.common.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Log4j Initialization -->
Modified: trunk/server/src/etc/conf/default/bindings.xml
===================================================================
--- trunk/server/src/etc/conf/default/bindings.xml 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/server/src/etc/conf/default/bindings.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -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.shared.lib.url}jboss-bindingservice.jar</root>
+ <root>${jboss.common.lib.url}jboss-bindingservice.jar</root>
</classloader>
<bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
Modified: trunk/server/src/etc/conf/default/initialize.xml
===================================================================
--- trunk/server/src/etc/conf/default/initialize.xml 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/server/src/etc/conf/default/initialize.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -17,8 +17,8 @@
<property name="initializedVFSContexts">
<list elementClass="java.net.URL">
<value>${jboss.lib.url}</value>
- <value>${jboss.shared.lib.url}</value>
- <value>${jboss.server.lib.url}</value>
+ <value>${jboss.common.lib.url}</value>
+ <value>${jboss.server.lib.url}</value>
</list>
</property>
<property name="holdReference">true</property>
Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/server/src/etc/conf/default/jboss-service.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -13,7 +13,7 @@
specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
- <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.common.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Main Deployer -->
Modified: trunk/server/src/etc/conf/web/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/web/jboss-service.xml 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/server/src/etc/conf/web/jboss-service.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -13,7 +13,7 @@
specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
- <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.common.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Main Deployer -->
Modified: trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2008-11-12 22:44:29 UTC (rev 80862)
@@ -138,11 +138,16 @@
return config.getServerLibraryURL();
}
- public URL getSharedLibraryURL()
+ public URL getCommonBaseURL()
{
- return config.getSharedLibraryURL();
+ return config.getCommonBaseURL();
}
+ public URL getCommonLibraryURL()
+ {
+ return config.getCommonLibraryURL();
+ }
+
public File getServerLogDir()
{
return config.getServerLogDir();
Modified: trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java 2008-11-12 19:54:03 UTC (rev 80861)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java 2008-11-12 22:44:29 UTC (rev 80862)
@@ -115,11 +115,16 @@
URL getServerConfigURL();
/**
- * Get the shared library URL.
+ * Get the common base URL.
*/
- URL getSharedLibraryURL();
+ URL getCommonBaseURL();
/**
+ * Get the common library URL.
+ */
+ URL getCommonLibraryURL();
+
+ /**
* Get the current value of the flag that indicates if we are
* using the platform MBeanServer as the main jboss server.
* Both the {@link ServerConfig.PLATFORM_MBEANSERVER}
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-12 19:54:03 UTC (rev 80861)
+++ trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -13,7 +13,7 @@
specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
- <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.common.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-12 19:54:03 UTC (rev 80861)
+++ trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml 2008-11-12 22:44:29 UTC (rev 80862)
@@ -13,7 +13,7 @@
specific jars by specifying them in the archives attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
- <classpath codebase="${jboss.shared.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.common.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- JSR-77 Single JBoss Server Management Domain -->
More information about the jboss-cvs-commits
mailing list