User: oberg
Date: 00/12/07 07:44:03
Modified: src/etc/conf/default jboss.conf jboss.jcml standardjboss.xml
Log:
Changed configuration scheme (lots of changes to jboss.conf, jboss.jcml,
org.jboss.Main)
Added ServiceControl
Changed jBoss -> JBoss
Changed GPL -> LGPL
Added jaxp/parser
Updated services to have default constructors
Revision Changes Path
1.14 +9 -158 jboss/src/etc/conf/default/jboss.conf
Index: jboss.conf
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/etc/conf/default/jboss.conf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jboss.conf 2000/12/06 13:06:52 1.13
+++ jboss.conf 2000/12/07 15:44:02 1.14
@@ -7,6 +7,9 @@
<ARG TYPE="java.lang.String" VALUE="[{2}] {4}">
</MLET>
+<MLET CODE = "org.jboss.util.Info" ARCHIVE="jboss.jar" CODEBASE="../../lib/ext/">
+</MLET>
+
<MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
<ARG TYPE="java.lang.String" VALUE="../../log/">
</MLET>
@@ -25,172 +28,20 @@
<ARG TYPE="java.lang.String" VALUE="../../db/">
</MLET>
-<MLET CODE = "org.jboss.util.Info" ARCHIVE="jboss.jar" CODEBASE="../../lib/ext/">
-</MLET>
-
<MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
<ARG TYPE="java.lang.String" VALUE="./">
</MLET>
-
-<MLET CODE = "org.jboss.jdbc.JdbcProvider" ARCHIVE="jboss.jar,idb.jar,hsql.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.web.WebService" ARCHIVE="jboss.jar,dynaserver.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.jdbc.HypersonicDatabase" ARCHIVE="jboss.jar,hsql.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.naming.NamingService" ARCHIVE="jnpserver.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.tm.TransactionManagerService"
ARCHIVE="jboss.jar,jta-spec1_0_1.jar" CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.security.JaasSecurityManagerService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.security.SimpleRealmMappingService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-<MLET CODE = "org.jboss.security.EJBSecurityManagerService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE="org.jboss.jdbc.XADataSourceLoader" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- <ARG TYPE="java.lang.String" VALUE="InstantDB">
- <ARG TYPE="java.lang.String" VALUE="org.jboss.minerva.xa.XADataSourceImpl">
-</MLET>
-
-<MLET CODE="org.jboss.jdbc.XADataSourceLoader" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- <ARG TYPE="java.lang.String" VALUE="DefaultDS">
- <ARG TYPE="java.lang.String" VALUE="org.jboss.minerva.xa.XADataSourceImpl">
-</MLET>
-
-<MLET CODE="org.jboss.jms.jndi.JMSProviderLoader" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- <ARG TYPE="java.lang.String" VALUE="OpenJMSProvider">
- <ARG TYPE="java.lang.String" VALUE="org.jboss.jms.jndi.OpenJMSProvider">
-</MLET>
-
-<MLET CODE="org.jboss.jms.asf.ServerSessionPoolLoader" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- <ARG TYPE="java.lang.String" VALUE="OpenJMSPool">
- <ARG TYPE="java.lang.String"
VALUE="org.jboss.jms.asf.OpenJMSServerSessionPoolFactory">
-</MLET>
-
-<MLET CODE = "org.jboss.ejb.ContainerFactory"
ARCHIVE="jboss.jar,ejb.jar,jnp-client.jar,ejxeditor.jar,ejxjboss.jar,ejb2.0.jar,openjms-client-patched-0.5.1.jar,openjms-rmi-patched-0.5.1.jar,exolabcore-0.1.jar,log4j.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.ejb.AutoDeployer" ARCHIVE="jboss.jar">
- <ARG TYPE="java.lang.String" VALUE="../deploy/">
-</MLET>
-
-<MLET CODE = "org.jboss.jmx.server.JMXAdaptorService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "org.jboss.jmx.server.RMIConnectorService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-</MLET>
-
-<MLET CODE = "com.sun.jdmk.comm.HtmlAdaptorServer" ARCHIVE="jmxtools.jar"
CODEBASE="../../lib/ext/" NAME="Adaptor:name=html">
+<MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
+ <ARG TYPE="java.lang.String" VALUE="/f:/java/tomcat/lib/">
+ <ARG TYPE="java.lang.String" VALUE="Tomcat">
</MLET>
<MLET CODE = "org.jboss.configuration.ConfigurationService"
ARCHIVE="jboss.jar,../xml.jar" CODEBASE="../../lib/ext/">
</MLET>
-<!--
- -- The j2ee deployer can deploy jar,war and ear files. Its role is to
- -- split the archive and hand the parts (jars, wars) to the relevant
- -- deployers
- --
- -- Arguments: #1: where the j2eedeployer should store its config files
- -- #2: the jar deployer: currently only ContainerFactory
- -- #3: the war deployer: you can use tomcat (":service=EmbeddedTomcat")
- -- or jetty (":service=Jetty")
- -- See below to start these services
- -->
-<MLET CODE = "org.jboss.deployment.J2eeDeployer" ARCHIVE="jboss.jar,../xml.jar"
CODEBASE="../../lib/ext/">
- <ARG TYPE="java.lang.String" VALUE="../tmp/deploy">
- <ARG TYPE="java.lang.String" VALUE="EJB:service=ContainerFactory">
- <ARG TYPE="java.lang.String" VALUE=":service=EmbeddedTomcat">
-</MLET>
-
-
-<!--
- -- Uncomment this to add Tomcat classes to jBoss' classpath. This is necessary
for both
- -- integration modes below to work.
- --
- -- Set the argument to the directory where the Tomcat libraries reside (i.e.
Tomcat's lib/ directory).
- -- If you�re using an absolute path don�t forget to add a slash at the
- -- beginning of it (i.e. /c:/tomcat/lib/)
- --
- -- MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- -- ARG TYPE="java.lang.String" VALUE="/usr/tomcat/lib/">
- -- ARG TYPE="java.lang.String" VALUE="Tomcat">
- -- /MLET>
- -->
-
-<!--
- -- Uncomment this to add "Stand-alone Stack Tomcat support".
- -- This means that JSP and Servlets will work with EJB in different stacks and
- -- communicate through network invocation. If you benchmark j2ee please use
"integrated stack".
- -- Also note that you cannot use the J2EE deployer with Tomcat in this
configuration.
- -- Be sure to set your 'TOMCAT_HOME' environment variable before starting JBoss.
- -- Note: this reads the server.xml configuration file of Tomcat, you can't use
the j2ee deployer
- --
- -- MLET CODE = "org.jboss.tomcat.TomcatService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- -- /MLET>
- -->
-
-<!-- WARNING: only one of the tomcat services can be configured, either "stand
alone or integrated" -->
-
-<!--
- -- Uncomment this to add "Integrated Stack (fast) Tomcat support".
- -- This service allows you to integrate the stack of Tomcat and jboss.
- -- Invocations are not going through network but pass native pointers resulting
in dramatic speed increases.
- -- This service allows the J2EE deployer to add and remove Tomcat contexts
dynamically
- -- through JMX for you and in effect deploy EARs. Note that tomcat's server.xml
file will be partially
- -- processed for context support: you can also use JMX to add contexts.
- -- Use the J2EE deployer to deploy full EARs on this stack
- -- Be sure to set your 'TOMCAT_HOME' environment variable before starting JBoss.
- --
- -- The ARG tags are the config file and the port to run tomcat on.
- --
- -- MLET CODE = "org.jboss.tomcat.EmbeddedTomcatService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- -- ARG TYPE="java.lang.String" VALUE="full path to tomcat config file">
- -- ARG TYPE="int" VALUE=8080>
- -- /MLET>
- -->
-
-
-<!--
- -- Uncomment this to add Jetty classes to jBoss' classpath.
- --
- -- Set the argument to the directory where the jetty libraries reside
- -- (i.e. jetty's lib/ directory).
- --
- -- MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- -- ARG TYPE="java.lang.String" VALUE="/usr/lib/jetty/lib/">
- -- ARG TYPE="java.lang.String" VALUE="Jetty">
- -- /MLET>
- -->
-
-
-<!--
- -- Uncomment this to add Integrated Stack (fast) Jetty support.
- -- This service allows you to integrate the stack of Jetty and JBoss
- -- Invocations are not going through network but pass native pointers resulting
in dramatic speed increases.
- -- This service allows the J2EE deployer to add and remove WebApplication
contexts dynamically
- -- through JMX for you and in effect deploy EARs. Note that Jetty's
- -- XML config file WILL be processed, allowing you to add a number of other
servlets that you may require
- -- (e.g. admin, CGI etc) and listeners on as many ports as you require.
- -- Use the J2EE deployer to dynamically deploy full EARs on this stack.
- -- Be sure to set your 'JETTY_HOME' environment variable before starting
- --
- -- The ARG tag is Jetty's XML configuration file.
- -- You can use JBOSS_HOME/conf/default/jetty.xml. The default value is probably
invalid.
- --
- -- MLET CODE = "org.jboss.jetty.JettyService" ARCHIVE="jetty-service.jar"
CODEBASE="../../lib/ext/">
- -- ARG TYPE="java.lang.String" VALUE="file:/usr/jboss/conf/default/jetty.xml">
- -- /MLET>
- -->
+<MLET CODE = "org.jboss.util.Shutdown" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
+</MLET>
-<MLET CODE = "org.jboss.spydermq.SpyderMQService" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
+<MLET CODE = "org.jboss.util.ServiceControl" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
</MLET>
1.4 +70 -25 jboss/src/etc/conf/default/jboss.jcml
Index: jboss.jcml
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/etc/conf/default/jboss.jcml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jboss.jcml 2000/11/07 12:33:19 1.3
+++ jboss.jcml 2000/12/07 15:44:02 1.4
@@ -1,25 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is where you can add and configure your MBeans -->
<server>
- <mbean name="Adaptor:name=html">
- <attribute name="MaxActiveClientCount">10</attribute>
- <attribute name="Parser" />
- <attribute name="Port">8082</attribute>
+ <!-- Classloading -->
+ <mbean code="org.jboss.web.WebService" name="DefaultDomain:service=Webserver">
+ <attribute name="Port">8083</attribute>
</mbean>
- <mbean name="DefaultDomain:service=TransactionManager">
+
+ <!-- JNDI -->
+ <mbean code="org.jboss.naming.NamingService" name="DefaultDomain:service=Naming">
+ <attribute name="Port">1099</attribute>
+ </mbean>
+
+ <!-- Transactions -->
+ <mbean code="org.jboss.tm.TransactionManagerService"
name="DefaultDomain:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
- </mbean>
- <mbean name="DefaultDomain:service=Logging,type=Console">
- <attribute name="Format">[{2}] {4}</attribute>
- </mbean>
- <mbean name="DefaultDomain:service=Webserver">
- <attribute name="Port">8083</attribute>
</mbean>
- <mbean name="DefaultDomain:service=Logging,type=File">
- <attribute name="Format">[{2}] {4}</attribute>
- <attribute name="LogName">server</attribute>
+
+ <!-- Security -->
+ <mbean code="org.jboss.security.JaasSecurityManagerService"
name="DefaultDomain:service=JaasSecurityManager" />
+
+ <mbean code="org.jboss.security.SimpleRealmMappingService"
name="DefaultDomain:service=SimpleRealmMappingFactory" />
+
+ <mbean code="org.jboss.security.EJBSecurityManagerService"
name="DefaultDomain:service=EJBSecurityManager" />
+
+ <!-- JDBC -->
+ <mbean code="org.jboss.jdbc.JdbcProvider"
name="DefaultDomain:service=JdbcProvider" />
+
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
name="DefaultDomain:service=Hypersonic">
+ <attribute name="Port">1476</attribute>
+ <attribute name="Silent">true</attribute>
+ <attribute name="Database">default</attribute>
+ <attribute name="Trace">false</attribute>
</mbean>
- <mbean name="DefaultDomain:service=XADataSource,name=InstantDB">
+
+ <mbean code="org.jboss.jdbc.XADataSourceLoader"
name="DefaultDomain:service=XADataSource,name=InstantDB">
+ <attribute name="PoolName">InstantDB</attribute>
+ <attribute
name="DataSourceClass">org.jboss.minerva.xa.XADataSourceImpl</attribute>
<attribute name="Properties"></attribute>
<attribute name="URL">jdbc:idb:../conf/default/instantdb.properties</attribute>
<attribute name="GCMinIdleTime">1200000</attribute>
@@ -36,14 +53,11 @@
<attribute name="LoggingEnabled">false</attribute>
<attribute name="MaxIdleTimeoutPercent">1.0</attribute>
<attribute name="MinSize">0</attribute>
- </mbean>
- <mbean name="DefaultDomain:service=Hypersonic">
- <attribute name="Port">1476</attribute>
- <attribute name="Silent">true</attribute>
- <attribute name="Database">default</attribute>
- <attribute name="Trace">false</attribute>
</mbean>
- <mbean name="DefaultDomain:service=XADataSource,name=DefaultDS">
+
+ <mbean code="org.jboss.jdbc.XADataSourceLoader"
name="DefaultDomain:service=XADataSource,name=DefaultDS">
+ <attribute name="PoolName">DefaultDS</attribute>
+ <attribute
name="DataSourceClass">org.jboss.minerva.xa.XADataSourceImpl</attribute>
<attribute name="Properties"></attribute>
<attribute name="URL">jdbc:HypersonicSQL:hsql://localhost:1476</attribute>
<attribute name="GCMinIdleTime">1200000</attribute>
@@ -61,9 +75,40 @@
<attribute name="MaxIdleTimeoutPercent">1.0</attribute>
<attribute name="MinSize">0</attribute>
</mbean>
- <mbean name="EJB:service=ContainerFactory">
+
+ <!-- J2EE deployment -->
+ <mbean code="org.jboss.ejb.ContainerFactory" name=":service=ContainerFactory">
<attribute name="VerifyDeployments">true</attribute>
+ <attribute name="MetricsEnabled">false</attribute>
<attribute name="VerifierVerbose">true</attribute>
</mbean>
-</server>
+
+ <mbean code="org.jboss.tomcat.EmbeddedTomcatService"
name="DefaultDomain:service=EmbeddedTomcat" />
+
+ <mbean code="org.jboss.spydermq.SpyderMQService"
name="DefaultDomain:service=SpyderMQ" />
+
+ <mbean code="org.jboss.deployment.J2eeDeployer" name="J2EE:service=J2eeDeployer">
+ <attribute name="DeployerName">Default</attribute>
+ <attribute name="JarDeployerName">:service=ContainerFactory</attribute>
+ <attribute name="WarDeployerName">:service=EmbeddedTomcat</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.ejb.AutoDeployer" name="EJB:service=AutoDeployer">
+ <attribute name="Deployer">J2EE:service=J2eeDeployer</attribute>
+ <attribute name="URLs">../deploy</attribute>
+ </mbean>
+
+ <!-- JMX adaptors -->
+ <mbean code="org.jboss.jmx.server.JMXAdaptorService" name="Adaptor:name=RMI" />
+
+ <mbean code="org.jboss.jmx.server.RMIConnectorService" name="Connector:name=RMI"
/>
+ <mbean code="com.sun.jdmk.comm.HtmlAdaptorServer" name="Adaptor:name=html">
+ <attribute name="MaxActiveClientCount">10</attribute>
+ <attribute name="Parser" />
+ <attribute name="Port">8082</attribute>
+ </mbean>
+
+ <!-- Add your custom MBeans here -->
+
+</server>
1.3 +4 -4 jboss/src/etc/conf/default/standardjboss.xml
Index: standardjboss.xml
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/etc/conf/default/standardjboss.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- standardjboss.xml 2000/11/08 03:41:40 1.2
+++ standardjboss.xml 2000/12/07 15:44:03 1.3
@@ -7,7 +7,7 @@
<container-configuration>
<container-name>Standard CMP EntityBean</container-name>
<call-logging>false</call-logging>
-
<container-invoker>org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker</container-invoker>
+
<container-invoker>org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker</container-invoker>
<instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
<instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
<persistence-manager>org.jboss.ejb.plugins.jaws.JAWSPersistenceManager</persistence-manager>
@@ -71,7 +71,7 @@
<container-configuration>
<container-name>Standard Stateless SessionBean</container-name>
<call-logging>false</call-logging>
-
<container-invoker>org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker</container-invoker>
+
<container-invoker>org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker</container-invoker>
<instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
<instance-cache></instance-cache>
<persistence-manager></persistence-manager>
@@ -107,7 +107,7 @@
<container-configuration>
<container-name>Standard Stateful SessionBean</container-name>
<call-logging>false</call-logging>
-
<container-invoker>org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker</container-invoker>
+
<container-invoker>org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker</container-invoker>
<instance-cache>org.jboss.ejb.plugins.StatefulSessionInstanceCache</instance-cache>
<persistence-manager>org.jboss.ejb.plugins.StatefulSessionFilePersistenceManager</persistence-manager>
<transaction-manager>org.jboss.tm.TxManager</transaction-manager>
@@ -159,7 +159,7 @@
<container-configuration>
<container-name>Standard BMP EntityBean</container-name>
<call-logging>false</call-logging>
-
<container-invoker>org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker</container-invoker>
+
<container-invoker>org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker</container-invoker>
<instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
<instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
<persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
