geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r179145 - in /geronimo/trunk/sandbox/spring-assembly: maven.xml project.xml src/conf/server-gbean.xml src/conf/server.xml
Date Mon, 30 May 2005 20:46:35 GMT
Author: dain
Date: Mon May 30 13:46:34 2005
New Revision: 179145

URL: http://svn.apache.org/viewcvs?rev=179145&view=rev
Log:
Spring based server is now fully working

Modified:
    geronimo/trunk/sandbox/spring-assembly/maven.xml
    geronimo/trunk/sandbox/spring-assembly/project.xml
    geronimo/trunk/sandbox/spring-assembly/src/conf/server-gbean.xml
    geronimo/trunk/sandbox/spring-assembly/src/conf/server.xml

Modified: geronimo/trunk/sandbox/spring-assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/spring-assembly/maven.xml?rev=179145&r1=179144&r2=179145&view=diff
==============================================================================
--- geronimo/trunk/sandbox/spring-assembly/maven.xml (original)
+++ geronimo/trunk/sandbox/spring-assembly/maven.xml Mon May 30 13:46:34 2005
@@ -41,13 +41,14 @@
         </copy>
         <copy file="${pom.getDependencyPath('gbean:gbean-kernel')}" todir="${basedir}/target/geronimo/lib"/>
         <copy file="${pom.getDependencyPath('springframework:spring')}" todir="${basedir}/target/geronimo/lib"/>
+        <copy file="${basedir}/target/geronimo/lib/mx4j-remote-3.0.1.jar" todir="${basedir}/target/geronimo/repository/mx4j/jars/"/>
         <mkdir dir="target/classes/META-INF"/>
         <touch file="target/classes/META-INF/startup-jar"/>
         <jar destfile="${basedir}/target/geronimo/bin/spring-server.jar">
             <fileset dir="target/classes"/>
             <manifest>
                 <attribute name="Main-Class" value="org.gbean.geronimo.Daemon"/>
-                <attribute name="Class-Path" value="../lib/gbean-kernel-1.0-SNAPSHOT.jar
../lib/geronimo-kernel-1.0-SNAPSHOT.jar ../lib/log4j-1.2.8.jar ../lib/commons-logging-1.0.4.jar
../lib/cglib-nodep-2.1.jar ../lib/mx4j-3.0.1.jar ../lib/spring-GBEAN-PATCHED-SNAPSHOT.jar"/>
+                <attribute name="Class-Path" value="../lib/gbean-kernel-1.0-SNAPSHOT.jar
../lib/geronimo-kernel-1.0-SNAPSHOT.jar ../lib/geronimo-system-1.0-SNAPSHOT.jar ../lib/log4j-1.2.8.jar
../lib/commons-logging-1.0.4.jar ../lib/cglib-nodep-2.1.jar ../lib/mx4j-3.0.1.jar ../lib/spring-1.2.jar"/>
                 <attribute name="Default-Location" value="conf/server.xml"/>
             </manifest>
         </jar>

Modified: geronimo/trunk/sandbox/spring-assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/spring-assembly/project.xml?rev=179145&r1=179144&r2=179145&view=diff
==============================================================================
--- geronimo/trunk/sandbox/spring-assembly/project.xml (original)
+++ geronimo/trunk/sandbox/spring-assembly/project.xml Mon May 30 13:46:34 2005
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>springframework</groupId>
             <artifactId>spring</artifactId>
-            <version>GBEAN-PATCHED-SNAPSHOT</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/trunk/sandbox/spring-assembly/src/conf/server-gbean.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/spring-assembly/src/conf/server-gbean.xml?rev=179145&r1=179144&r2=179145&view=diff
==============================================================================
--- geronimo/trunk/sandbox/spring-assembly/src/conf/server-gbean.xml (original)
+++ geronimo/trunk/sandbox/spring-assembly/src/conf/server-gbean.xml Mon May 30 13:46:34 2005
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright 2004 The Apache Software Foundation
-
-    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.
+* Copyright 2005 the original author or authors.
+*
+*  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
     configId="org/apache/geronimo/Server"
-    domain="gbean"
-    server="server"
+    domain="geronimo.server"
+    server="geronimo"
     >
 
     <dependency>
