User: user57 Date: 02/01/02 20:00:57 Modified: src/etc/conf/default hsqldb-default-service.xml j2eedeployment-service.xml jboss-service.xml jms-service.xml Log: o migrated all components to a new JMX domain name model. jboss.system is now where to core/spine components live. moved all components that were in JBOSS-SYSTEM that did not move into a jboss.* domain into jboss (where the server is now registered). The point was to limit the members of jboss.system to core bits only. o Created org.jboss.system.Server, which does the work of initialization that org.jboss.Main used to do. Main now only parses the command line, sets up basic legecy properties and creates a Server instance. o Moved functionality of Shutdown (component not cl tool) into Server ( which is bound as jboss.system:service=Server) o Moved more Runtime access from Info into Server. Exposed memory info as attributes. o Logging a WARN everywhere that uses System.getProperty("jboss.system.home") as that should go away soon/eventually. o Initialized the invokerMap in the harmi impl to avoid NPE o Made getopt.jar a member of the lib/* dir instead of adding it to the run.jar and shutdown.jars each time. o Minor cosmetic changes along the way. Revision Changes Path 1.7 +13 -18 jboss/src/etc/conf/default/hsqldb-default-service.xml Index: hsqldb-default-service.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/hsqldb-default-service.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hsqldb-default-service.xml 2001/12/18 21:41:25 1.6 +++ hsqldb-default-service.xml 2002/01/03 04:00:56 1.7 @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ===================================================================== --> <!-- --> <!-- JBoss Server Configuration --> <!-- --> <!-- ===================================================================== --> - -<!-- $Id: hsqldb-default-service.xml,v 1.6 2001/12/18 21:41:25 mnf999 Exp $ --> +<!-- $Id: hsqldb-default-service.xml,v 1.7 2002/01/03 04:00:56 user57 Exp $ --> <server> - <classpath archives=" hsqldb.jar, hsqldb-plugin.jar"/> @@ -23,7 +20,7 @@ <!-- ==================================================================== --> <mbean code="org.jboss.resource.ConnectionFactoryLoader" - name="JBOSS-SYSTEM:service=ConnectionFactoryLoader,name=DefaultDS"> + name=":service=ConnectionFactoryLoader,name=DefaultDS"> <attribute name="ManagedConnectionFactoryProperties">ConnectionURL=jdbc:hsqldb:hsql://localhost:1476 DriverClass=org.hsqldb.jdbcDriver UserName=sa</attribute> @@ -35,12 +32,11 @@ started by an mbean in the jboss jmx framework! The only example of this we have right now is hsqldb! Do not use a line like this for external databases. --> - <depends>JBOSS-SYSTEM:service=Hypersonic</depends> + <depends>:service=Hypersonic</depends> - <depends optional-attribute-name="ResourceAdapterName">JCA:service=RARDeployment,name=Minerva JDBC LocalTransaction ResourceAdapter</depends> - <depends optional-attribute-name="ConnectionManagerFactoryLoaderName">JCA:service=ConnectionManagerFactoryLoader,name=MinervaSharedLocalCMFactory</depends> - <attribute name="ConnectionManagerProperties"># - #Wed Aug 15 16:17:29 EDT 2001 + <depends optional-attribute-name="ResourceAdapterName">jboss.jca:service=RARDeployment,name=Minerva JDBC LocalTransaction ResourceAdapter</depends> + <depends optional-attribute-name="ConnectionManagerFactoryLoaderName">jboss.jca:service=ConnectionManagerFactoryLoader,name=MinervaSharedLocalCMFactory</depends> + <attribute name="ConnectionManagerProperties"> MinSize=0 MaxSize=10 BlockingTimeoutMillis=5000 @@ -55,7 +51,7 @@ </mbean> <mbean code="org.jboss.resource.ConnectionFactoryLoader" - name="JBossMQ:service=ConnectionFactoryLoader,name=NoTransDS"> + name=":service=ConnectionFactoryLoader,name=NoTransDS"> <attribute name="ManagedConnectionFactoryProperties">ConnectionURL=jdbc:hsqldb:hsql://localhost:1476 DriverClass=org.hsqldb.jdbcDriver UserName=sa @@ -64,12 +60,11 @@ <attribute name="TransactionManagerName">java:/TransactionManager</attribute> <!--Anonymous depends to database being started --> - <depends>JBOSS-SYSTEM:service=Hypersonic</depends> + <depends>:service=Hypersonic</depends> - <depends optional-attribute-name="ResourceAdapterName">JCA:service=RARDeployment,name=Minerva JDBC LocalTransaction ResourceAdapter</depends> - <depends optional-attribute-name="ConnectionManagerFactoryLoaderName">JCA:service=ConnectionManagerFactoryLoader,name=MinervaNoTransCMFactory</depends> - <attribute name="ConnectionManagerProperties"># - #Wed Aug 15 16:17:29 EDT 2001 + <depends optional-attribute-name="ResourceAdapterName">jboss.jca:service=RARDeployment,name=Minerva JDBC LocalTransaction ResourceAdapter</depends> + <depends optional-attribute-name="ConnectionManagerFactoryLoaderName">jboss.jca:service=ConnectionManagerFactoryLoader,name=MinervaNoTransCMFactory</depends> + <attribute name="ConnectionManagerProperties"> MinSize=0 MaxSize=10 BlockingTimeoutMillis=5000 @@ -83,10 +78,10 @@ <attribute name="PrincipalMappingProperties">UserName=sa</attribute> </mbean> - <!-- Moved to end to test anonymous dependss --> + <!-- Moved to end to test anonymous depends --> <mbean code="org.jboss.jdbc.HypersonicDatabase" - name="JBOSS-SYSTEM:service=Hypersonic"> + name=":service=Hypersonic"> <attribute name="Port">1476</attribute> <attribute name="Silent">true</attribute> <attribute name="Database">default</attribute> 1.10 +11 -12 jboss/src/etc/conf/default/j2eedeployment-service.xml Index: j2eedeployment-service.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/j2eedeployment-service.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- j2eedeployment-service.xml 2001/12/18 21:42:33 1.9 +++ j2eedeployment-service.xml 2002/01/03 04:00:56 1.10 @@ -2,13 +2,12 @@ <server> - <!-- ==================================================================== --> <!-- J2EE deployment --> <!-- ==================================================================== --> <mbean code="org.jboss.ejb.ContainerFactory" - name="JBOSS-SYSTEM:service=ContainerFactory"> + name="jboss.j2ee:service=ContainerFactory"> <attribute name="VerifyDeployments">true</attribute> <attribute name="ValidateDTDs">false</attribute> <attribute name="MetricsEnabled">false</attribute> @@ -19,12 +18,12 @@ <!-- Make sure you change EmbeddedTomcat to Jetty if you are using Jetty --> <mbean code="org.jboss.deployment.J2eeDeployer" - name="J2EE:service=J2eeDeployer"> + name="jboss.j2ee:service=J2eeDeployer"> <attribute name="DeployerName">Default</attribute> - <depends optional-attribute-name="JarDeployer">JBOSS-SYSTEM:service=ContainerFactory</depends> - <depends optional-attribute-name="RarDeployer">JCA:service=RARDeployer</depends> - <depends optional-attribute-name="WarDeployer">JBOSS-SYSTEM:service=Jetty</depends> - <depends optional-attribute-name="ServiceDeployer">JBOSS-SYSTEM:service=ServiceDeployer</depends> + <depends optional-attribute-name="JarDeployer">jboss.j2ee:service=ContainerFactory</depends> + <depends optional-attribute-name="RarDeployer">jboss.jca:service=RARDeployer</depends> + <depends optional-attribute-name="WarDeployer">jboss.web:service=Jetty</depends> + <depends optional-attribute-name="ServiceDeployer">jboss.system:service=ServiceDeployer</depends> </mbean> <!-- @@ -32,12 +31,12 @@ | entry to enable an alternative "scoped" deployment | <mbean code="org.jboss.deployment.scope.J2eeGlobalScopeDeployer" - name="J2EE:service=J2eeDeployer"> + name="jboss.j2ee:service=J2eeDeployer"> <attribute name="DeployerName">Default</attribute> - <depends optional-attribute-name="JarDeployer">JBOSS-SYSTEM:service=ContainerFactory</depends> - <depends optional-attribute-name="RarDeployer">JCA:service=RARDeployer</depends> - <depends optional-attribute-name="WarDeployer">JBOSS-SYSTEM:service=Jetty</depends> - <depends optional-attribute-name="ServiceDeployer">JBOSS-SYSTEM:service=ServiceDeployer</depends> + <depends optional-attribute-name="JarDeployer">jboss.j2ee:service=ContainerFactory</depends> + <depends optional-attribute-name="RarDeployer">jboss.jca:service=RARDeployer</depends> + <depends optional-attribute-name="WarDeployer">jboss.web:service=Jetty</depends> + <depends optional-attribute-name="ServiceDeployer">jboss.system:service=ServiceDeployer</depends> </mbean> --> </server> 1.20 +40 -82 jboss/src/etc/conf/default/jboss-service.xml Index: jboss-service.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/jboss-service.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jboss-service.xml 2001/12/18 21:45:31 1.19 +++ jboss-service.xml 2002/01/03 04:00:56 1.20 @@ -1,35 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE server> +<!-- $Id: jboss-service.xml,v 1.20 2002/01/03 04:00:56 user57 Exp $ --> - <!-- ===================================================================== --> <!-- --> <!-- JBoss Server Configuration --> <!-- --> <!-- ===================================================================== --> -<!-- $Id: jboss-service.xml,v 1.19 2001/12/18 21:45:31 mnf999 Exp $ --> - -<!-- - | This is where you can add and configure your MBeans. - | - | *ATTENTION* - | - | The order of the listing here is the same order as - | the MBeans are loaded. Therefore if a MBean depends on another - | MBean to be loaded and started it has to be listed after all - | the MBeans it depends on. - --> - <server> - -<!-- - The Classpath element is needed for http based installations - we need to list all the archives that the server needs at boot - if the installation is local and the configuration is from file - then there is no need to list the files and it should commented ---> - + <!-- + | The Classpath element is needed for http based installations + | we need to list all the archives that the server needs at boot + | if the installation is local and the configuration is from file + | then there is no need to list the files and it should commented + --> <classpath codebase="lib/ext" archives="*"/> <!-- ==================================================================== --> @@ -37,7 +23,7 @@ <!-- ==================================================================== --> <mbean code="org.jboss.web.WebService" - name="JBOSS-SYSTEM:service=Webserver"> + name="jboss:service=Webserver"> <attribute name="Port">8083</attribute> <!-- Should resources and non-EJB classes be downloadable --> <attribute name="DownloadServerClasses">true</attribute> @@ -47,6 +33,8 @@ <!-- JSR-77 Single JBoss Server Management Domain --> <!-- ==================================================================== --> + <!-- TODO: rename jmx domain to jboss.management.single --> + <mbean code="org.jboss.management.j2ee.SingleJBossServerManagement" name="SingleJBoss:type=J2EEDomain,name=Manager" > </mbean> @@ -56,24 +44,24 @@ <!-- ==================================================================== --> <mbean code="org.jboss.naming.NamingService" - name="JBOSS-SYSTEM:service=Naming"> + name="jboss:service=Naming"> <attribute name="Port">1099</attribute> </mbean> <mbean code="org.jboss.naming.JNDIView" - name="JBOSS-SYSTEM:service=JNDIView"/> + name="jboss:service=JNDIView"/> <!-- ==================================================================== --> <!-- Security --> <!-- ==================================================================== --> <mbean code="org.jboss.security.plugins.SecurityConfig" - name="Security:name=SecurityConfig"> + name="jboss.security:name=SecurityConfig"> <attribute name="AuthConf">auth.conf</attribute> </mbean> <!-- JAAS security manager and realm mapping --> <mbean code="org.jboss.security.plugins.JaasSecurityManagerService" - name="Security:name=JaasSecurityManager"> + name="jboss.security:name=JaasSecurityManager"> <attribute name="SecurityManagerClassName"> org.jboss.security.plugins.JaasSecurityManager </attribute> @@ -84,7 +72,7 @@ <!-- ==================================================================== --> <mbean code="org.jboss.tm.TransactionManagerService" - name="JBOSS-SYSTEM:service=TransactionManager"> + name="jboss:service=TransactionManager"> <attribute name="TransactionTimeout">300</attribute> <!-- Use this attribute if you need to use a specific Xid @@ -99,26 +87,26 @@ | the TransactionManagerService above. | <mbean code="org.jboss.tm.plugins.tyrex.TransactionManagerService" - name="JBOSS-SYSTEM:service=TransactionManager"> + name="jboss:service=TransactionManager"> <attribute name="ConfigFileName">../conf/default/domain.xml</attribute> </mbean> --> <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService" - name="JBOSS-SYSTEM:service=ClientUserTransaction"> + name="jboss:service=ClientUserTransaction"> </mbean> <!-- ==================================================================== --> <!-- And now to get everything else going... --> <!-- ==================================================================== --> - - <mbean code="org.jboss.deployment.AutoDeployer" name="JBOSS-SYSTEM:service=AutoDeployer"> + <mbean code="org.jboss.deployment.AutoDeployer" + name="jboss:service=AutoDeployer"> <attribute name="Deployers"> - JBOSS-SYSTEM:service=ServiceDeployer; - JCA:service=RARDeployer; - J2EE:service=J2eeDeployer + jboss.system:service=ServiceDeployer; + jboss.jca:service=RARDeployer; + jboss.j2ee:service=J2eeDeployer </attribute> <attribute name="URLs"> ../deploy/lib, @@ -135,7 +123,7 @@ <!-- AS Temporary not available <mbean code="org.jboss.management.ServerDataCollector" - name="Management:service=Collector"> + name="jboss.management:service=Collector"> <attribute name="RefreshSleep">5000</attribute> </mbean> --> @@ -146,7 +134,7 @@ <!-- Uncomment to enable JMX monitoring of the bean cache <mbean code="org.jboss.monitor.BeanCacheMonitor" - name="Monitor:name=BeanCacheMonitor"/> + name="jboss.jmx:name=BeanCacheMonitor"/> --> @@ -155,7 +143,7 @@ <!-- ==================================================================== --> <!-- Uncomment this to enable Scheduling - <mbean code="org.jboss.util.Scheduler" name=":service=Scheduler"> + <mbean code="org.jboss.util.Scheduler" name="jboss:service=Scheduler"> <constructor> <arg type="java.lang.String" value=":server=Scheduler"/> <arg type="java.lang.String" value="org.jboss.util.Scheduler$SchedulableExample"/> @@ -170,7 +158,7 @@ <!-- Uncomment this and set up according to manual to add Castor JDO service <mbean code="org.jboss.jdo.castor.CastorJDOImpl" - name="JBOSS-SYSTEM:service=CastorJDO,name=someName"> + name="jboss:service=CastorJDO,name=someName"> <attribute name="Configuration"> file:../conf/default/database.xml </attribute> @@ -181,35 +169,35 @@ </mbean> --> - <!-- ==================================================================== --> <!-- Mail Connection Factory --> <!-- ==================================================================== --> - <mbean code="org.jboss.mail.MailService" name="JBOSS-SYSTEM:service=Mail"> + <mbean code="org.jboss.mail.MailService" + name="jboss:service=Mail"> <attribute name="JNDIName">Mail</attribute> <attribute name="ConfigurationFile">mail.properties</attribute> <attribute name="User">user_id</attribute> <attribute name="Password">password</attribute> </mbean> - - <!-- ==================================================================== --> <!-- Invokers to the JMX node --> <!-- ==================================================================== --> <!-- RMI/JRMP invoker --> <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker" - name="JBOSS-SYSTEM:service=invoker,type=jrmp"> + name="jboss:service=invoker,type=jrmp"> <attribute name="RMIObjectPort">4444</attribute> - <!--<attribute name="RMIClientSocketFactory">custom</attribute> + <!-- + <attribute name="RMIClientSocketFactory">custom</attribute> <attribute name="RMIServerSocketFactory">custom</attribute> - <attribute name="RMIServerSocketAddr">custom</attribute>--> + <attribute name="RMIServerSocketAddr">custom</attribute> + --> </mbean> <mbean code="org.jboss.invocation.local.LocalInvoker" - name="JBOSS-SYSTEM:service=invoker,type=local"> + name="jboss:service=invoker,type=local"> </mbean> <!-- ==================================================================== --> @@ -217,39 +205,9 @@ <!-- USE A SAR/BARE XML IF YOU WANT DYNAMICITY OF REDEPLOY FOR MBEANS --> <!-- ==================================================================== --> + <!-- + | Might want to use a standard user-service.xml for this and leave + | this file for JBoss stuff only. + --> + </server> - - - - <!-- ==================================================================== --> - <!-- IF YOU USE NET-BOOT YOU NEED TO SPECIFY THE LIBRARIES THROUGH HTTP --> - <!-- ==================================================================== --> - -<!-- - <classpath archives=" - castor.jar, - castor-jdo-plugin.jar, - concurrent.jar, - gnu-regexp.jar, - jaas.jar, - JavaGroups.jar, - jbossha.jar, - jboss-j2ee.jar, - jboss.jar, - jbossmx.jar, - jbosssx.jar, - jcert.jar, - jmxtools.jar, - jndi.jar, - jnet.jar, - jnpserver.jar, - jpl-pattern.jar, - jpl-util.jar, - jsr77.jar, - jsse.jar, - jts.jar, - mail.jar, - tyrex.jar, - tyrex-tm-plugin.jar, - xalan.jar"/> ---> \ No newline at end of file 1.8 +6 -9 jboss/src/etc/conf/default/jms-service.xml Index: jms-service.xml =================================================================== RCS file: /cvsroot/jboss/jboss/src/etc/conf/default/jms-service.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jms-service.xml 2001/12/18 21:48:32 1.7 +++ jms-service.xml 2002/01/03 04:00:56 1.8 @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <server> - - <classpath codebase="lib/ext" archives="*"/> - <!-- ==================================================================== --> - <!-- JMS Stuff --> + <!-- JMS Stuff --> <!-- ==================================================================== --> <!-- The JMS provider loader --> <mbean code="org.jboss.jms.jndi.JMSProviderLoader" - name="JBossMQ:service=JMSProviderLoader,name=JBossMQProvider"> + name="jboss.mq:service=JMSProviderLoader,name=JBossMQProvider"> <attribute name="ProviderName">DefaultJMSProvider</attribute> <attribute name="ProviderAdapterClass"> org.jboss.jms.jndi.JBossMQProvider @@ -24,7 +21,7 @@ <!-- The server session pool for Message Driven Beans --> <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader" - name="JBossMQ:service=ServerSessionPoolMBean,name=StdJMSPool"> + name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"> <attribute name="PoolName">StdJMSPool</attribute> <attribute name="PoolFactoryClass"> org.jboss.jms.asf.StdServerSessionPoolFactory @@ -33,10 +30,10 @@ <!-- JMS XA Resource adapter, use this to get transacted JMS in beans --> <mbean code="org.jboss.resource.ConnectionFactoryLoader" - name="JCA:service=ConnectionFactoryLoader,name=JmsXA"> + name="jboss.jca:service=ConnectionFactoryLoader,name=JmsXA"> <attribute name="JndiName">JmsXA</attribute> - <depends optional-attribute-name="ResourceAdapterName">JCA:service=RARDeployment,name=JMS Adapter</depends> - <depends optional-attribute-name="ConnectionManagerFactoryLoaderName">JCA:service=ConnectionManagerFactoryLoader,name=MinervaXACMFactory</depends> + <depends optional-attribute-name="ResourceAdapterName">jboss.jca:service=RARDeployment,name=JMS Adapter</depends> + <depends optional-attribute-name="ConnectionManagerFactoryLoaderName">jboss.jca:service=ConnectionManagerFactoryLoader,name=MinervaXACMFactory</depends> <attribute name="ManagedConnectionFactoryProperties"> SessionDefaultType=javax.jms.Topic #UserName=guest
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development