djencks 2004/08/04 18:39:08
Modified: modules/assembly/src/plan default-database-plan.xml
j2ee-server-plan.xml system-plan.xml
Log:
cleanup and add gbeans so remote deployment works and itests can be run
Revision Changes Path
1.2 +1 -1 openejb/modules/assembly/src/plan/default-database-plan.xml
Index: default-database-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/default-database-plan.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-database-plan.xml 18 Jul 2004 22:36:33 -0000 1.1
+++ default-database-plan.xml 4 Aug 2004 22:39:08 -0000 1.2
@@ -2,7 +2,7 @@
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee";
version="1.5"
- configId="org/tranql/connector/axion"
+ configId="org/apache/geronimo/DefaultDatabase"
parentId="org/apache/geronimo/Server">
<resourceadapter>
<outbound-resourceadapter>
1.21 +81 -1 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- j2ee-server-plan.xml 27 Jul 2004 02:06:57 -0000 1.20
+++ j2ee-server-plan.xml 4 Aug 2004 22:39:08 -0000 1.21
@@ -63,7 +63,10 @@
<uri>openejb/jars/openejb-core-2.0-SNAPSHOT.jar</uri>
</dependency>
<dependency>
- <uri>howl/jars/howl-logger-0.1.3.jar</uri>
+ <uri>geronimo/jars/geronimo-jmxremoting-1.0-SNAPSHOT.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>howl/jars/howl-logger-0.1.4.jar</uri>
</dependency>
<!-- required for rar 1.5 to load realms -->
@@ -71,6 +74,44 @@
<uri>regexp/jars/regexp-1.3.jar</uri>
</dependency>
+ <!-- for timer serialization implementation -->
+ <dependency>
+ <uri>xstream/jars/xstream-1.0.1.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xpp3/jars/xpp3-1.1.3.3.jar</uri>
+ </dependency>
+
+ <!-- needed for online deployment -->
+ <dependency>
+ <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-1.0-SNAPSHOT.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-deployment-1.0-SNAPSHOT.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-common-1.0-SNAPSHOT.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xmlbeans/jars/xbean-apache-1.0-DEV.jar</uri>
+ </dependency>
+
+
+ <!-- Default security realm using properties files -->
+ <gbean
name="geronimo.security:type=SecurityRealm,realm=geronimo-properties-realm"
class="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm">
+ <attribute name="realmName"
type="java.lang.String">geronimo-properties-realm</attribute>
+ <attribute name="maxLoginModuleAge" type="long">10000</attribute>
+ <attribute name="usersURI"
type="java.net.URI">var/security/users.properties</attribute>
+ <attribute name="groupsURI"
type="java.net.URI">var/security/groups.properties</attribute>
+ <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ </gbean>
+
+ <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=JMX"
class="org.apache.geronimo.security.jaas.ConfigurationEntryRealmLocal">
+ <attribute name="applicationConfigName"
type="java.lang.String">JMX</attribute>
+ <attribute name="realmName"
type="java.lang.String">geronimo-properties-realm</attribute>
+ <attribute name="controlFlag"
type="org.apache.geronimo.security.jaas.LoginModuleControlFlag">REQUIRED</attribute>
+ </gbean>
+
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
<gbean name="geronimo.security:type=LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration"/>
@@ -86,6 +127,12 @@
<attribute name="password" type="java.lang.String">secret</attribute>
</gbean>
+ <gbean name="geronimo.server:type=ThreadPool,name=DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
+ <attribute name="keepAliveTime" type="long">5000</attribute>
+ <attribute name="poolSize" type="int">10</attribute>
+ <attribute name="poolName"
type="java.lang.String">DefaultThreadPool</attribute>
+ </gbean>
+
<gbean name="geronimo.server:type=ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
@@ -150,4 +197,37 @@
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
<gbean name="geronimo.server:j2eeType=JVM,J2EEServer=geronimo"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
+
+ <!-- JMX Remoting -->
+ <gbean name="geronimo.server:role=JMXService,name=localhost"
class="org.apache.geronimo.jmxremoting.JMXConnector">
+ <attribute name="URL"
type="java.lang.String">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
+ <attribute name="applicationConfigName"
type="java.lang.String">JMX</attribute>
+ </gbean>
+
+ <!-- todo move to child config once we sort out the packaging -->
+ <gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.Deployer">
+ <reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/Server,*</reference>
+ <reference
name="Store">geronimo.system:role=ConfigurationStore,type=Local</reference>
+ </gbean>
+
+ <gbean
name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <reference name="Repository">*:role=Repository,*</reference>
+ </gbean>
+
+ <gbean
name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
+ <attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
+ <attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
+ <attribute name="transactionalTimerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
+ <attribute name="nonTransactionalTimerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=NonTransactionalThreadPooledTimer</attribute>
+ <reference name="Repository">*:role=Repository,*</reference>
+ <reference
name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</reference>
+ <reference
name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
+ </gbean>
+
+ <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server"
class="org.openejb.deployment.OpenEJBModuleBuilder"/>
+
+ <gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder"/>
+ <!-- end deployment block -->
+
</configuration>
1.7 +15 -4 openejb/modules/assembly/src/plan/system-plan.xml
Index: system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/system-plan.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-plan.xml 15 Jul 2004 03:34:20 -0000 1.6
+++ system-plan.xml 4 Aug 2004 22:39:08 -0000 1.7
@@ -6,16 +6,16 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<!--
Configuration for the innermost ring of a Geronimo server.
@@ -34,7 +34,7 @@
<!-- ServerInfo service -->
<gbean name="geronimo.system:role=ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
- <!-- ServerInfo service -->
+ <!-- URLFactory service -->
<gbean name="geronimo.system:role=URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
<!-- Configuration Store service -->
@@ -43,6 +43,12 @@
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
+ <!-- Persistent List of running Configurations service -->
+ <gbean name="geronimo.boot:role=PersistentConfigurationList"
class="org.apache.geronimo.system.configuration.FileConfigurationList">
+ <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <attribute name="configFile"
type="java.lang.String">var/config/config.list</attribute>
+ </gbean>
+
<!-- Repository -->
<gbean name="geronimo.system:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root" type="java.net.URI">repository/</attribute>
@@ -73,5 +79,10 @@
<attribute name="maxBackupIndex" type="int">1</attribute>
<attribute name="maxFileSize" type="java.lang.String">10MB</attribute>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ </gbean>
+
+ <!-- RMI Registry -->
+ <gbean name="geronimo.server:role=RMIRegistry"
class="org.apache.geronimo.system.RMIRegistryService">
+ <attribute name="port" type="int">1099</attribute>
</gbean>
</configuration>