+        <uri>mx4j/jars/mx4j-remote-3.0.1.jar</uri>
+    </dependency>
+    <dependency>
         <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc4.jar</uri>
     </dependency>
     <dependency>
@@ -64,10 +65,58 @@
     <dependency>
         <uri>tranql/jars/tranql-1.0-SNAPSHOT.jar</uri>
     </dependency>
+
     <dependency>
         <uri>openejb/jars/openejb-core-2.0-SNAPSHOT.jar</uri>
     </dependency>
     <dependency>
+        <uri>tmporb/jars/tmporb-orb-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tmporb/jars/tmporb-orb-omg-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tmporb/jars/tmporb-orb-tools-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tmporb/jars/tmporb-tools-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tmporb/jars/tmporb-ins-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tmporb/jars/tmporb-pss-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo-spec/jars/geronimo-spec-corba-2.3-rc4.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>bouncycastle/jars/bcprov-jdk14-124.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>avalon/jars/avalon-framework-4.1.4.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>avalon/jars/avalon-logkit-1.2.2.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>ant/jars/ant-1.5.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>xfire/jars/xfire-20050202.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>xfire/jars/xfire-java-20050202.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>stax/jars/stax-1.1.1-dev.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>stax/jars/stax-api-1.0.jar</uri>
+    </dependency>
+
+
+    <dependency>
         <uri>geronimo/jars/geronimo-jetty-1.0-SNAPSHOT.jar</uri>
     </dependency>
     <dependency>
@@ -106,6 +155,15 @@
 
     <dependency>
          <uri>geronimo/jars/geronimo-axis-1.0-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>axis/jars/axis-1.2.1-SNAPSHOT.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>wsdl4j/jars/wsdl4j-PATCH-1193602.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-discovery/jars/commons-discovery-SNAPSHOT.jar</uri>
     </dependency>
 
     <dependency>

Modified: geronimo/trunk/sandbox/spring-assembly/src/conf/server.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/spring-assembly/src/conf/server.xml?rev=179145&r1=179144&r2=179145&view=diff
==============================================================================
--- geronimo/trunk/sandbox/spring-assembly/src/conf/server.xml (original)
+++ geronimo/trunk/sandbox/spring-assembly/src/conf/server.xml Mon May 30 13:46:34 2005
@@ -1,92 +1,99 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+* Copyright 2005 the original author or authors.
+*
+*  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.
+-->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
 <beans>
     <bean name="JMXBridge" class="org.gbean.jmx.JMXBridge">
         <constructor-arg index="0"><bean class="org.gbean.spring.KernelReference"/></constructor-arg>
+        <constructor-arg index="1"><ref bean=":j2eeType=ServiceInvokerManager,name=default"/></constructor-arg>
     </bean>
 
     <bean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo">
-        <constructor-arg><null/></constructor-arg>
+        <property name="gbean-object-name"><value>geronimo.server:J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/apache/geronimo/System,j2eeType=GBean,name=ServerInfo</value></property>
+
     </bean>
 
-    <bean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"
init-method="doStart" destroy-method="doStop"/>
+    <bean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
 
-    <bean name=":j2eeType=ConfigurationStore,name=Local" class="org.apache.geronimo.system.configuration.LocalConfigStore"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
-        <constructor-arg index="1"><bean class="org.gbean.spring.ObjectNameStringReference"/></constructor-arg>
-        <constructor-arg index="2"><value>config-store</value></constructor-arg>
-        <constructor-arg index="3"><ref bean="ServerInfo"/></constructor-arg>
+    <bean name="LocalConfigurationStore" class="org.apache.geronimo.system.configuration.LocalConfigStore">
+        <property name="gbean-object-name"><value>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=ConfigurationStore,name=Local</value></property>
+        <property name="root"><value>config-store</value></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
     </bean>
 
-    <bean name=":j2eeType=ConfigurationManager,name=ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
-        <constructor-arg index="1">
+    <bean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+        <property name="stores">
             <bean class="org.gbean.spring.LiveProxyHashSetReference">
                 <property name="name"><value>Stores</value></property>
                 <property name="pattern"><value>*:j2eeType=ConfigurationStore,*</value></property>
                 <property name="type"><value>org.apache.geronimo.kernel.config.ConfigurationStore</value></property>
             </bean>
