[jboss-cvs] JBossAS SVN: r80636 - in trunk: bootstrap/src/main/org/jboss/bootstrap and 36 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 7 05:56:05 EST 2008
Author: ALRubinger
Date: 2008-11-07 05:56:05 -0500 (Fri, 07 Nov 2008)
New Revision: 80636
Added:
trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Server.java
trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java
trunk/bootstrap/src/main/org/jboss/bootstrap/spi/util/
trunk/bootstrap/src/main/org/jboss/bootstrap/spi/util/ServerConfigUtil.java
Removed:
trunk/bootstrap/src/main/org/jboss/system/
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/Bootstrap.java
trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java
trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java
trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java
trunk/cluster/src/main/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java
trunk/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java
trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java
trunk/iiop/src/main/org/jboss/iiop/CorbaORBService.java
trunk/jbossmq/src/main/org/jboss/mq/il/http/HTTPServerILService.java
trunk/jbossmq/src/main/org/jboss/mq/il/uil2/UILServerILService.java
trunk/main/build.xml
trunk/main/src/main/org/jboss/Main.java
trunk/main/src/main/org/jboss/system/server/ServerLoader.java
trunk/management/src/main/org/jboss/management/j2ee/cluster/HAManagementService.java
trunk/server/src/main/org/jboss/Shutdown.java
trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
trunk/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
trunk/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java
trunk/server/src/main/org/jboss/invocation/pooled/server/PooledInvoker.java
trunk/server/src/main/org/jboss/web/WebService.java
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
trunk/system-jmx/src/main/org/jboss/deployment/SARDeployer.java
trunk/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java
trunk/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java
trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java
trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java
trunk/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java
trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
trunk/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java
trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
trunk/varia/src/main/org/jboss/services/binding/impl/Util.java
trunk/varia/src/main/org/jboss/services/deployment/DeploymentManager.java
trunk/varia/src/main/org/jboss/services/deployment/LibraryManager.java
trunk/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java
trunk/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingTestBase.java
Log:
[JBAS-6170] Update package names of refactored sources
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/AbstractServerImpl.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -37,10 +37,10 @@
import org.jboss.Version;
import org.jboss.bootstrap.spi.Bootstrap;
+import org.jboss.bootstrap.spi.Server;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.logging.Logger;
import org.jboss.net.protocol.URLStreamHandlerFactory;
-import org.jboss.system.server.Server;
-import org.jboss.system.server.ServerConfig;
import org.jboss.util.StopWatch;
/**
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -26,8 +26,8 @@
import java.net.URL;
import java.util.Properties;
-import org.jboss.system.server.Server;
-import org.jboss.system.server.ServerConfig;
+import org.jboss.bootstrap.spi.Server;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.util.NestedRuntimeException;
import org.jboss.util.Null;
import org.jboss.util.Primitives;
Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Bootstrap.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Bootstrap.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Bootstrap.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -21,7 +21,6 @@
*/
package org.jboss.bootstrap.spi;
-import org.jboss.system.server.Server;
/**
* Bootstrap.
Copied: trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Server.java (from rev 80627, trunk/bootstrap/src/main/org/jboss/system/server/Server.java)
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Server.java (rev 0)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/spi/Server.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -0,0 +1,141 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.bootstrap.spi;
+
+import java.util.Date;
+import java.util.Properties;
+
+/**
+ * The interface of the server loaded by the ServerLoader
+ * @see ServerLoader
+ *
+ * @author Jason Dillon
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 63730 $
+ */
+public interface Server
+{
+ /** The JMX notification event type sent on end of server startup */
+ public final String START_NOTIFICATION_TYPE = "org.jboss.system.server.started";
+ /** The JMX notification event type sent on begin of the server shutdown */
+ public final String STOP_NOTIFICATION_TYPE = "org.jboss.system.server.stopped";
+
+ /** @return The server start date */
+ Date getStartDate();
+
+ /** @return The server version */
+ String getVersion();
+
+ /** @return The server version code name */
+ String getVersionName();
+
+ /** @return The full server version number */
+ String getVersionNumber();
+
+ /** @return The date the server was build (compiled) */
+ String getBuildNumber();
+
+ /** @return The JVM used to build the server */
+ String getBuildJVM();
+
+ /** @return The Operating System used to build the server */
+ String getBuildOS();
+
+ /** @return The build id */
+ String getBuildID();
+
+ /** @return The date the server was build */
+ String getBuildDate();
+
+ /** @return A flag indicating if shutdown has been called */
+ boolean isInShutdown();
+
+ // Operations ----------------------------------------------------
+
+
+ /**
+ * Initialize the Server instance.
+ *
+ * @param props The configuration properties for the server.
+ *
+ * @throws IllegalStateException Already initialized.
+ * @throws Exception Failed to initialize.
+ */
+ void init(Properties props) throws IllegalStateException, Exception;
+
+ /**
+ * Get the typed server configuration object which the
+ * server has been initalized to use.
+ *
+ * @return Typed server configuration object.
+ *
+ * @throws IllegalStateException Not initialized.
+ */
+ ServerConfig getConfig() throws IllegalStateException;
+
+ /**
+ * Start the Server instance.
+ *
+ * @throws IllegalStateException Already started or not initialized.
+ * @throws Exception Failed to start.
+ */
+ void start() throws IllegalStateException, Exception;
+
+ /**
+ * Check if the server is started.
+ *
+ * @return True if the server is started, else false.
+ */
+ boolean isStarted();
+
+ /**
+ * Shutdown the Server instance and run shutdown hooks.
+ *
+ * <p>If the exit on shutdown flag is true, then {@link #exit()}
+ * is called, else only the shutdown hook is run.
+ *
+ * @throws IllegalStateException No started.
+ */
+ void shutdown() throws IllegalStateException;
+
+ /**
+ * Shutdown the server, the JVM and run shutdown hooks.
+ *
+ * @param exitcode The exit code returned to the operating system.
+ */
+ void exit(int exitcode);
+ /**
+ * Shutdown the server, the JVM and run shutdown hooks. Exits with code 1.
+ */
+ void exit();
+
+ /**
+ * Forcibly terminates the currently running Java virtual machine.
+ *
+ * @param exitcode The exit code returned to the operating system.
+ */
+ void halt(int exitcode);
+ /**
+ * Forcibly terminates the currently running Java virtual machine. Exits with code 1.
+ */
+ void halt();
+}
Copied: trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java (from rev 80627, trunk/bootstrap/src/main/org/jboss/system/server/ServerConfig.java)
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java (rev 0)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/spi/ServerConfig.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -0,0 +1,554 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bootstrap.spi;
+
+import java.io.File;
+import java.net.URL;
+
+/**
+ * The interface of the basic <em>typed</em> JBoss server configuration.
+ *
+ * @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
+{
+
+ /** The default partition name */
+ String DEFAULT_PARITION_NAME = "DefaultPartition";
+
+ /** The partition name property */
+ String PARTITION_NAME_PROPERTY = "jboss.partition.name";
+
+ /** The udp address property */
+ String PARTITION_UDP_PROPERTY = "jboss.partition.udpGroup";
+
+ /** The udp port property */
+ String PARTITION_UDP_PORT_PROPERTY = "jboss.jgroups.udp.mcast_port";
+
+ /** Whether to load native libraries */
+ String NATIVE_LOAD_PROPERTY = "jboss.native.load";
+
+ /** The location of native libraries property */
+ String NATIVE_DIR_PROPERTY = "jboss.native.dir";
+
+ /////////////////////////////////////////////////////////////////////////
+ // Bootstrap Specific Config //
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying a comma seperated list of the basenames of
+ * to the boot libraries required load the core system.
+ *
+ * <p>These libraries will be loaded from <tt>LIBRARY_URL</tt>.
+ */
+ String BOOT_LIBRARY_LIST = "jboss.boot.library.list";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the class type of the server to create.
+ */
+ String SERVER_TYPE = "jboss.server.type";
+
+ /**
+ * The bootstrap url
+ *
+ * <p>If not set then the server will default to {@link #SERVER_CONFIG_URL}/bootstrap.xml.
+ */
+ String BOOTSTRAP_URL = "jboss.bootstrap.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the root deployment filename (relative to the server
+ * config URL that will be deployed to finalize the boot strap process.
+ *
+ * <p>If not set then the server will default to {@link #DEFAULT_ROOT_DEPLOYMENT_FILENAME}.
+ */
+ String ROOT_DEPLOYMENT_FILENAME = "jboss.server.root.deployment.filename";
+
+
+ /////////////////////////////////////////////////////////////////////////
+ // Configuration Value Identifiers //
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the home directory for JBoss.
+ */
+ String HOME_DIR = "jboss.home.dir";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the home URL for JBoss.
+ *
+ * <p>If not set then the value of HOME_DIR will converted into a URL.
+ */
+ String HOME_URL = "jboss.home.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the URL where JBoss will read library files
+ * from.
+ *
+ * <p>Defaults to <tt><em>HOME_URL</em>/lib</tt>/
+ */
+ String LIBRARY_URL = "jboss.lib.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the URL where JBoss will read patch library files
+ * from.
+ *
+ * <p>If this value is a <tt>file</tt> URL, then all .zip and .jar files
+ * inside will be prepended to the classpath. Otherwise the URL will be
+ * added to the classpath. If not set then the no patch files will be
+ * loaded.
+ */
+ String PATCH_URL = "jboss.patch.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the name of the server which will be used to
+ * calculate the servers home directory and url.
+ *
+ * <p>Defaults to <tt>default</tt>.
+ */
+ String SERVER_NAME = "jboss.server.name";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the base directory for calculating server
+ * home directories.
+ *
+ * <p>Defaults to <tt><em>HOME_DIR</em>/server</tt>.
+ */
+ String SERVER_BASE_DIR = "jboss.server.base.dir";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the server home directory for JBoss.
+ *
+ * <p>Defaults to <tt><em>SERVER_BASE_DIR</em>/<em>SERVER_NAME</em></tt>.
+ */
+ String SERVER_HOME_DIR = "jboss.server.home.dir";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the server log directory for JBoss.
+ *
+ * <p>Defaults to <tt><em>SERVER_HOME_DIR</em>/<em>log</em></tt>.
+ */
+ String SERVER_LOG_DIR = "jboss.server.log.dir";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the directory which JBoss will use for
+ * temporary file storage.
+ *
+ * <p>Defaults to <tt><em>SERVER_HOME_DIR</em>/tmp</tt> .
+ */
+ String SERVER_TEMP_DIR = "jboss.server.temp.dir";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the directory which JBoss will use for
+ * persistent data file storage.
+ *
+ * <p>Defaults to <tt><em>SERVER_HOME_DIR</em>/data</tt>.
+ */
+ String SERVER_DATA_DIR = "jboss.server.data.dir";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the base URL for calculating server
+ * home URLs.
+ *
+ * <p>Defaults to <tt><em>HOME_URL</em>/server</tt>.
+ */
+ String SERVER_BASE_URL = "jboss.server.base.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the server home URL for JBoss.
+ *
+ * <p>Defaults to <tt><em>SERVER_BASE_URL</em>/<em>SERVER_NAME</em></tt>.
+ */
+ String SERVER_HOME_URL = "jboss.server.home.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the server configuration URL.
+ *
+ * <p>Defaults to <tt><em>SERVER_HOME_URL</em>/conf</tt> .
+ */
+ String SERVER_CONFIG_URL = "jboss.server.config.url";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying the URL where JBoss will read server specific
+ * library files from.
+ *
+ * <p>Defaults to <tt><em>SERVER_HOME_URL</em>/lib</tt>/
+ */
+ String SERVER_LIBRARY_URL = "jboss.server.lib.url";
+
+ /**
+ * 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
+ *
+ */
+ String SERVER_BIND_ADDRESS = "jboss.bind.address";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying whether or not the server should exit the
+ * JVM on shutdown.
+ *
+ * <p>If not set then the server will default to exiting on shutdown.
+ */
+ String EXIT_ON_SHUTDOWN = "jboss.server.exitonshutdown";
+
+ /**
+ * Constant that holds the name of the environment property for
+ * specifying whether or not the server should shutdown
+ * synchronously (true) or asynchronously (false).
+ *
+ * <p>If not set then the server will default to asynchronous shutdown.
+ */
+ String BLOCKING_SHUTDOWN = "jboss.server.blockingshutdown";
+
+ /**
+ * Constant that holds the name of the environment property
+ * for specifying whether or not to install the lifethread
+ *
+ * <p>If not set then the server will default to installing the lifethread.
+ */
+ String INSTALL_LIFE_THREAD = "jboss.server.lifethread";
+
+ /**
+ * Constant that holds the name of the environment property for
+ * specifying whether or not the server should log and ignore
+ * exceptions when setting the URLStreamHandlerFactory.
+ *
+ * <p>If not set then the server will default to asynchronous shutdown.
+ */
+ String REQUIRE_JBOSS_URL_STREAM_HANDLER_FACTORY = "jboss.server.requirejbossurlstreamhandlerfactory";
+
+ /**
+ * Constant that holds the name of the environment property for specifying
+ * whether or not to use as the main jboss server the MBeanServer returned
+ * from ManagementFactory.getPlatformMBeanServer(), when running under jdk1.5+
+ *
+ * <p>If not set then jboss will instantiate its own MBeanServer
+ */
+ String PLATFORM_MBEANSERVER = "jboss.platform.mbeanserver";
+
+ /////////////////////////////////////////////////////////////////////////
+ // Path Suffixes //
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * The suffix used when generating the default value for {@link #LIBRARY_URL}
+ * and {@link #SERVER_LIBRARY_URL}.
+ */
+ String LIBRARY_URL_SUFFIX = "lib/";
+
+ /**
+ * The suffix used when generating the default value for {@link #SERVER_CONFIG_URL}.
+ */
+ String SERVER_CONFIG_URL_SUFFIX = "conf/";
+
+ /**
+ * The suffix used when generating the default value for {@link #SERVER_BASE_DIR}.
+ */
+ String SERVER_BASE_DIR_SUFFIX = "server";
+
+ /**
+ * The suffix used when generating the default value for {@link #SERVER_BASE_URL}.
+ */
+ String SERVER_BASE_URL_SUFFIX = "server/";
+
+ /**
+ * The suffix used when generating the default value for {@link #SERVER_DATA_DIR}.
+ */
+ String SERVER_DATA_DIR_SUFFIX = "data";
+
+ /**
+ * The suffix used when generating the default value for {@link #SERVER_LOG_DIR}.
+ */
+ String SERVER_LOG_DIR_SUFFIX = "log";
+
+ /**
+ * The suffix used when generating the default value for {@link #SERVER_TEMP_DIR}.
+ */
+ String SERVER_TEMP_DIR_SUFFIX = "tmp";
+
+
+ /////////////////////////////////////////////////////////////////////////
+ // Defaults //
+ /////////////////////////////////////////////////////////////////////////
+
+ /** The default value for {@link #SERVER_NAME}. */
+ String DEFAULT_SERVER_NAME = "default";
+
+ /** The default value for {@link #EXIT_ON_SHUTDOWN}. */
+ boolean DEFAULT_EXIT_ON_SHUTDOWN = true;
+
+ /** The default value for {@link #BLOCKING_SHUTDOWN}. */
+ boolean DEFAULT_BLOCKING_SHUTDOWN = false;
+
+ /** The default value for {@link #INSTALL_LIFE_THREAD}. */
+ boolean DEFAULT_INSTALL_LIFE_THREAD = true;
+
+ /** The default value for {@link #REQUIRE_JBOSS_URL_STREAM_HANDLER_FACTORY}. */
+ boolean DEFAULT_REQUIRE_JBOSS_URL_STREAM_HANDLER_FACTORY = true;
+
+ /** The default value for {@link #PLATFORM_MBEANSERVER}. */
+ boolean DEFAULT_PLATFORM_MBEANSERVER = false;
+
+ /** The default value for {@link #ROOT_DEPLOYMENT_FILENAME}. */
+ String DEFAULT_ROOT_DEPLOYMENT_FILENAME = "jboss-service.xml";
+
+
+ /////////////////////////////////////////////////////////////////////////
+ // Typed Access Methods //
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Get the bootstrap url
+ *
+ * @return the bootstrap url
+ */
+ URL getBootstrapURL();
+
+ /**
+ * Get the local home directory which the server is running from.
+ *
+ * @return The local server home directory.
+ */
+ File getHomeDir();
+
+ /**
+ * Get the home URL which the server is running from.
+ *
+ * @return The home URL which the server is running from.
+ */
+ URL getHomeURL();
+
+ /**
+ * Get the library URL for the server.
+ *
+ * @return The library URL for the server.
+ */
+ URL getLibraryURL();
+
+ /**
+ * Get the patch URL for the server.
+ *
+ * @return The patch URL for the server.
+ */
+ URL getPatchURL();
+
+ /**
+ * Get the name of the server.
+ *
+ * @return The name of the server.
+ */
+ String getServerName();
+
+ /**
+ * Get the base directory for calculating server home directories.
+ *
+ * @return Base server home directory.
+ */
+ File getServerBaseDir();
+
+ /**
+ * Get the server home directory.
+ *
+ * @return Server home directory.
+ */
+ File getServerHomeDir();
+
+ /**
+ * Get the directory where log files will be stored.
+ *
+ * @return The directory where the server writes log files.
+ */
+ File getServerLogDir();
+
+ /**
+ * Get the directory where temporary files will be stored.
+ *
+ * @return The directory where the server stores temporary files.
+ */
+ File getServerTempDir();
+
+ /**
+ * Get the directory where local data will be stored.
+ *
+ * @return The directory where the server stores local data.
+ */
+ File getServerDataDir();
+
+ /**
+ * Get the base directory for calculating server home URLs.
+ *
+ * @return Base server home URL.
+ */
+ URL getServerBaseURL();
+
+ /**
+ * Get the server home URL.
+ *
+ * @return Server home URL.
+ */
+ URL getServerHomeURL();
+
+ /**
+ * Get the server library URL.
+ *
+ * @return Server library URL.
+ */
+ URL getServerLibraryURL();
+
+ /**
+ * Get the server configuration URL.
+ *
+ * @return Server configuration URL.
+ */
+ 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}
+ * property must be set, and the jvm must be jdk1.5+
+ *
+ * @return true if jboss runs on the jvm platfrom MBeanServer
+ */
+ boolean getPlatformMBeanServer();
+
+ /**
+ * Enable or disable exiting the JVM when {@link Server#shutdown()} is called.
+ * If enabled, then shutdown calls {@link Server#exit()}. If disabled, then
+ * only the shutdown hook will be run.
+ *
+ * @param flag True to enable calling exit on shutdown.
+ */
+ void setExitOnShutdown(boolean flag);
+
+ /**
+ * Get the current value of the exit on shutdown flag.
+ *
+ * @return The current value of the exit on shutdown flag.
+ */
+ boolean getExitOnShutdown();
+
+
+ /**
+ * Get the BlockingShutdown value.
+ * @return the BlockingShutdown value.
+ */
+ boolean getBlockingShutdown();
+
+ /**
+ * Set the BlockingShutdown value.
+ * @param blockingShutdown The new BlockingShutdown value.
+ */
+ void setBlockingShutdown(boolean blockingShutdown);
+
+ /**
+ * Whether to install the lifethread
+ *
+ * @return true to install the life thread
+ */
+ boolean isInstallLifeThread();
+
+ /**
+ * Get the RequireJBossURLStreamHandlerFactory value.
+ * @return the RequireJBossURLStreamHandlerFactory value.
+ */
+ boolean getRequireJBossURLStreamHandlerFactory();
+
+ /**
+ * Set the RequireJBossURLStreamHandlerFactory value.
+ * @param requireJBossURLStreamHandlerFactory The new RequireJBossURLStreamHandlerFactory value.
+ */
+ void setRequireJBossURLStreamHandlerFactory(boolean requireJBossURLStreamHandlerFactory);
+
+ /**
+ * Set the filename of the root deployable that will be used to finalize
+ * the bootstrap process.
+ *
+ * @param filename The filename of the root deployable.
+ */
+ void setRootDeploymentFilename(String filename);
+
+ /**
+ * Get the filename of the root deployable that will be used to finalize
+ * the bootstrap process.
+ *
+ * @return The filename of the root deployable.
+ */
+ String getRootDeploymentFilename();
+
+ /**
+ * Get the native dir for unpacking
+ *
+ * @return the directory
+ */
+ File getServerNativeDir();
+
+ /**
+ * Get the temporary deployment dir for unpacking
+ *
+ * @return the directory
+ */
+ File getServerTempDeployDir();
+
+ /**
+ * Get the server Specification-Version
+ *
+ * @return the spec version
+ */
+ String getSpecificationVersion();
+}
Copied: trunk/bootstrap/src/main/org/jboss/bootstrap/spi/util/ServerConfigUtil.java (from rev 80627, trunk/bootstrap/src/main/org/jboss/system/server/ServerConfigUtil.java)
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/spi/util/ServerConfigUtil.java (rev 0)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/spi/util/ServerConfigUtil.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -0,0 +1,148 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.bootstrap.spi.util;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.jboss.bootstrap.spi.ServerConfig;
+
+/**
+ * Utilities for accessing server configuration
+ *
+ * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
+ * @version <tt>$Revision: 57108 $</tt>
+ */
+public class ServerConfigUtil
+{
+ private static final String ANY = "0.0.0.0";
+
+ /**
+ * Retrieve the default bind address for the server
+ *
+ * @return the default bind adress
+ */
+ public static String getDefaultBindAddress()
+ {
+ return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
+ }
+
+ /**
+ * Retrieve the default bind address, but only if it is specific
+ *
+ * @return the specific bind address
+ */
+ public static String getSpecificBindAddress()
+ {
+ String address = System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
+ if (address == null || address.equals(ANY))
+ return null;
+ return address;
+ }
+
+ /**
+ * Fix the remote inet address.
+ *
+ * If we pass the address to the client we don't want to
+ * tell it to connect to 0.0.0.0, use our host name instead
+ * @param address the passed address
+ * @return the fixed address
+ */
+ public static InetAddress fixRemoteAddress(InetAddress address)
+ {
+ try
+ {
+ if (address == null || InetAddress.getByName(ANY).equals(address))
+ return InetAddress.getLocalHost();
+ }
+ catch (UnknownHostException ignored)
+ {
+ }
+ return address;
+ }
+
+ /**
+ * Fix the remote address.
+ *
+ * If we pass the address to the client we don't want to
+ * tell it to connect to 0.0.0.0, use our host name instead
+ * @param address the passed address
+ * @return the fixed address
+ */
+ public static String fixRemoteAddress(String address)
+ {
+ try
+ {
+ if (address == null || ANY.equals(address))
+ return InetAddress.getLocalHost().getHostName();
+ }
+ catch (UnknownHostException ignored)
+ {
+ }
+ return address;
+ }
+
+ /**
+ * Get the default partition name
+ *
+ * @return the default partition name
+ */
+ public static String getDefaultPartitionName()
+ {
+ return System.getProperty(ServerConfig.PARTITION_NAME_PROPERTY, ServerConfig.DEFAULT_PARITION_NAME);
+ }
+
+ /**
+ * Whether to load native directories
+ *
+ * @return true when loading native directories
+ */
+ public static boolean isLoadNative()
+ {
+ return Boolean.getBoolean(ServerConfig.NATIVE_LOAD_PROPERTY);
+ }
+
+ /**
+ * Utility to get a shortened url relative to the server home if possible
+ *
+ * @param longUrl
+ * @return the short url
+ */
+ public static String shortUrlFromServerHome(String longUrl)
+ {
+ String serverHomeUrl = System.getProperty(org.jboss.bootstrap.spi.ServerConfig.SERVER_HOME_URL);
+
+ if (longUrl == null || serverHomeUrl == null)
+ return longUrl;
+
+ if (longUrl.startsWith(serverHomeUrl))
+ return ".../" + longUrl.substring(serverHomeUrl.length());
+ else
+ {
+ String jarServerHomeUrl = "jar:" + serverHomeUrl;
+ if (longUrl.startsWith(jarServerHomeUrl))
+ return ".../" + longUrl.substring(jarServerHomeUrl.length());
+ else
+ return longUrl;
+ }
+ }
+}
Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -46,6 +46,7 @@
import javax.naming.Reference;
import javax.naming.StringRefAddr;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.ha.framework.interfaces.ClusterNode;
import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
import org.jboss.ha.framework.interfaces.DistributedState;
@@ -62,7 +63,6 @@
import org.jboss.logging.Logger;
import org.jboss.naming.NonSerializableFactory;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.threadpool.ThreadPool;
import org.jgroups.Address;
import org.jgroups.Channel;
Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -26,10 +26,10 @@
import java.net.URL;
import java.util.*;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployment.Deployer;
import org.jboss.deployment.scanner.URLDeploymentScanner;
import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
/**
Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -37,9 +37,9 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.logging.Logger;
import org.jboss.system.ServiceMBean;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.loading.ContextClassLoaderSwitcher;
import org.jgroups.Channel;
import org.jgroups.ChannelException;
Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -30,12 +30,12 @@
import javax.naming.InitialContext;
import org.apache.log4j.MDC;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.ha.framework.interfaces.HAPartition.AsynchHAMembershipListener;
import org.jboss.ha.framework.server.HAPartitionLocator;
import org.jboss.logging.Logger;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
/** A cluster parition membership monitor. It can be used to view how
the nodes in a cluster are seeing the topology change using either email or
Modified: trunk/cluster/src/main/org/jboss/invocation/http/server/HttpProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/cluster/src/main/org/jboss/invocation/http/server/HttpProxyFactoryHA.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -32,7 +32,7 @@
import org.jboss.invocation.InvokerInterceptor;
import org.jboss.invocation.http.interfaces.ClientMethodInterceptorHA;
import org.jboss.invocation.http.interfaces.HttpInvokerProxyHA;
-import org.jboss.system.server.ServerConfigUtil;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.ha.framework.server.HAPartitionLocator;
Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -42,6 +42,7 @@
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.work.WorkManager;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.resource.deployment.ActivationSpecFactory;
import org.jboss.resource.deployment.ResourceAdapterFactory;
@@ -52,7 +53,6 @@
import org.jboss.resource.metadata.DescriptionGroupMetaData;
import org.jboss.resource.metadata.MessageListenerMetaData;
import org.jboss.system.ServiceDynamicMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
/**
* A resource adapter deployment
Modified: trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -39,6 +39,7 @@
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.work.WorkManager;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.resource.metadata.ConfigPropertyMetaData;
@@ -48,7 +49,6 @@
import org.jboss.resource.metadata.MessageListenerMetaData;
import org.jboss.resource.metadata.RARDeploymentMetaData;
import org.jboss.system.ServiceDynamicMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
/**
* A resource adapter deployment
Modified: trunk/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java
===================================================================
--- trunk/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/console/src/main/org/jboss/console/manager/DeploymentFileRepository.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -29,8 +29,8 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
/**
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-07 10:53:46 UTC (rev 80635)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -36,7 +36,7 @@
* @author <a href="bill at jboss.com">Bill Burke</a>
* @version $Revision: 1.1 $
*/
-public class ServerConfig implements org.jboss.system.server.ServerConfig
+public class ServerConfig implements org.jboss.bootstrap.spi.ServerConfig
{
protected BaseServerConfig config;
protected Properties props;
Modified: trunk/iiop/src/main/org/jboss/iiop/CorbaORBService.java
===================================================================
--- trunk/iiop/src/main/org/jboss/iiop/CorbaORBService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/iiop/src/main/org/jboss/iiop/CorbaORBService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -33,13 +33,13 @@
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.iiop.naming.ORBInitialContextFactory;
import org.jboss.metadata.MetaData;
import org.jboss.proxy.ejb.handle.HandleDelegateImpl;
import org.jboss.security.SecurityDomain;
import org.jboss.system.Registry;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
import org.omg.CORBA.ORB;
import org.omg.CORBA.Policy;
import org.omg.PortableServer.IdAssignmentPolicy;
Modified: trunk/jbossmq/src/main/org/jboss/mq/il/http/HTTPServerILService.java
===================================================================
--- trunk/jbossmq/src/main/org/jboss/mq/il/http/HTTPServerILService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/jbossmq/src/main/org/jboss/mq/il/http/HTTPServerILService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -24,9 +24,9 @@
import java.net.InetAddress;
import java.util.Properties;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.mq.il.ServerIL;
import org.jboss.mq.il.ServerILJMXService;
-import org.jboss.system.server.ServerConfigUtil;
/**
* Implements the ServerILJMXService which is used to manage the HTTP/S IL.
Modified: trunk/jbossmq/src/main/org/jboss/mq/il/uil2/UILServerILService.java
===================================================================
--- trunk/jbossmq/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/jbossmq/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -33,13 +33,13 @@
import javax.naming.InitialContext;
import javax.net.ServerSocketFactory;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.mq.il.Invoker;
import org.jboss.mq.il.ServerIL;
import org.jboss.mq.il.ServerILJMXService;
import org.jboss.mq.il.uil2.msgs.BaseMsg;
import org.jboss.mq.il.uil2.msgs.MsgTypes;
import org.jboss.security.SecurityDomain;
-import org.jboss.system.server.ServerConfigUtil;
import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/main/build.xml 2008-11-07 10:56:05 UTC (rev 80636)
@@ -174,9 +174,9 @@
</fileset>
<!-- Add some classes from Bootstrap -->
<fileset dir="${inflated.dir}">
- <include name="org/jboss/system/server/Server.class"/>
- <include name="org/jboss/system/server/ServerConfig.class"/>
- <include name="org/jboss/system/server/ServerConfigUtil.class"/>
+ <include name="org/jboss/bootstrap/spi/Server.class"/>
+ <include name="org/jboss/bootstrap/spi/ServerConfig.class"/>
+ <include name="org/jboss/bootstrap/spi/util/ServerConfigUtil.class"/>
</fileset>
<!-- Include getopt -->
Modified: trunk/main/src/main/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/org/jboss/Main.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/main/src/main/org/jboss/Main.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -33,9 +33,9 @@
import java.util.List;
import java.util.Properties;
-import org.jboss.system.server.Server;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigUtil;
+import org.jboss.bootstrap.spi.Server;
+import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.system.server.ServerLoader;
/**
Modified: trunk/main/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerLoader.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/main/src/main/org/jboss/system/server/ServerLoader.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -32,6 +32,8 @@
import java.util.Properties;
import java.util.StringTokenizer;
+import org.jboss.bootstrap.spi.Server;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.system.NoAnnotationURLClassLoader;
/**
Modified: trunk/management/src/main/org/jboss/management/j2ee/cluster/HAManagementService.java
===================================================================
--- trunk/management/src/main/org/jboss/management/j2ee/cluster/HAManagementService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/management/src/main/org/jboss/management/j2ee/cluster/HAManagementService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -45,11 +45,11 @@
import javax.management.QueryExp;
import javax.management.ReflectionException;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.management.j2ee.J2EEDomain;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
/**
* This class enables a client to get a management view (JSR-77) on a
Modified: trunk/server/src/main/org/jboss/Shutdown.java
===================================================================
--- trunk/server/src/main/org/jboss/Shutdown.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/Shutdown.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -38,8 +38,8 @@
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
+import org.jboss.bootstrap.spi.Server;
import org.jboss.naming.HttpNamingContextFactory;
-import org.jboss.system.server.Server;
import org.jboss.system.server.ServerImplMBean;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -23,13 +23,13 @@
import java.net.URL;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.system.server.ServerConfig;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
Modified: trunk/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -31,13 +31,13 @@
import javax.naming.NamingException;
import javax.transaction.Transaction;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.MarshalledInvocation;
import org.jboss.invocation.http.interfaces.HttpInvokerProxy;
import org.jboss.system.Registry;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.StringPropertyReplacer;
/**
Modified: trunk/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -28,6 +28,7 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.InvokerInterceptor;
import org.jboss.invocation.http.interfaces.HttpInvokerProxy;
@@ -36,7 +37,6 @@
import org.jboss.proxy.GenericProxyFactory;
import org.jboss.system.Registry;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.metadata.MetaData;
import org.w3c.dom.Element;
Modified: trunk/server/src/main/org/jboss/invocation/pooled/server/PooledInvoker.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/pooled/server/PooledInvoker.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/invocation/pooled/server/PooledInvoker.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -38,6 +38,7 @@
import javax.net.SocketFactory;
import javax.net.ServerSocketFactory;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.pooled.interfaces.PooledInvokerProxy;
import org.jboss.invocation.pooled.interfaces.ServerAddress;
@@ -46,7 +47,6 @@
import org.jboss.proxy.TransactionInterceptor;
import org.jboss.system.Registry;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.tm.TransactionPropagationContextFactory;
import org.jboss.tm.TransactionPropagationContextImporter;
import org.jboss.tm.TransactionPropagationContextUtil;
Modified: trunk/server/src/main/org/jboss/web/WebService.java
===================================================================
--- trunk/server/src/main/org/jboss/web/WebService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/web/WebService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -30,9 +30,9 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.threadpool.BasicThreadPoolMBean;
/**
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -34,6 +34,7 @@
import javax.management.ObjectName;
import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AttachmentLocator;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -54,7 +55,6 @@
import org.jboss.system.metadata.ServiceDependencyMetaData;
import org.jboss.system.metadata.ServiceInjectionValueMetaData;
import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.file.Files;
import org.jboss.util.file.JarUtils;
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -166,7 +166,7 @@
*/
public static String shortWarUrlFromServerHome(String warUrl)
{
- String serverHomeUrl = System.getProperty(org.jboss.system.server.ServerConfig.SERVER_HOME_URL);
+ String serverHomeUrl = System.getProperty(org.jboss.bootstrap.spi.ServerConfig.SERVER_HOME_URL);
if (warUrl == null || serverHomeUrl == null)
return warUrl;
Modified: trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -25,6 +25,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.jboss.bootstrap.spi.Bootstrap;
+import org.jboss.bootstrap.spi.Server;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.client.spi.IncompleteDeploymentException;
import org.jboss.deployers.client.spi.main.MainDeployer;
@@ -38,7 +39,6 @@
import org.jboss.profileservice.spi.Profile;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
-import org.jboss.system.server.Server;
/**
* Bootstraps the profile service
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -27,6 +27,7 @@
import org.jboss.Main;
import org.jboss.bootstrap.microcontainer.ServerImpl;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.client.spi.main.MainDeployer;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
@@ -37,7 +38,6 @@
import org.jboss.profileservice.spi.Profile;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
-import org.jboss.system.server.ServerConfig;
import org.jboss.test.BaseTestCase;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -26,11 +26,11 @@
import org.jboss.Main;
import org.jboss.bootstrap.microcontainer.ServerImpl;
+import org.jboss.bootstrap.spi.Server;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.system.server.Server;
import org.jboss.test.BaseTestCase;
/**
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -50,6 +50,7 @@
import javax.management.Notification;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentContext;
@@ -59,7 +60,6 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.file.Files;
import org.jboss.util.file.JarUtils;
Modified: trunk/system-jmx/src/main/org/jboss/deployment/SARDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/SARDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/deployment/SARDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -43,13 +43,13 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.mx.loading.LoaderRepositoryFactory;
import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.net.protocol.URLLister;
import org.jboss.net.protocol.URLListerFactory;
import org.jboss.system.ServiceControllerMBean;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.Strings;
Modified: trunk/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/deployment/SubDeployerSupport.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -34,11 +34,11 @@
import javax.management.Notification;
+import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.file.JarUtils;
import org.jboss.util.stream.Streams;
Modified: trunk/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/deployment/XSLSubDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -37,8 +37,8 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
+import org.jboss.bootstrap.spi.util.ServerConfigUtil;
import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.system.server.ServerConfigUtil;
import org.jboss.util.xml.DOMWriter;
import org.jboss.util.xml.JBossEntityResolver;
import org.jboss.util.xml.JBossErrorHandler;
Modified: trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -39,13 +39,13 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployment.DefaultDeploymentSorter;
import org.jboss.deployment.IncompleteDeploymentException;
import org.jboss.mx.util.JMXExceptionDecoder;
import org.jboss.net.protocol.URLLister;
import org.jboss.net.protocol.URLListerFactory;
import org.jboss.net.protocol.URLLister.URLFilter;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.NullArgumentException;
import org.jboss.util.StringPropertyReplacer;
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -34,7 +35,6 @@
import org.jboss.system.metadata.ServiceDeploymentClassPath;
import org.jboss.system.metadata.ServiceDeploymentParser;
import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
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-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -24,6 +24,8 @@
import java.io.File;
import java.net.URL;
+import org.jboss.bootstrap.spi.ServerConfig;
+
/**
* An mbean wrapper for the BaseServerConfig that exposes the config as the
* legacy ServerConfigImplMBean.
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-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigImplMBean.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -26,6 +26,8 @@
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.Server;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.mx.util.ObjectNameFactory;
/**
Modified: trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerConfigLocator.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -21,6 +21,7 @@
*/
package org.jboss.system.server;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.mx.util.MBeanProxyExt;
/**
Modified: trunk/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/system/server/ServerImplMBean.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -23,6 +23,7 @@
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.Server;
import org.jboss.mx.util.ObjectNameFactory;
/**
Modified: trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -38,6 +38,8 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.Server;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.classloading.spi.metadata.ExportAll;
@@ -50,8 +52,6 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceController;
import org.jboss.system.ServiceControllerMBean;
-import org.jboss.system.server.Server;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigImpl;
import org.jboss.system.server.ServerConfigImplMBean;
import org.jboss.system.server.ServerImplMBean;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -46,11 +46,11 @@
import org.apache.catalina.startup.CatalinaProperties;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.modeler.Registry;
+import org.jboss.bootstrap.spi.Server;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.Server;
import org.jboss.system.server.ServerImplMBean;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.xml.JBossEntityResolver;
Modified: trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
===================================================================
--- trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -25,8 +25,8 @@
import javax.management.Notification;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.system.ListenerServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
import org.opennms.protocols.snmp.SnmpAgentSession;
import org.opennms.protocols.snmp.SnmpPeer;
import org.opennms.protocols.snmp.SnmpSMI;
Modified: trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
===================================================================
--- trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -30,9 +30,9 @@
import javax.management.Notification;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.jmx.adaptor.snmp.config.manager.Manager;
import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
import org.jboss.xb.binding.MappingObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
Modified: trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
===================================================================
--- trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -22,8 +22,8 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
import org.opennms.protocols.snmp.SnmpTrapSession;
/**
Modified: trunk/varia/src/main/org/jboss/services/binding/impl/Util.java
===================================================================
--- trunk/varia/src/main/org/jboss/services/binding/impl/Util.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/services/binding/impl/Util.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -33,9 +33,9 @@
import java.net.URL;
import java.net.URLConnection;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.services.binding.ServiceBinding;
import org.jboss.services.binding.ServiceBindingValueSource;
-import org.jboss.system.server.ServerConfig;
/**
* Utilities used by service binding manager components.
Modified: trunk/varia/src/main/org/jboss/services/deployment/DeploymentManager.java
===================================================================
--- trunk/varia/src/main/org/jboss/services/deployment/DeploymentManager.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/services/deployment/DeploymentManager.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -49,6 +49,7 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
@@ -56,7 +57,6 @@
import org.jboss.services.deployment.metadata.ConfigInfoBinding;
import org.jboss.services.deployment.metadata.PropertyInfo;
import org.jboss.services.deployment.metadata.TemplateInfo;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.file.Files;
import org.jboss.varia.deployment.convertor.XslTransformer;
Modified: trunk/varia/src/main/org/jboss/services/deployment/LibraryManager.java
===================================================================
--- trunk/varia/src/main/org/jboss/services/deployment/LibraryManager.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/services/deployment/LibraryManager.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -25,8 +25,8 @@
import java.io.IOException;
import java.net.URL;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.file.Files;
Modified: trunk/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java
===================================================================
--- trunk/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/main/org/jboss/varia/deployment/FoeDeployer.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -46,6 +46,7 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.MainDeployerMBean;
@@ -53,7 +54,6 @@
import org.jboss.deployment.SubDeployerSupport;
import org.jboss.system.ServiceControllerMBean;
-import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.Counter;
Modified: trunk/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingTestBase.java
===================================================================
--- trunk/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingTestBase.java 2008-11-07 10:53:46 UTC (rev 80635)
+++ trunk/varia/src/tests/org/jboss/test/services/binding/test/ServiceBindingTestBase.java 2008-11-07 10:56:05 UTC (rev 80636)
@@ -14,9 +14,9 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.services.binding.ServiceBinding;
import org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig;
-import org.jboss.system.server.ServerConfig;
import org.jboss.util.propertyeditor.ElementEditor;
import org.jboss.util.xml.JBossEntityResolver;
import org.w3c.dom.Document;
More information about the jboss-cvs-commits
mailing list