[jboss-cvs] JBossAS SVN: r80402 - in trunk: embedded/src/main/java/org/jboss/embedded/adapters and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 3 15:23:11 EST 2008
Author: dimitris at jboss.org
Date: 2008-11-03 15:23:10 -0500 (Mon, 03 Nov 2008)
New Revision: 80402
Modified:
trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java
trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java
trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java
trunk/main/src/main/org/jboss/system/server/ServerConfig.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java
Log:
JBAS-6158, inroduce a new jboss.shared.lib.url system property defaulting to ${jboss.server.base.url}/lib, i.e. JBOSS_HOME/server/lib
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java 2008-11-03 20:13:06 UTC (rev 80401)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java 2008-11-03 20:23:10 UTC (rev 80402)
@@ -236,6 +236,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("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-03 20:13:06 UTC (rev 80401)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java 2008-11-03 20:23:10 UTC (rev 80402)
@@ -49,10 +49,7 @@
* @author Scott.Stark at jboss.org
* @version <tt>$Revision: 41281 $</tt>
*/
-
-
-public class BaseServerConfig
- implements ServerConfig
+public class BaseServerConfig implements ServerConfig
{
/** The configuration properties to pull data from. */
private Properties props;
@@ -83,6 +80,7 @@
private URL serverHomeURL;
private URL serverLibraryURL;
private URL serverConfigURL;
+ private URL sharedLibraryURL;
/** Exit on shutdown flag. */
private Boolean exitOnShutdown;
@@ -399,6 +397,27 @@
return serverLibraryURL;
}
+ public URL getSharedLibraryURL()
+ {
+ if (sharedLibraryURL == null)
+ {
+ try
+ {
+ sharedLibraryURL = getURL(ServerConfig.SHARED_LIBRARY_URL);
+ if (sharedLibraryURL == null)
+ {
+ sharedLibraryURL = new URL(getServerBaseURL(), ServerConfig.LIBRARY_URL_SUFFIX);
+ }
+ System.setProperty(ServerConfig.SHARED_LIBRARY_URL, sharedLibraryURL.toString());
+ }
+ catch (MalformedURLException e)
+ {
+ throw new NestedRuntimeException(e);
+ }
+ }
+ return sharedLibraryURL;
+ }
+
public URL getServerConfigURL()
{
if (serverConfigURL == null)
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-03 20:13:06 UTC (rev 80401)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java 2008-11-03 20:23:10 UTC (rev 80402)
@@ -203,6 +203,11 @@
return config.getServerLibraryURL();
}
+ public URL getSharedLibraryURL()
+ {
+ return config.getSharedLibraryURL();
+ }
+
public URL getServerConfigURL()
{
return config.getServerConfigURL();
Modified: trunk/main/src/main/org/jboss/system/server/ServerConfig.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerConfig.java 2008-11-03 20:13:06 UTC (rev 80401)
+++ trunk/main/src/main/org/jboss/system/server/ServerConfig.java 2008-11-03 20:23:10 UTC (rev 80402)
@@ -29,6 +29,7 @@
*
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
* @author Scott.Stark at jboss.org
+ * @author Dimitris.Andreadis at jboss.org
* @version $Revision: 63730 $
*/
public interface ServerConfig
@@ -215,6 +216,15 @@
/**
* Constant that holds the name of the environment property
+ * for specifying a library directory shared by the various
+ * server configurations.
+ *
+ * <p>Defaults to <tt><em>SERVER_BASE_URL</em>/lib/</tt>.
+ */
+ String SHARED_LIBRARY_URL = "jboss.shared.lib.url";
+
+ /**
+ * Constant that holds the name of the environment property
* for specifying the bind address for all jboss services
*
*/
@@ -441,6 +451,13 @@
URL getServerConfigURL();
/**
+ * Get the shared library URL.
+ *
+ * @return Shared library URL.
+ */
+ URL getSharedLibraryURL();
+
+ /**
* 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/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2008-11-03 20:13:06 UTC (rev 80401)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2008-11-03 20:23:10 UTC (rev 80402)
@@ -31,8 +31,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class ServerConfigImpl
- implements ServerConfigImplMBean
+public class ServerConfigImpl implements ServerConfigImplMBean
{
private ServerConfig config;
@@ -137,6 +136,11 @@
return config.getServerLibraryURL();
}
+ public URL getSharedLibraryURL()
+ {
+ return config.getSharedLibraryURL();
+ }
+
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-03 20:13:06 UTC (rev 80401)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java 2008-11-03 20:23:10 UTC (rev 80402)
@@ -113,6 +113,11 @@
URL getServerConfigURL();
/**
+ * Get the shared library URL.
+ */
+ URL getSharedLibraryURL();
+
+ /**
* 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}
More information about the jboss-cvs-commits
mailing list