-        </constructor-arg>
+        </property>
     </bean>
 
-    <bean name="FileConfigurationList" class="org.apache.geronimo.system.configuration.FileConfigurationList"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
-        <constructor-arg index="1"><ref bean="ServerInfo"/></constructor-arg>
-        <constructor-arg index="2"><ref bean=":j2eeType=ConfigurationManager,name=ConfigurationManager"/></constructor-arg>
-        <constructor-arg index="3"><value>var/config/config.list</value></constructor-arg>
+    <bean name="FileConfigurationList" class="org.apache.geronimo.system.configuration.FileConfigurationList">
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
+        <property name="configurationManager"><ref bean="ConfigurationManager"/></property>
+        <property name="configFile"><value>var/config/config.list</value></property>
     </bean>
 
-    <bean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><value>repository/</value></constructor-arg>
-        <constructor-arg index="1"><ref bean="ServerInfo"/></constructor-arg>
+    <bean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+        <property name="root"><value>repository/</value></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
     </bean>
 
-    <bean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService"
init-method="doStart" destroy-method="doStop">
+    <bean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
         <property name="port"><value>1099</value></property>
     </bean>
 
     <bean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
-        <constructor-arg index="0"><value>com.sun.jndi.rmi.registry.RegistryContextFactory</value></constructor-arg>
-        <constructor-arg index="1"><value>org.apache.geronimo.naming</value></constructor-arg>
-        <constructor-arg index="2"><value>rmi://localhost:1099</value></constructor-arg>
+        <property name="namingFactoryInitial"><value>com.sun.jndi.rmi.registry.RegistryContextFactory</value></property>
+        <property name="namingFactoryUrlPkgs"><value>org.apache.geronimo.naming</value></property>
+        <property name="namingProviderUrl"><value>rmi://localhost:1099</value></property>
     </bean>
 
     <bean name="properties-login" class="org.apache.geronimo.security.jaas.LoginModuleGBean">
-        <constructor-arg index="0"><value>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</value></constructor-arg>
-        <constructor-arg index="1"><bean class="org.gbean.spring.ObjectNameStringReference"/></constructor-arg>
-        <constructor-arg index="2"><value>true</value></constructor-arg>
+        <property name="loginModuleClass"><value>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</value></property>
+        <property name="serverSide"><value>true</value></property>
         <property name="options">
             <props>
                 <prop key="usersURI">var/security/users.properties</prop>
                 <prop key="groupsURI">var/security/groups.properties</prop>
             </props>
         </property>
+        <property name="loginDomainName"><value>geronimo-properties-realm</value></property>
     </bean>
 
-    <bean name=":j2eeType=SecurityRealm,name=geronimo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
-        <constructor-arg index="0"><value>geronimo-properties-realm</value></constructor-arg>
-        <constructor-arg index="1"><ref bean="properties-login-options"/></constructor-arg>
-        <constructor-arg index="2"><value>false</value></constructor-arg>
-        <constructor-arg index="3"><null/></constructor-arg>
-        <constructor-arg index="4"><ref bean="ServerInfo"/></constructor-arg>
-        <constructor-arg index="5"><bean class="org.gbean.spring.ClassLoaderReference"/></constructor-arg>
-        <constructor-arg index="6"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
+    <bean name="geronimo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <property name="realmName"><value>geronimo-properties-realm</value></property>
+        <property name="loginModuleConfiguration"><ref bean="properties-login-options"/></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
     </bean>
 
     <bean name="properties-login-options" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
-        <constructor-arg index="0"><ref bean="properties-login"/></constructor-arg>
-        <constructor-arg index="1"><null/></constructor-arg>
-        <constructor-arg index="2"><value>REQUIRED</value></constructor-arg>
+        <property name="loginModule"><ref bean="properties-login"/></property>
+        <property name="controlFlag"><value>REQUIRED</value></property>
      </bean>
 
     <bean name="JMX" class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
