You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2004/02/25 09:01:08 UTC
cvs commit: incubator-geronimo/modules/assembly/src/plan j2ee-deployer-plan.xml j2ee-server-plan.xml system-plan.xml deployer-config.xml server-config.xml system-config.xml
dain 2004/02/25 00:01:08
Modified: modules/assembly maven.xml
Added: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml system-plan.xml
Removed: modules/assembly/src/plan deployer-config.xml
server-config.xml system-config.xml
Log:
Renamed all plans from -service.xml to -plan.xml
Revision Changes Path
1.5 +10 -22 incubator-geronimo/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 24 Feb 2004 07:36:20 -0000 1.4
+++ maven.xml 25 Feb 2004 08:01:08 -0000 1.5
@@ -116,34 +116,22 @@
</define:taglib>
<bootstrap:bootstrap
- outputFile="${distDir}/bin/deployer.jar"
- baseDir="${distDir}"
- store="config-store"
- deploymentPlan="${basedir}/src/plan/deployer-config.xml"
- classPath="${deploy.classpath}"
- mainGBean="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
- mainMethod="deploy"
- configurations="org/apache/geronimo/J2EEDeployer"
+ deployerJar="${distDir}/bin/deployer.jar"
+ storeDir="${distDir}/config-store"
+ repositoryDir="${distDir}/repository"
+ deployerSystemPlan="${basedir}/src/plan/deployer-system-plan.xml"
+ j2eeDeployerPlan="${basedir}/src/plan/j2ee-deployer-plan.xml"
+ deployerClassPath="${deploy.classpath}"
+ deployerGBean="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
/>
- <!-- <j:invokeStatic className="org.apache.geronimo.deployment.Bootstrap" method="bootstrap">-->
- <!-- <j:arg type="java.lang.String" value="${distDir}/bin/deployer.jar"/>-->
- <!-- <j:arg type="java.lang.String" value="${distDir}"/>-->
- <!-- <j:arg type="java.lang.String" value="config-store"/>-->
- <!-- <j:arg type="java.lang.String" value="${basedir}/src/plan/deployer-config.xml"/>-->
- <!-- <j:arg type="java.lang.String" value="${deploy.classpath}"/>-->
- <!-- <j:arg type="java.lang.String" value="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"/>-->
- <!-- <j:arg type="java.lang.String" value="deploy"/>-->
- <!-- <j:arg type="java.lang.String" value="org/apache/geronimo/J2EEDeployer"/>-->
- <!-- </j:invokeStatic>-->
-
<!-- build the system configuration and server.jar -->
<ant:echo>Building system configuration</ant:echo>
<ant:mkdir dir="${distDir}/bin"/>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="src/plan/system-config.xml"/>
+ <ant:arg value="src/plan/system-plan.xml"/>
<ant:arg value="--outfile"/>
<ant:arg value="${distDir}/bin/server.jar"/>
</ant:java>
@@ -153,7 +141,7 @@
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="src/plan/server-config.xml"/>
+ <ant:arg value="src/plan/j2ee-server-plan.xml"/>
</ant:java>
<!-- build the Debug Tool configuration -->
1.1 incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Configuration for the Geronimo deployer
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment"
configId="org/apache/geronimo/J2EEDeployer"
parentId="org/apache/geronimo/DeployerSystem"
>
<include>
<uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
</include>
<dependency>
<uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
</dependency>
<include>
<uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
</include>
<include>
<uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
</include>
<include>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-DEV.jar</uri>
</include>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2eeschema-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=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=WAR,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.jetty.deployment.WARConfigBuilder">
<reference name="Kernel">geronimo.boot:role=Kernel</reference>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
</configuration>
1.1 incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
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-jetty-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-connector-DEV.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-j2ee-DEV.jar</uri>
</dependency>
<!-- default WAR container using Jetty -->
<gbean name="geronimo.server:type=WebContainer,container=Jetty" class="org.apache.geronimo.jetty.JettyContainerImpl">
</gbean>
<gbean name="geronimo.server:type=WebConnector,container=Jetty,port=8080" class="org.apache.geronimo.jetty.connector.HTTPConnector">
<attribute name="Port" type="int">8080</attribute>
<reference name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference>
<!-- <attribute name="MaxConnections" type="int">10</attribute>-->
<!-- <attribute name="MaxIdleTime" type="int">10</attribute>-->
</gbean>
<!-- 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 incubator-geronimo/modules/assembly/src/plan/system-plan.xml
Index: system-plan.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
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"/>
<!-- 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>
<!-- ServerInfo service -->
<gbean name="geronimo.system:role=ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo">
</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>
<!-- 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>
</configuration>