dain 2004/04/06 14:41:45
Added: modules/assembly/src/plan deployer-system-plan.xml
j2ee-deployer-plan.xml j2ee-server-plan.xml
system-plan.xml
Log:
Added an assembly module
Fixed remaining not serializable bugs
Added configuration files for itests to deploy into new assembly
Revision Changes Path
1.1 openejb/modules/assembly/src/plan/deployer-system-plan.xml
Index: deployer-system-plan.xml
===================================================================
<?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.
-->
<!--
Configuration for the system layer of the Geronimo deployer
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/DeployerSystem"
>
<!-- ServerInfo service -->
<gbean name="geronimo.deployment:role=ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo">
</gbean>
<!-- Configuration Store service -->
<gbean name="geronimo.deployment:role=ConfigurationStore,type=Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root" type="java.net.URI">config-store/</attribute>
<reference name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
</gbean>
<!-- Repository -->
<gbean name="geronimo.deployment:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="Root" type="java.net.URI">repository/</attribute>
<reference name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
</gbean>
<!-- Logging service -->
<gbean name="geronimo.deployment:role=Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
<attribute name="RefreshPeriod" type="int">60</attribute>
<attribute name="ConfigurationURL" type="java.net.URL">log4j.xml</attribute>
<reference name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
</gbean>
<gbean name="geronimo.deployments:role=LogAppender,type=ConsoleAppender"
class="org.apache.geronimo.system.logging.log4j.appender.ConsoleAppenderService">
<attribute name="Threshold" type="java.lang.String">ERROR</attribute>
<attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
<attribute name="Target" type="java.lang.String">System.out</attribute>
</gbean>
<gbean name="geronimo.deployment:role=LogAppender,type=DailyRollingFileAppender"
class="org.apache.geronimo.system.logging.log4j.appender.RollingFileAppenderService">
<attribute name="Threshold" type="java.lang.String">DEBUG</attribute>
<attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
<attribute name="Append" type="boolean">true</attribute>
<attribute name="File"
type="java.lang.String">var/log/deployer.log</attribute>
<attribute name="BufferedIO" type="boolean">false</attribute>
<attribute name="BufferedSize" type="int">8192</attribute>
<attribute name="MaxBackupIndex" type="int">1</attribute>
<attribute name="MaxFileSize" type="java.lang.String">10MB</attribute>
<reference name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
</gbean>
</configuration>
1.1 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
<?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.
-->
<!--
Configuration for the Geronimo deployer
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/J2EEDeployer"
parentId="org/apache/geronimo/DeployerSystem"
>
<dependency>
<uri>openejb/jars/openejb-core-DEV.jar</uri>
</dependency>
<include>
<uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
</include>
<include>
<uri>geronimo/jars/geronimo-core-DEV.jar</uri>
</include>
<include>
<uri>geronimo/jars/geronimo-security-DEV.jar</uri>
</include>
<include>
<uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
</include>
<include>
<uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
</include>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2eeschema-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-DEV.jar</uri>
</dependency>
<gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.Deployer">
<reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/J2EEDeployer,*</reference>
<reference
name="Store">geronimo.deployment:role=ConfigurationStore,type=Local</reference>
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=RAR_1_0,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.RAR_1_0ConfigBuilder">
<attribute name="ConnectionTrackerNamePattern"
type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
<reference name="Kernel">geronimo.boot:role=Kernel</reference>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=RAR_1_5,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.RAR_1_5ConfigBuilder">
<reference name="Kernel">geronimo.boot:role=Kernel</reference>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<reference name="Kernel">geronimo.boot:role=Kernel</reference>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=EJB,config=org/apache/geronimo/J2EEDeployer"
class="org.openejb.deployment.EJBConfigBuilder">
<reference name="Kernel">geronimo.boot:role=Kernel</reference>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
</configuration>
1.1 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
<?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.
-->
<!--
Configuration for the main ring of a Geronimo server.
This configuration should contain those services normally provided
by the server.
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/Server"
parentId="org/apache/geronimo/System"
>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-j2ee-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-core-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
</dependency>
<dependency>
<uri>concurrent/jars/concurrent-1.3.2.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-security-DEV.jar</uri>
</dependency>
<dependency>
<uri>tranql/jars/tranql-SNAPSHOT.jar</uri>
</dependency>
<dependency>
<uri>openejb/jars/openejb-core-DEV.jar</uri>
</dependency>
<gbean name="geronimo.server:type=ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
<gbean name="geronimo.server:type=WorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
<attribute name="SyncMinimumPoolSize" type="int">0</attribute>
<attribute name="SyncMaximumPoolSize" type="int">10</attribute>
<attribute name="StartMinimumPoolSize" type="int">0</attribute>
<attribute name="StartMaximumPoolSize" type="int">10</attribute>
<attribute name="ScheduledMinimumPoolSize" type="int">0</attribute>
<attribute name="ScheduledMaximumPoolSize" type="int">10</attribute>
<reference
name="XAWork">geronimo.transaction:service=TransactionManager</reference>
</gbean>
<gbean name="geronimo.server:type=BootstrapContext"
class="org.apache.geronimo.connector.BootstrapContext">
<reference
name="WorkManager">geronimo.connector:service=WorkManager</reference>
<reference
name="XATerminator">geronimo.transaction:service=TransactionManager</reference>
</gbean>
<gbean name="geronimo.server:type=TransactionManager"
class="org.apache.geronimo.transaction.TransactionManagerProxy"/>
<gbean name="geronimo.server:type=ContainerIndex"
class="org.openejb.ContainerIndex"/>
<!-- JSR77 Management Objects -->
<gbean name="geronimo.server:type=J2EEDomain,name=geronimo.server"
class="org.apache.geronimo.j2ee.management.impl.DomainImpl">
<reference name="Servers">geronimo.server:type=J2EEServer,*</reference>
</gbean>
<gbean name="geronimo.server:type=J2EEServer,name=geronimo"
class="org.apache.geronimo.j2ee.management.impl.ServerImpl">
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
<references name="DeployedObjects">
<pattern>geronimo.server:type=J2EEApplication,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=AppClientModule,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=EJBModule,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=WebModule,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=ResourceAdapterModule,J2EEServer=geronimo,*</pattern>
</references>
<references name="Resources">
<pattern>geronimo.server:type=JCAResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=JavaMailResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=JDBCResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=JCAResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=JMSResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=JNDIResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=JTAResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=RMI_IIOPResource,J2EEServer=geronimo,*</pattern>
<pattern>geronimo.server:type=URLResource,J2EEServer=geronimo,*</pattern>
</references>
<reference
name="JVMs">geronimo.server:type=JVM,J2EEServer=geronimo,*</reference>
</gbean>
<gbean name="geronimo.server:type=JVM,J2EEServer=geronimo"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
</configuration>
1.1 openejb/modules/assembly/src/plan/system-plan.xml
Index: system-plan.xml
===================================================================
<?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.
-->
<!--
Configuration for the innermost ring of a Geronimo server.
This configuration should only contain critical services needed to
run other Configurations - for example, the ServerInfo, Logging
and Repository services used to load them.
This configuration should *NOT* be used to provide server or application
specific services - those should be provided by children.
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/System"
>
<executable mainClass="org.apache.geronimo.system.main.Daemon"
classPath="../lib/geronimo-kernel-DEV.jar ../lib/geronimo-system-DEV.jar
../lib/cglib-full-2.0-RC2.jar ../lib/commons-cli-1.0.jar
../lib/commons-logging-1.0.3.jar ../lib/log4j-1.2.8.jar ../lib/mx4j-SNAPSHOT.jar
../lib/xercesImpl-2.6.0.jar ../lib/xmlParserAPIs-2.2.1.jar"/>
<!-- ServerInfo service -->
<gbean name="geronimo.system:role=ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
<!-- ServerInfo service -->
<gbean name="geronimo.system:role=URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
<!-- Configuration Store service -->
<gbean name="geronimo.system:role=ConfigurationStore,type=Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root" type="java.net.URI">config-store</attribute>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
<!-- Repository -->
<gbean name="geronimo.system:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="Root" type="java.net.URI">repository/</attribute>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
<!-- Logging service -->
<gbean name="geronimo.system:role=Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
<attribute name="RefreshPeriod" type="int">60</attribute>
<attribute name="ConfigurationURL" type="java.net.URL">log4j.xml</attribute>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
<gbean name="geronimo.system:role=LogAppender,type=ConsoleAppender"
class="org.apache.geronimo.system.logging.log4j.appender.ConsoleAppenderService">
<attribute name="Threshold" type="java.lang.String">INFO</attribute>
<attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
<attribute name="Target" type="java.lang.String">System.out</attribute>
</gbean>
<gbean name="geronimo.system:role=LogAppender,type=DailyRollingFileAppender"
class="org.apache.geronimo.system.logging.log4j.appender.RollingFileAppenderService">
<attribute name="Threshold" type="java.lang.String">DEBUG</attribute>
<attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
<attribute name="Append" type="boolean">true</attribute>
<attribute name="File"
type="java.lang.String">var/log/geronimo.log</attribute>
<attribute name="BufferedIO" type="boolean">false</attribute>
<attribute name="BufferedSize" type="int">8192</attribute>
<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>
</configuration>