-        <constructor-arg index="0"><value>JMX</value></constructor-arg>
-        <constructor-arg index="1"><value>geronimo-properties-realm</value></constructor-arg>
-        <constructor-arg index="2"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
+        <property name="applicationConfigName"><value>JMX</value></property>
+        <property name="realmName"><value>geronimo-properties-realm</value></property>
     </bean>
 
-    <bean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration"
init-method="doStart" destroy-method="doStop">
+    <bean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
         <property name="configurations">
             <bean class="org.gbean.geronimo.CollectionReference">
                 <property name="name"><value>Configurations</value></property>
@@ -102,20 +109,15 @@
     </bean>
 
     <bean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <constructor-arg index="0"><bean class="org.gbean.spring.ClassLoaderReference"/></constructor-arg>
-        <constructor-arg index="1"><ref bean="ServerInfo"/></constructor-arg>
-        <constructor-arg index="2"><value>org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</value></constructor-arg>
-        <constructor-arg index="3"><value>org.apache.geronimo.security.jacc.GeronimoPolicy</value></constructor-arg>
-        <constructor-arg index="4"><null/></constructor-arg>
-        <constructor-arg index="5"><null/></constructor-arg>
-        <constructor-arg index="6"><null/></constructor-arg>
-        <constructor-arg index="7"><null/></constructor-arg>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
+        <property name="policyConfigurationFactory"><value>org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</value></property>
+        <property name="policyProvider"><value>org.apache.geronimo.security.jacc.GeronimoPolicy</value></property>
     </bean>
 
-    <bean name="JaasLoginService" class="org.apache.geronimo.security.jaas.JaasLoginService"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><value>HmacSHA1</value></constructor-arg>
-        <constructor-arg index="1"><value>secret</value></constructor-arg>
-        <constructor-arg index="2"><bean class="org.gbean.spring.ClassLoaderReference"/></constructor-arg>
+    <bean name="JaasLoginService" class="org.apache.geronimo.security.jaas.JaasLoginService">
+        <property name="gbean-object-name"><value>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JaasLoginService</value></property>
+        <property name="algorithm"><value>HmacSHA1</value></property>
+        <property name="password"><value>secret</value></property>
         <property name="realms">
             <bean class="org.gbean.geronimo.CollectionReference">
                 <property name="name"><value>realms</value></property>
@@ -125,43 +127,41 @@
         </property>
     </bean>
 
-    <bean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool" init-method="doStart"
destroy-method="doStop">
-        <constructor-arg index="0"><value>10</value></constructor-arg>
-        <constructor-arg index="1"><value>DefaultThreadPool</value></constructor-arg>
-        <constructor-arg index="2"><value>5000</value></constructor-arg>
-        <constructor-arg index="3"><bean class="org.gbean.spring.ClassLoaderReference"/></constructor-arg>
+    <bean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <property name="poolSize"><value>10</value></property>
+        <property name="poolName"><value>DefaultThreadPool</value></property>
+        <property name="keepAliveTime"><value>5000</value></property>
     </bean>
 
     <bean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator"/>
 
