geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r326794 [5/7] - in /geronimo/trunk: assemblies/j2ee-server/ assemblies/j2ee-server/src/var/config/ configs/ configs/activemq-broker/ configs/activemq-broker/src/ configs/activemq-broker/src/plan/ configs/activemq/ configs/activemq/src/ conf...
Date Thu, 20 Oct 2005 03:48:18 GMT
Added: geronimo/trunk/configs/j2ee-security/temp/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/temp/src/plan/plan.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/j2ee-security/temp/src/plan/plan.xml (added)
+++ geronimo/trunk/configs/j2ee-security/temp/src/plan/plan.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,361 @@
+<?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.
+-->
+
+<!-- $Rev: 264671 $ $Date: 2005-08-29 19:17:54 -0700 (Mon, 29 Aug 2005) $ -->
+
+<!--
+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-1.0"
+    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
+    >
+
+    <!--runtime dependencies-->
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-j2ee</artifactId>
+        <version>${geronimo_spec_j2ee_version}</version>
+    </dependency>
+
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-activation</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-core</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-naming</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-timer</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-security</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-webservices</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-jmxremoting</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-client</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-axis</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-servicemix</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-jetty</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+
+    <dependency>
+        <groupId>concurrent</groupId>
+        <artifactId>concurrent</artifactId>
+        <version>${concurrent_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>tranql</groupId>
+        <artifactId>tranql</artifactId>
+        <version>${tranql_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>openejb</groupId>
+        <artifactId>openejb-core</artifactId>
+        <version>${openejb_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>howl</groupId>
+        <artifactId>howl-logger</artifactId>
+        <version>${howl_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>antlr</groupId>
+        <artifactId>antlr</artifactId>
+        <version>${antlr_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>regexp</groupId>
+        <artifactId>regexp</artifactId>
+        <version>${regexp_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>${xstream_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3</artifactId>
+        <version>${xpp3_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>${asm_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>activemq</groupId>
+        <artifactId>activemq-gbean-management</artifactId>
+        <version>${activemq_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>activeio</groupId>
+        <artifactId>activeio</artifactId>
+        <version>${activeio_version}</version>
+    </dependency>
+
+    <!-- default WAR container using Jetty -->
+    <gbean name="WebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
+    </gbean>
+
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
+        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+        <attribute name="logTimeZone">GMT</attribute>
+    </gbean>
+
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
+        <attribute name="port">${PlanHTTPPort}</attribute>
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
+        <attribute name="maxThreads">50</attribute>
+        <attribute name="minThreads">10</attribute>
+    </gbean>
+
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
+        <attribute name="port">${PlanHTTPSPort}</attribute>
+        <attribute name="keystoreFileName">var/security/keystore</attribute>
+        <attribute name="keystoreType">JKS</attribute>
+        <attribute name="keystorePassword">secret</attribute>
+        <attribute name="keyPassword">secret</attribute>
+        <attribute name="clientAuthRequired">false</attribute>
+        <attribute name="secureProtocol">TLS</attribute>
+        <attribute name="maxThreads">50</attribute>
+        <attribute name="minThreads">10</attribute>
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+    </gbean>
+
+    <!-- TODO add in Tomcat support -->
+
+    <!-- Default security realm using properties files -->
+    <gbean name="properties-login"
+        class="org.apache.geronimo.security.jaas.LoginModuleGBean">
+        <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+        <attribute name="serverSide">true</attribute>
+        <attribute name="options">
+            usersURI=var/security/users.properties
+            groupsURI=var/security/groups.properties
+        </attribute>
+        <attribute name="loginDomainName">geronimo-properties-realm</attribute>
+    </gbean>
+
+    <gbean name="geronimo-properties-realm"
+        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <attribute name="realmName">geronimo-properties-realm</attribute>
+        <reference name="LoginModuleConfiguration">
+            <name>properties-login</name>
+        </reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+    </gbean>
+    <gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
+         <attribute name="controlFlag">REQUIRED</attribute>
+         <reference name="LoginModule">
+             <name>properties-login</name>
+         </reference>
+     </gbean>
+
+    <gbean name="JMX"
+        class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
+        <attribute name="applicationConfigName">JMX</attribute>
+        <attribute name="realmName">geronimo-properties-realm</attribute>
+    </gbean>
+
+    <!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
+    <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
+        <references name="Configurations">
+            <pattern><gbean-name>geronimo.server:j2eeType=SecurityRealm,*</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationEntry,*</gbean-name></pattern>
+        </references>
+    </gbean>
+
+    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
+        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
+    </gbean>
+
+    <gbean name="JaasLoginService" class="org.apache.geronimo.security.jaas.JaasLoginService">
+        <reference name="Realms"><application>*</application><module>*</module><name>*</name></reference>
+        <!--        <attribute name="reclaimPeriod">100000</attribute>-->
+        <attribute name="algorithm">HmacSHA1</attribute>
+        <attribute name="password">secret</attribute>
+    </gbean>
+
+    <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
+        <attribute name="protocol">tcp</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanRemoteLoginPort}</attribute>
+        <reference name="LoginService"><name>JaasLoginService</name></reference>
+    </gbean>
+
+    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <attribute name="keepAliveTime">5000</attribute>
+        <attribute name="poolSize">30</attribute>
+        <attribute name="poolName">DefaultThreadPool</attribute>
+    </gbean>
+
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    </gbean>
+
+    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
+        <attribute name="syncMaximumPoolSize">10</attribute>
+        <attribute name="startMaximumPoolSize">10</attribute>
+        <attribute name="scheduledMaximumPoolSize">10</attribute>
+        <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+    </gbean>
+
+    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
+        <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
+        <attribute name="bufferSizeKBytes">32</attribute>
+        <attribute name="checksumEnabled">true</attribute>
+        <attribute name="flushSleepTimeMilliseconds">50</attribute>
+        <attribute name="logFileDir">var/txlog</attribute>
+        <attribute name="logFileExt">log</attribute>
+        <attribute name="logFileName">howl</attribute>
+        <attribute name="maxBlocksPerFile">-1</attribute>
+        <attribute name="maxBuffers">0</attribute>
+        <attribute name="maxLogFiles">2</attribute>
+        <attribute name="minBuffers">4</attribute>
+        <attribute name="threadsWaitingForceThreshold">-1</attribute>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+    </gbean>
+
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
+        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
+        <references name="ResourceManagers">
+            <pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=ActivationSpec,*</gbean-name></pattern>
+        </references>
+    </gbean>
+
+    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
+        <reference name="TransactionManager"><name>TransactionManager</name></reference>
+        <reference name="XidImporter"><name>TransactionManager</name></reference>
+    </gbean>
+
+    <!-- EJB Protocol -->
+    <gbean gbeanName="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
+        <attribute name="name">EJB</attribute>
+        <attribute name="port">${PlanOpenEJBPort}</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="allowHosts">${PlanClientAddresses}</attribute>
+        <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
+        <attribute name="logOnFailure">HOST,NAME</attribute>
+        <reference name="Executor"><name>DefaultThreadPool</name></reference>
+        <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
+    </gbean>
+    <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
+        <reference name="ContainerIndex"><gbean-name>openejb:type=ContainerIndex</gbean-name></reference>
+    </gbean>
+    <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
+    <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
+        <references name="EJBContainers">
+            <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
+        </references>
+    </gbean>
+
+    <!-- JSR77 Management Objects -->
+    <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+    <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+    </gbean>
+
+    <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
+
+    <!-- JMX Remoting -->
+    <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
+        <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
+        <attribute name="applicationConfigName">JMX</attribute>
+    </gbean>
+
+
+    <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
+
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+
+</configuration>

Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=326794&r1=326793&r2=326794&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Wed Oct 19 20:47:40 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    Copyright 2004-2005 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.
@@ -25,254 +25,111 @@
 by the server.
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
-    parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
+               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
     >
 
-    <!--runtime dependencies-->
-    <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-j2ee</artifactId>
-        <version>${geronimo_spec_j2ee_version}</version>
-    </dependency>
 
+    <!--runtime dependencies-->
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-activation</artifactId>
-        <version>${geronimo_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <version>${geronimo_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <version>${geronimo_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-core</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-common</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-connector</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-naming</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
     </dependency>
+<!--    <dependency>-->
+<!--        <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>-->
+<!--    </dependency>-->
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-timer</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-transaction</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
     </dependency>
+
+    <!-- required for rar 1.5 to load realms -->
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-security</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
     </dependency>
+
+    <!-- for timer serialization implementation -->
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-webservices</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>xstream/jars/xstream-${xstream_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-jmxremoting</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>xpp3/jars/xpp3-${xpp3_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-client</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-axis</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-servicemix</artifactId>
-        <version>${geronimo_version}</version>
+        <uri>asm/jars/asm-${asm_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-jetty</artifactId>
-        <version>${geronimo_version}</version>
+         <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
     </dependency>
 
     <dependency>
-        <groupId>concurrent</groupId>
-        <artifactId>concurrent</artifactId>
-        <version>${concurrent_version}</version>
+         <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
     </dependency>
+
+    <!-- for JBI container -->
     <dependency>
-        <groupId>tranql</groupId>
-        <artifactId>tranql</artifactId>
-        <version>${tranql_version}</version>
+        <uri>geronimo/jars/geronimo-servicemix-${geronimo_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>openejb</groupId>
-        <artifactId>openejb-core</artifactId>
-        <version>${openejb_version}</version>
+        <uri>activemq/jars/activemq-gbean-management-${activemq_version}.jar</uri>
     </dependency>
+    <!-- remote login -->
     <dependency>
-        <groupId>howl</groupId>
-        <artifactId>howl-logger</artifactId>
-        <version>${howl_version}</version>
+        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
     </dependency>
+
+    <!--scout -->
     <dependency>
-        <groupId>antlr</groupId>
-        <artifactId>antlr</artifactId>
-        <version>${antlr_version}</version>
+        <uri>scout/jars/jaxr-api-${scout_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>regexp</groupId>
-        <artifactId>regexp</artifactId>
-        <version>${regexp_version}</version>
+        <uri>scout/jars/scout-${scout_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>xstream</groupId>
-        <artifactId>xstream</artifactId>
-        <version>${xstream_version}</version>
+        <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
     </dependency>
+
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3</artifactId>
-        <version>${xpp3_version}</version>
+        <uri>jdom/jars/jdom-1.0.jar</uri>
     </dependency>
+
+    <!-- Derby classes must be loaded from a common classloader -->
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>${asm_version}</version>
+        <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>activemq</groupId>
-        <artifactId>activemq-gbean-management</artifactId>
-        <version>${activemq_version}</version>
+        <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
     </dependency>
     <dependency>
-        <groupId>activeio</groupId>
-        <artifactId>activeio</artifactId>
-        <version>${activeio_version}</version>
+        <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
     </dependency>
 
-    <!-- default WAR container using Jetty -->
-    <gbean name="WebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
-    </gbean>
-
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
-        <reference name="JettyContainer"><name>WebContainer</name></reference>
-        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
-        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
-        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
-        <attribute name="logTimeZone">GMT</attribute>
-    </gbean>
-
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
-        <attribute name="port">${PlanHTTPPort}</attribute>
-        <reference name="JettyContainer"><name>WebContainer</name></reference>
-        <attribute name="maxThreads">50</attribute>
-        <attribute name="minThreads">10</attribute>
-    </gbean>
-
-    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
-        <attribute name="port">${PlanHTTPSPort}</attribute>
-        <attribute name="keystoreFileName">var/security/keystore</attribute>
-        <attribute name="keystoreType">JKS</attribute>
-        <attribute name="keystorePassword">secret</attribute>
-        <attribute name="keyPassword">secret</attribute>
-        <attribute name="clientAuthRequired">false</attribute>
-        <attribute name="secureProtocol">TLS</attribute>
-        <attribute name="maxThreads">50</attribute>
-        <attribute name="minThreads">10</attribute>
-        <reference name="JettyContainer"><name>WebContainer</name></reference>
-        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
-    </gbean>
-
-    <!-- TODO add in Tomcat support -->
-
-    <!-- Default security realm using properties files -->
-    <gbean name="properties-login"
-        class="org.apache.geronimo.security.jaas.LoginModuleGBean">
-        <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
-        <attribute name="serverSide">true</attribute>
-        <attribute name="options">
-            usersURI=var/security/users.properties
-            groupsURI=var/security/groups.properties
-        </attribute>
-        <attribute name="loginDomainName">geronimo-properties-realm</attribute>
-    </gbean>
-
-    <gbean name="geronimo-properties-realm"
-        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
-        <attribute name="realmName">geronimo-properties-realm</attribute>
-        <reference name="LoginModuleConfiguration">
-            <name>properties-login</name>
-        </reference>
-        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
-    </gbean>
-    <gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
-         <attribute name="controlFlag">REQUIRED</attribute>
-         <reference name="LoginModule">
-             <name>properties-login</name>
-         </reference>
-     </gbean>
-
-    <gbean name="JMX"
-        class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
-        <attribute name="applicationConfigName">JMX</attribute>
-        <attribute name="realmName">geronimo-properties-realm</attribute>
-    </gbean>
-
-    <!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
-    <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
-        <references name="Configurations">
-            <pattern><gbean-name>geronimo.server:j2eeType=SecurityRealm,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationEntry,*</gbean-name></pattern>
-        </references>
-    </gbean>
-
-    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
-        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
-        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
-    </gbean>
-
-    <gbean name="JaasLoginService" class="org.apache.geronimo.security.jaas.JaasLoginService">
-        <reference name="Realms"><application>*</application><module>*</module><name>*</name></reference>
-        <!--        <attribute name="reclaimPeriod">100000</attribute>-->
-        <attribute name="algorithm">HmacSHA1</attribute>
-        <attribute name="password">secret</attribute>
-    </gbean>
-
-    <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
-        <attribute name="protocol">tcp</attribute>
-        <attribute name="host">${PlanServerHostname}</attribute>
-        <attribute name="port">${PlanRemoteLoginPort}</attribute>
-        <reference name="LoginService"><name>JaasLoginService</name></reference>
-    </gbean>
-
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
         <attribute name="keepAliveTime">5000</attribute>
-        <attribute name="poolSize">30</attribute>
+        <attribute name="poolSize">300</attribute>
         <attribute name="poolName">DefaultThreadPool</attribute>
     </gbean>
 
@@ -299,7 +156,7 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
     </gbean>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
@@ -317,7 +174,7 @@
     </gbean>
 
     <!-- EJB Protocol -->
-    <gbean gbeanName="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
+    <gbean gbeanName="geronimo:type=NetworkService,name=EJB" class="org.activeio.xnet.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
         <attribute name="port">${PlanOpenEJBPort}</attribute>
         <attribute name="host">${PlanServerHostname}</attribute>
@@ -328,8 +185,15 @@
         <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
     </gbean>
     <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
-        <reference name="ContainerIndex"><gbean-name>openejb:type=ContainerIndex</gbean-name></reference>
+        <reference name="ContainerIndex">
+            <gbean-name>openejb:type=ContainerIndex</gbean-name>
+        </reference>
+        <reference name="ORBRefs">
+            <module>*</module>
+            <name>Server</name>
+        </reference>
     </gbean>
+
     <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
     <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
         <references name="EJBContainers">
@@ -342,20 +206,15 @@
     <!-- JSR77 Management Objects -->
     <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
     <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
     </gbean>
 
     <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
 
-    <!-- JMX Remoting -->
-    <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
-        <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
-        <attribute name="applicationConfigName">JMX</attribute>
-    </gbean>
-
-
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
 
     <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+
+    <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
 
 </configuration>

Modified: geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/src/plan/plan.xml?rev=326794&r1=326793&r2=326794&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-system/src/plan/plan.xml Wed Oct 19 20:47:40 2005
@@ -16,6 +16,7 @@
     limitations under the License.
 -->
 
+
 <!--
 Configuration for the innermost ring of a Geronimo server.
 This configuration should only contain critical services needed to
@@ -25,116 +26,71 @@
 This configuration should *NOT* be used to provide server or application
 specific services - those should be provided by children.
 -->
-
-<!-- $Rev:$ $Date:$ -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
     configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
     domain="geronimo.server"
     server="geronimo"
     >
 
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-common</artifactId>
-        <version>${geronimo_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <version>${geronimo_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <version>${geronimo_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
-        <version>${cglib_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>${commons_cli_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons_logging_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>${mx4j_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-remote</artifactId>
-        <version>${mx4j_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-qname</artifactId>
-        <version>${geronimo_spec_qname_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>${xerces_version}</version>
-    </dependency>
-    <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xmlParserAPIs</artifactId>
-        <version>${xml_parser_apis_version}</version>
-    </dependency>
-
     <!-- ServerInfo service -->
     <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
 
-    <!-- URLFactory service -->
-    <gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
-
-    <!-- Configuration Store service -->
-    <gbean name="Local" class="org.apache.geronimo.system.configuration.LocalConfigStore">
-        <attribute name="root">config-store</attribute>
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
-    </gbean>
-
     <!-- Configuration Manager service -->
     <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
-        <reference name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
-    </gbean>
-
-    <!-- Persistent List of running Configurations service -->
-    <gbean name="Default" class="org.apache.geronimo.system.configuration.FileConfigurationList">
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
-        <reference name="ConfigurationManager"><name>ConfigurationManager</name></reference>
-        <attribute name="configFile">var/config/config.list</attribute>
+        <reference name="Stores">
+            <gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>
+        </reference>
+        <reference name="AttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="PersistentConfigurationList">
+            <type>AttributeStore</type>
+            <name>AttributeManager</name>
+        </reference>
     </gbean>
 
     <!-- User-editable attribute service -->
     <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
         <attribute name="configFile">var/config/config.xml</attribute>
     </gbean>
 
+    <!-- Configuration Store service -->
+    <gbean name="Local" class="org.apache.geronimo.system.configuration.LocalConfigStore">
+        <attribute name="root">config-store</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="AttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+    </gbean>
+
+    <!-- Persistent List of running Configurations service -->
+<!--    <gbean name="Default" class="org.apache.geronimo.system.configuration.KernelMonitoringConfigurationList">-->
+<!--        <reference name="Delegate">-->
+<!--            <type>AttributeStore</type>-->
+<!--            <name>AttributeManager</name>-->
+<!--        </reference>-->
+<!--    </gbean>-->
+
     <!-- Repository -->
     <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
         <attribute name="root">repository/</attribute>
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
     </gbean>
 
     <!-- Logging service -->
     <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
         <attribute name="configFileName">var/log/server-log4j.properties</attribute>
         <attribute name="refreshPeriodSeconds">60</attribute>
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
     </gbean>
-</configuration>
\ No newline at end of file
+</configuration>

Added: geronimo/trunk/configs/jetty-deployer/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/LICENSE.txt?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/LICENSE.txt (added)
+++ geronimo/trunk/configs/jetty-deployer/LICENSE.txt Wed Oct 19 20:47:40 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/trunk/configs/jetty-deployer/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/NOTICE.txt?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/NOTICE.txt (added)
+++ geronimo/trunk/configs/jetty-deployer/NOTICE.txt Wed Oct 19 20:47:40 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/trunk/configs/jetty-deployer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/maven.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/maven.xml (added)
+++ geronimo/trunk/configs/jetty-deployer/maven.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    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.
+-->
+
+<!-- $Rev: 155756 $ $Date: 2005-02-28 22:10:07 -0800 (Mon, 28 Feb 2005) $ -->
+
+<project default="default">
+
+    <goal name="default">
+        <attainGoal name="car:install"/>
+    </goal>
+</project>

Added: geronimo/trunk/configs/jetty-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.properties?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.properties (added)
+++ geronimo/trunk/configs/jetty-deployer/project.properties Wed Oct 19 20:47:40 2005
@@ -0,0 +1,32 @@
+##
+##
+##   Copyright 2005 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.
+##
+
+##
+## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+##
+
+maven.multiproject.type=car
+
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+
+PlanHTTPPort=8080
+PlanHTTPSPort=8443
+PlanOpenEJBPort=4201
+PlanServerHostname=localhost
+PlanClientAddresses=127.0.0.1
+PlanRemoteLoginPort=4242

Added: geronimo/trunk/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.xml (added)
+++ geronimo/trunk/configs/jetty-deployer/project.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 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.
+-->
+
+<!-- $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+    <id>jetty-deployer</id>
+    <name>Jetty Deployer Configuration for the J2EE Server</name>
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activation</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-timer</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jmxremoting</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-servicemix</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+            <version>${tranql_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejb_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>howl</groupId>
+            <artifactId>howl-logger</artifactId>
+            <version>${howl_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+            <version>${regexp_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>${xpp3_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management</artifactId>
+            <version>${activemq_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeio_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+            <version>${jetty_version}</version>
+        </dependency>
+    </dependencies>
+</project>
+

Added: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (added)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,85 @@
+<!--
+
+    Copyright 2004-2005 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.
+-->
+
+<!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
+
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
+               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car"
+    >
+
+    <import>
+        <uri>${pom.groupId}/cars/jetty-${pom.currentVersion}.car</uri>
+    </import>
+
+
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server,org/apache/geronimo/Jetty</attribute>
+        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+        <attribute name="defaultContextPriorityClassloader">false</attribute>
+        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
+        <reference name="DefaultServlets">
+            <gbean-name>geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,*</gbean-name>
+        </reference>
+        <reference name="PojoWebServiceTemplate">
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
+        </reference>
+        <reference name="WebServiceBuilder">
+            <module>org/apache/geronimo/RuntimeDeployer</module>
+            <name>WebServiceBuilder</name>
+        </reference>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
+
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">default</attribute>
+        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+ acceptRanges=true
+ dirAllowed=true
+ putAllowed=false
+ delAllowed=false
+ redirectWelcome=false
+ minGzipLength=8192</attribute>
+        <attribute name="servletMappings">/</attribute>
+    </gbean>
+
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">jsp</attribute>
+        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+ logVerbosityLevel=DEBUG
+ fork=false
+ xpoweredBy=false</attribute>
+        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
+    </gbean>
+
+    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
+        <attribute name="servletName">dummy</attribute>
+    </gbean>
+
+</configuration>

Added: geronimo/trunk/configs/jetty/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/LICENSE.txt?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty/LICENSE.txt (added)
+++ geronimo/trunk/configs/jetty/LICENSE.txt Wed Oct 19 20:47:40 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/trunk/configs/jetty/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/NOTICE.txt?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty/NOTICE.txt (added)
+++ geronimo/trunk/configs/jetty/NOTICE.txt Wed Oct 19 20:47:40 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/trunk/configs/jetty/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/maven.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty/maven.xml (added)
+++ geronimo/trunk/configs/jetty/maven.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    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.
+-->
+
+<!-- $Rev: 155756 $ $Date: 2005-02-28 22:10:07 -0800 (Mon, 28 Feb 2005) $ -->
+
+<project default="default">
+
+    <goal name="default">
+        <attainGoal name="car:install"/>
+    </goal>
+</project>

Added: geronimo/trunk/configs/jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/project.properties?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty/project.properties (added)
+++ geronimo/trunk/configs/jetty/project.properties Wed Oct 19 20:47:40 2005
@@ -0,0 +1,32 @@
+##
+##
+##   Copyright 2005 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.
+##
+
+##
+## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+##
+
+maven.multiproject.type=car
+
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+
+PlanHTTPPort=8080
+PlanHTTPSPort=8443
+PlanOpenEJBPort=4201
+PlanServerHostname=localhost
+PlanClientAddresses=127.0.0.1
+PlanRemoteLoginPort=4242



Mime
View raw message