-    <bean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManager"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><value>10</value></constructor-arg>
-        <constructor-arg index="1"><value>10</value></constructor-arg>
-        <constructor-arg index="2"><value>10</value></constructor-arg>
-        <constructor-arg index="3"><ref bean="TransactionContextManager"/></constructor-arg>
-    </bean>
-
-    <bean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><value>org.objectweb.howl.log.BlockLogBuffer</value></constructor-arg>
-        <constructor-arg index="1"><value>32</value></constructor-arg>
-        <constructor-arg index="2"><value>true</value></constructor-arg>
-        <constructor-arg index="3"><value>50</value></constructor-arg>
-        <constructor-arg index="4"><value>var/txlog</value></constructor-arg>
-        <constructor-arg index="5"><value>log</value></constructor-arg>
-        <constructor-arg index="6"><value>howl</value></constructor-arg>
-        <constructor-arg index="7"><value>-1</value></constructor-arg>
-        <constructor-arg index="8"><value>0</value></constructor-arg>
-        <constructor-arg index="9"><value>2</value></constructor-arg>
-        <constructor-arg index="10"><value>4</value></constructor-arg>
-        <constructor-arg index="11"><value>-1</value></constructor-arg>
-        <constructor-arg index="12"><null/></constructor-arg>
-        <constructor-arg index="13"><ref bean="ServerInfo"/></constructor-arg>
+    <bean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManager">
+        <property name="syncMaximumPoolSize"><value>10</value></property>
+        <property name="startMaximumPoolSize"><value>10</value></property>
+        <property name="scheduledMaximumPoolSize"><value>10</value></property>
+        <property name="transactionContextManager"><ref bean="TransactionContextManager"/></property>
+    </bean>
+
+    <bean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
+        <property name="bufferClassName"><value>org.objectweb.howl.log.BlockLogBuffer</value></property>
+        <property name="bufferSizeKBytes"><value>32</value></property>
+        <property name="checksumEnabled"><value>true</value></property>
+        <property name="flushSleepTimeMilliseconds"><value>50</value></property>
+        <property name="logFileDir"><value>var/txlog</value></property>
+        <property name="logFileExt"><value>log</value></property>
+        <property name="logFileName"><value>howl</value></property>
+        <property name="maxBlocksPerFile"><value>-1</value></property>
+        <property name="maxBuffers"><value>0</value></property>
+        <property name="maxLogFiles"><value>2</value></property>
+        <property name="minBuffers"><value>4</value></property>
+        <property name="threadsWaitingForceThreshold"><value>-1</value></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
     </bean>
 
     <bean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
-        <constructor-arg index="0"><value>600</value></constructor-arg>
-        <constructor-arg index="1"><ref bean="HOWLTransactionLog"/></constructor-arg>
-        <constructor-arg index="2">
+        <property name="defaultTransactionTimeoutSeconds"><value>600</value></property>
+        <property name="transactionLog"><ref bean="HOWLTransactionLog"/></property>
+        <property name="resourceManagers">
             <bean class="org.gbean.geronimo.CollectionReference">
                 <property name="name"><value>ResourceManagers</value></property>
                 <property name="patterns">
@@ -172,34 +172,32 @@
                 </property>
                 <property name="type"><value>org.apache.geronimo.transaction.manager.ResourceManager</value></property>
             </bean>
-        </constructor-arg>
+        </property>
     </bean>
 
     <bean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManager">
-        <constructor-arg index="0"><ref bean="TransactionManager"/></constructor-arg>
-        <constructor-arg index="1"><ref bean="TransactionManager"/></constructor-arg>
+        <property name="transactionManager"><ref bean="TransactionManager"/></property>
+        <property name="xidImporter"><ref bean="TransactionManager"/></property>
     </bean>
 
-    <bean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl"
init-method="doStart" destroy-method="doStop"/>
-
-    <bean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><ref bean="JettyWebContainer"/></constructor-arg>
-        <constructor-arg index="1"><ref bean="ServerInfo"/></constructor-arg>
+    <bean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl"/>
 
+    <bean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
+        <property name="jettyContainer"><ref bean="JettyWebContainer"/></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
         <property name="filename"><value>var/log/jetty_yyyy_mm_dd.log</value></property>
         <property name="logDateFormat"><value>dd/MMM/yyyy:HH:mm:ss ZZZ</value></property>
         <property name="logTimeZone"><value>GMT</value></property>
     </bean>
 
-    <bean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><ref bean="JettyWebContainer"/></constructor-arg>
+    <bean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
+        <property name="jettyContainer"><ref bean="JettyWebContainer"/></property>
         <property name="port"><value>8080</value></property>
     </bean>
 
-    <bean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector"
init-method="doStart" destroy-method="doStop">
-        <constructor-arg index="0"><ref bean="JettyWebContainer"/></constructor-arg>
-        <constructor-arg index="1"><ref bean="ServerInfo"/></constructor-arg>
-
+    <bean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
+        <property name="jettyContainer"><ref bean="JettyWebContainer"/></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
         <property name="port"><value>8443</value></property>
         <property name="keystore"><value>var/security/keystore</value></property>
         <property name="keystoreType"><value>JKS</value></property>
@@ -209,24 +207,23 @@
         <property name="protocol"><value>TLS</value></property>
     </bean>
 
-    <bean name="EjbNetworkService" class="org.openejb.server.StandardServiceStack" init-method="doStart"
destroy-method="doStop">
-        <constructor-arg index="0"><value>EJB</value></constructor-arg>
-        <constructor-arg index="1"><value>4201</value></constructor-arg>
-        <constructor-arg index="2"><value>127.0.0.1</value></constructor-arg>
-        <constructor-arg index="3"><value>127.0.0.1</value></constructor-arg>
-        <constructor-arg index="4"><value>HOST,NAME,THREADID,USERID</value></constructor-arg>
-        <constructor-arg index="5"><value>HOST,NAME</value></constructor-arg>
-        <constructor-arg index="6"><ref bean="DefaultThreadPool"/></constructor-arg>
-        <constructor-arg index="7"><ref bean="EjbServer"/></constructor-arg>
+    <bean name="EjbNetworkService" class="org.openejb.server.StandardServiceStack">
+        <property name="name"><value>EJB</value></property>
+        <property name="port"><value>4201</value></property>
+        <property name="address"><value>127.0.0.1</value></property>
+        <property name="allowHosts"><value>127.0.0.1</value></property>
+        <property name="logOnSuccess"><value>HOST,NAME,THREADID,USERID</value></property>
+        <property name="logOnFailure"><value>HOST,NAME</value></property>
+        <property name="executor"><ref bean="DefaultThreadPool"/></property>
+        <property name="server"><ref bean="EjbServer"/></property>
     </bean>
     
     <bean name="EjbServer" class="org.openejb.server.ejbd.EjbServer">
-        <constructor-arg index="0"><ref bean="ContainerIndex"/></constructor-arg>
-        <constructor-arg index="1"><null/></constructor-arg>
+        <property name="containerIndex"><ref bean="ContainerIndex"/></property>
     </bean>
     
-    <bean name="ContainerIndex" class="org.openejb.ContainerIndex" init-method="doStart"
destroy-method="doStop">
-        <constructor-arg index="0">
+    <bean name="ContainerIndex" class="org.openejb.ContainerIndex">
+        <property name="eJBContainers">
             <bean class="org.gbean.geronimo.CollectionReference">
                 <property name="name"><value>ResourceManagers</value></property>
                 <property name="patterns">
@@ -238,30 +235,31 @@
                 </property>
                 <property name="type"><value>org.openejb.EJBContainer</value></property>
             </bean>
-        </constructor-arg>
+        </property>
     </bean>
 
-
-    <bean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
-        <constructor-arg index="0"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
-        <constructor-arg index="1"><bean class="org.gbean.spring.ObjectNameStringReference"/></constructor-arg>
-        <constructor-arg index="2"><bean class="org.gbean.spring.ClassLoaderReference"/></constructor-arg>
+    <bean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector" depends-on="NamingProperties,
RMIRegistry">
         <property name="url"><value>service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</value></property>
         <property name="applicationConfigName"><value>JMX</value></property>
     </bean>
 
-
     <bean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
 
-    <bean name="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <constructor-arg index="0"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
-        <constructor-arg index="1"><bean class="org.gbean.spring.ObjectNameStringReference"/></constructor-arg>
-        <constructor-arg index="2"><ref bean="ServerInfo"/></constructor-arg>
+    <bean name="J2EEDomain" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
+        <property name="gbean-object-name"><value>geronimo.server:j2eeType=J2EEDomain,name=geronimo.server</value></property>
+    </bean>
+
+    <bean name="J2EEServer" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+        <property name="gbean-object-name"><value>geronimo.server:j2eeType=J2EEServer,name=geronimo</value></property>
+        <property name="serverInfo"><ref bean="ServerInfo"/></property>
+    </bean>
+
+    <bean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl">
+        <property name="gbean-object-name"><value>geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM</value></property>
     </bean>
 
-    <bean name="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB"
class="org.openejb.mejb.MEJB">
-        <constructor-arg index="0"><bean class="org.gbean.spring.ObjectNameStringReference"/></constructor-arg>
-        <constructor-arg index="1"><bean class="org.gbean.geronimo.GeronimoKernelReference"/></constructor-arg>
+    <bean name="MEJB" class="org.openejb.mejb.MEJB">
+        <property name="gbean-object-name"><value>geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB</value></property>
     </bean>
 
 </beans>



Mime
View raw message