geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r572395 [4/11] - in /geronimo/server/trunk: ./ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/ applications/geron...
Date Mon, 03 Sep 2007 17:39:06 GMT
Added: geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <!--runtime dependencies-->
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>j2ee-security</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-security</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jmx-remoting</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>rmi-naming</artifactId>
+        <type>car</type>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+  <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
+    <reference name="ServerInfo">
+      <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>
+  <!--Register GeronimoLoginConfiguration as the LoginConfiguration handler-->
+  <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
+    <references name="Configurations">
+      <pattern>
+        <type>SecurityRealm</type>
+      </pattern>
+      <pattern>
+        <type>ConfigurationEntry</type>
+      </pattern>
+    </references>
+  </gbean>
+  <!--JMX Remoting-->
+  <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
+    <attribute name="protocol">rmi</attribute>
+    <attribute name="host">0.0.0.0</attribute>
+    <attribute name="port">9999</attribute>
+    <attribute name="urlPath">/jndi/rmi://0.0.0.0:1099/JMXConnector</attribute>
+    <attribute name="applicationConfigName">geronimo-admin</attribute>
+    <reference name="MBeanServerReference">
+      <name>MBeanServerReference</name>
+    </reference>
+  </gbean>
+  <gbean name="KeystoreManager" class="org.apache.geronimo.security.keystore.FileKeystoreManager">
+    <attribute name="keystoreDir">var/security/keystores</attribute>
+    <reference name="ServerInfo">
+      <name>ServerInfo</name>
+    </reference>
+    <references name="KeystoreInstances">
+      <pattern>
+        <type>Keystore</type>
+      </pattern>
+    </references>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <!--JSR77 Management Objects-->
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>j2ee-server</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <version>3.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
+        <version>2.2.3</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>rmi-naming</artifactId>
+        <type>car</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>2.2.3</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-core</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-webservices</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+  <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
+    <reference name="Servers"/>
+  </gbean>
+  <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+    <reference name="ServerInfo">
+      <name>ServerInfo</name>
+    </reference>
+    <reference name="JVMs"/>
+    <references name="Resources">
+      <pattern>
+        <type>JCAResource</type>
+      </pattern>
+      <pattern>
+        <type>JavaMailResource</type>
+      </pattern>
+      <pattern>
+        <type>JDBCResource</type>
+      </pattern>
+      <pattern>
+        <type>JMSResource</type>
+      </pattern>
+      <pattern>
+        <type>JNDIResource</type>
+      </pattern>
+      <pattern>
+        <type>JTAResource</type>
+      </pattern>
+      <pattern>
+        <type>RMI_IIOPResource</type>
+      </pattern>
+      <pattern>
+        <type>URLResource</type>
+      </pattern>
+    </references>
+    <reference name="Applications"/>
+    <reference name="AppClientModules"/>
+    <reference name="WebModules"/>
+    <reference name="EJBModules"/>
+    <reference name="ResourceAdapterModules"/>
+    <reference name="WebManagers"/>
+    <reference name="EJBManagers"/>
+    <reference name="JMSManagers"/>
+    <reference name="ThreadPools"/>
+    <reference name="Repositories"/>
+    <reference name="WritableRepos"/>
+    <reference name="SecurityRealms"/>
+    <reference name="KeystoreManagers"/>
+    <reference name="PluginRepoLists"/>
+    <reference name="PluginInstaller">
+      <name>PluginInstaller</name>
+    </reference>
+    <reference name="ConfigurationManager">
+      <name>ConfigurationManager</name>
+    </reference>
+  </gbean>
+  <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl">
+    <reference name="SystemLog">
+      <name>Logger</name>
+    </reference>
+  </gbean>
+  <gbean name="ServerSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+    <attribute name="systemProperties">javax.xml.soap.MessageFactory=org.apache.geronimo.webservices.saaj.GeronimoMessageFactory
+           javax.xml.soap.SOAPFactory=org.apache.geronimo.webservices.saaj.GeronimoSOAPFactory
+           javax.xml.soap.SOAPConnectionFactory=org.apache.geronimo.webservices.saaj.GeronimoSOAPConnectionFactory
+           javax.xml.soap.MetaFactory=org.apache.geronimo.webservices.saaj.GeronimoMetaFactory
+           org.apache.cxf.jaxws.checkPublishEndpointPermission=true
+           java.net.preferIPv4Stack=true</attribute>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Mon Sep  3 10:38:54 2007
@@ -21,7 +21,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,9 +32,9 @@
     <artifactId>j2ee-system</artifactId>
     <name>Geronimo Configs :: J2EE System</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -48,7 +48,7 @@
             <artifactId>geronimo-common</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -81,7 +81,7 @@
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
@@ -92,13 +92,37 @@
             <artifactId>ognl</artifactId>
         </dependency>
 
+        <!-- used by plugin installer -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -109,7 +133,7 @@
                             <mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>
                         </manifest>
                     </archive>
-                    
+
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
@@ -164,11 +188,137 @@
                             <groupId>xstream</groupId>
                             <artifactId>xstream</artifactId>
                         </element>
+                        <!-- TODO bad idea... temp, for plugins -->
+                        <element>
+                            <groupId>javax.xml.bind</groupId>
+                            <artifactId>jaxb-api</artifactId>
+                        </element>
+                        <element>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-impl</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                        </element>
+                        <element>
+                            <groupId>woodstox</groupId>
+                            <artifactId>wstx-asl</artifactId>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-activation_1.1_spec</artifactId>
+                        </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
+
+
+
+                    <category>Geronimo Core</category>
+                    <dependencies>
+                        <dependency>
+                          <groupId>com.sun.xml.bind</groupId>
+                          <artifactId>jaxb-impl</artifactId>
+                          <version>2.0.5</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.specs</groupId>
+                          <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                          <version>1.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.modules</groupId>
+                          <artifactId>geronimo-common</artifactId>
+                          <version>2.1-SNAPSHOT</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>jline</groupId>
+                          <artifactId>jline</artifactId>
+                          <version>0.9.91</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.modules</groupId>
+                          <artifactId>geronimo-util</artifactId>
+                          <version>2.1-SNAPSHOT</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>ognl</groupId>
+                          <artifactId>ognl</artifactId>
+                          <version>2.6.9</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>asm</groupId>
+                          <artifactId>asm</artifactId>
+                          <version>2.2.3</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>commons-jexl</groupId>
+                          <artifactId>commons-jexl</artifactId>
+                          <version>1.1</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>asm</groupId>
+                          <artifactId>asm-commons</artifactId>
+                          <version>2.2.3</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>commons-cli</groupId>
+                          <artifactId>commons-cli</artifactId>
+                          <version>1.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>woodstox</groupId>
+                          <artifactId>wstx-asl</artifactId>
+                          <version>3.2.1</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>javax.xml.bind</groupId>
+                          <artifactId>jaxb-api</artifactId>
+                          <version>2.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.specs</groupId>
+                          <artifactId>geronimo-activation_1.1_spec</artifactId>
+                          <version>1.0</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.apache.geronimo.modules</groupId>
+                          <artifactId>geronimo-system</artifactId>
+                          <version>2.1-SNAPSHOT</version>
+                          <type>jar</type>
+                          <import>classes</import>
+                        </dependency>
+                    </dependencies>
+
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Added: geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.-->
+<!--Configuration for the innermost ring of a Geronimo server.
+This module should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This module should *NOT* be used to provide server or application
+specific services - those should be provided by children.-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+  <!--ServerInfo service-->
+  <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+  <!--Repository-->
+  <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+    <attribute name="root">repository/</attribute>
+    <reference name="ServerInfo">
+      <name>ServerInfo</name>
+    </reference>
+  </gbean>
+  <!--Pinged and changed when the server completes loading when all the persistent configuration is loaded-->
+  <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+    <attribute name="serverStarted">false</attribute>
+  </gbean>
+  <!--Configuration Store service-->
+  <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+    <reference name="Repository">
+      <name>Repository</name>
+    </reference>
+  </gbean>
+  <!--User-editable attribute service-->
+  <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+    <reference name="ServerInfo">
+      <name>ServerInfo</name>
+    </reference>
+    <attribute name="configFile">var/config/config.xml</attribute>
+    <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+    <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+  </gbean>
+  <!--ArtifactManager-->
+  <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+  <!--ArtifactResolver-->
+  <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+    <reference name="ArtifactManager">
+      <name>ArtifactManager</name>
+    </reference>
+    <reference name="Repositories"/>
+    <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+    <reference name="ServerInfo">
+      <name>ServerInfo</name>
+    </reference>
+  </gbean>
+  <!--Configuration Manager service-->
+  <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+    <reference name="Repositories"/>
+    <reference name="Stores"/>
+    <reference name="Watchers"/>
+    <reference name="AttributeStore">
+      <name>AttributeManager</name>
+    </reference>
+    <reference name="PersistentConfigurationList">
+      <type>AttributeStore</type>
+      <name>AttributeManager</name>
+    </reference>
+    <reference name="ArtifactManager">
+      <name>ArtifactManager</name>
+    </reference>
+    <reference name="ArtifactResolver">
+      <name>ArtifactResolver</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>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>jasper-deployer</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jasper</artifactId>
+        <type>car</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jasper-builder</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+  <gbean name="JspModuleBuilderExtension" class="org.apache.geronimo.jasper.deployment.JspModuleBuilderExtension">
+    <reference name="NamingBuilders">
+      <name>NamingBuilders</name>
+    </reference>
+    <xml-attribute name="defaultEnvironment">
+      <environment>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <type>car</type>
+          </dependency>
+        </dependencies>
+      </environment>
+    </xml-attribute>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>jasper</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jasper</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction</artifactId>
+        <type>car</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>jasper</artifactId>
+        <version>6.0.13-G543818</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>jasper-el</artifactId>
+        <version>6.0.13</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat.extras</groupId>
+        <artifactId>juli-adapters</artifactId>
+        <version>6.0.13</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>jasper-jdt</artifactId>
+        <version>6.0.13</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat.extras</groupId>
+        <artifactId>juli</artifactId>
+        <version>6.0.13</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+  <gbean name="JasperSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+    <attribute name="systemProperties">org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS=true</attribute>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>javamail</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-mail</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.javamail</groupId>
+        <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        <version>1.2</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>rmi-naming</artifactId>
+        <type>car</type>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+  <gbean name="mail/MailSession" class="org.apache.geronimo.mail.MailGBean">
+    <attribute name="transportProtocol">smtp</attribute>
+    <attribute name="jndiName">ger:/MailSession</attribute>
+    <reference name="Protocols"/>
+  </gbean>
+  <gbean name="SMTPTransport" class="org.apache.geronimo.mail.SMTPTransportGBean">
+    <attribute name="host">localhost</attribute>
+    <attribute name="port">25</attribute>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>jaxws-deployer</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jaxws-builder</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>openejb-deployer</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>webservices-common</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>j2ee-deployer</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  <environment>
+    <moduleId>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>jee-specs</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>1.1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.javamail</groupId>
+        <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        <version>1.2</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>2.0.5</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-api</artifactId>
+        <version>1.2.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jdbc</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-saaj-api</artifactId>
+        <version>1.3</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jacc_1.1_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>jstl</groupId>
+        <artifactId>jstl</artifactId>
+        <version>1.2</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-jaxws-api</artifactId>
+        <version>1.3</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jsp_2.1_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+        <version>1.1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-el_1.0_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+        <version>1.0</version>
+        <type>jar</type>
+        <import>classes</import>
+      </dependency>
+    </dependencies>
+    <hidden-classes/>
+    <non-overridable-classes/>
+  </environment>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>jetty6-clustering-builder-wadi</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.codehaus.wadi</dep:groupId>
+        <dep:artifactId>wadi-core</dep:artifactId>
+        <dep:version>2.0-M5</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.codehaus.wadi</dep:groupId>
+        <dep:artifactId>wadi-group</dep:artifactId>
+        <dep:version>2.0-M5</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.tomcat</dep:groupId>
+        <dep:artifactId>tribes</dep:artifactId>
+        <dep:version>6.0.13</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>jetty6-deployer</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-clustering-wadi</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jetty6-clustering-wadi</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jetty6-clustering-builder-wadi</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-clustering</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.codehaus.wadi</dep:groupId>
+        <dep:artifactId>wadi-tribes</dep:artifactId>
+        <dep:version>2.0-M5</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <gbean name="JettyClusteringBuilder" class="org.apache.geronimo.jetty6.cluster.wadi.builder.WADIJettyClusteringBuilder">
+    <attribute name="defaultSweepInterval">36000</attribute>
+    <attribute name="defaultNumPartitions">24</attribute>
+    <attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>
+    <attribute name="defaultClusterName">?name=DefaultCluster</attribute>
+    <xml-attribute name="defaultEnvironment">
+      <environment>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-clustering-wadi</artifactId>
+            <type>car</type>
+          </dependency>
+        </dependencies>
+      </environment>
+    </xml-attribute>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>jetty6-clustering-wadi</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>wadi-clustering</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jetty6-clustering-wadi</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>jetty6</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>jetty6-deployer</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>connector-deployer</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.schema</dep:groupId>
+        <dep:artifactId>geronimo-schema-jee_5</dep:artifactId>
+        <dep:version>1.1</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>jetty6</dep:artifactId>
+        <dep:type>car</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>j2ee-deployer</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-web-2.5-builder</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jetty6-builder</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty6.deployment.JettyModuleBuilder">
+    <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+    <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+    <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
+    <attribute name="defaultLocaleEncodingMappings">ar=ISO-8859-6
+be=ISO-8859-5
+bg=ISO-8859-5
+ca=ISO-8859-1
+cs=ISO-8859-2
+da=ISO-8859-1
+de=ISO-8859-1
+el=ISO-8859-7
+en=ISO-8859-1
+es=ISO-8859-1
+et=ISO-8859-1
+fi=ISO-8859-1
+fr=ISO-8859-1
+hr=ISO-8859-2
+hu=ISO-8859-2
+is=ISO-8859-1
+it=ISO-8859-1
+iw=ISO-8859-8
+ja=Shift_JIS
+ko=EUC-KR
+lt=ISO-8859-2
+lv=ISO-8859-2
+mk=ISO-8859-5
+nl=ISO-8859-1
+no=ISO-8859-1
+pl=ISO-8859-2
+pt=ISO-8859-1
+ro=ISO-8859-2
+ru=ISO-8859-5
+sh=ISO-8859-5
+sk=ISO-8859-2
+sl=ISO-8859-2
+sq=ISO-8859-2
+sr=ISO-8859-5
+sv=ISO-8859-1
+tr=ISO-8859-9
+uk=ISO-8859-5
+zh=GB2312
+zh_TW=Big5</attribute>
+    <attribute name="defaultMimeTypeMappings">wsdl=text/xml</attribute>
+    <references name="DefaultServlets">
+      <pattern>
+        <name>StaticContent</name>
+      </pattern>
+    </references>
+    <reference name="JspServlet">
+      <name>JSPServlet</name>
+    </reference>
+    <reference name="PojoWebServiceTemplate">
+      <name>POJOTemplate</name>
+    </reference>
+    <reference name="SecurityBuilders">
+      <name>SecurityBuilder</name>
+    </reference>
+    <references name="ServiceBuilders">
+      <pattern>
+        <name>GBeanBuilder</name>
+      </pattern>
+    </references>
+    <references name="WebServiceBuilder">
+      <pattern>
+        <name>CXFBuilder</name>
+      </pattern>
+      <pattern>
+        <name>Axis2Builder</name>
+      </pattern>
+      <pattern>
+        <name>WebServiceBuilder</name>
+      </pattern>
+      <pattern>
+        <name>UnavailableWebServiceBuilder</name>
+      </pattern>
+    </references>
+    <reference name="NamingBuilders">
+      <name>NamingBuilders</name>
+    </reference>
+    <reference name="ClusteringBuilders">
+      <name>JettyClusteringBuilder</name>
+    </reference>
+    <references name="ModuleBuilderExtensions">
+      <pattern>
+        <name>PersistenceUnitBuilder</name>
+      </pattern>
+      <pattern>
+        <name>MyFacesModuleBuilderExtension</name>
+      </pattern>
+      <pattern>
+        <name>JspModuleBuilderExtension</name>
+      </pattern>
+    </references>
+    <reference name="ResourceEnvironmentSetter">
+      <name>ResourceRefBuilder</name>
+    </reference>
+    <xml-attribute name="defaultEnvironment">
+      <environment>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6</artifactId>
+            <type>car</type>
+          </dependency>
+        </dependencies>
+        <hidden-classes/>
+        <non-overridable-classes>
+          <filter>java.</filter>
+          <filter>javax.</filter>
+          <filter>org.apache.geronimo.</filter>
+          <filter>org.apache.myfaces.</filter>
+          <filter>org.apache.taglibs.</filter>
+          <filter>org.mortbay.</filter>
+          <filter>org.xml.</filter>
+          <filter>org.w3c.</filter>
+        </non-overridable-classes>
+      </environment>
+    </xml-attribute>
+  </gbean>
+  <gbean name="StaticContent" class="org.apache.geronimo.jetty6.JettyDefaultServletHolder">
+    <attribute name="servletName">default</attribute>
+    <attribute name="servletClass">org.mortbay.jetty.servlet.DefaultServlet</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.jetty6.JettyJspServletHolder">
+    <attribute name="servletName">jsp</attribute>
+    <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
+    <attribute name="loadOnStartup">0</attribute>
+    <attribute name="initParams">development=false
+            fork=false
+            logVerbosityLevel=DEBUG
+            xpoweredBy=false
+            engineOptionsClass=org.apache.geronimo.jasper.JspServletOptions</attribute>
+    <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
+  </gbean>
+  <gbean name="POJOTemplate" class="org.apache.geronimo.jetty6.JettyPOJOWebServiceHolder">
+    <attribute name="servletName">dummy</attribute>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jetty6-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <!--david jencks is not convinced that these 2 gbeans should be in this
+         plan and thinks they might belong in the console plan.  Aaron thinks
+         they definitely don't belong in the console plan, but could go into
+         a management layer plan.-->
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+      <dep:artifactId>jetty6</dep:artifactId>
+      <dep:version>2.1-SNAPSHOT</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>server-security-config</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>webservices-common</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>transaction</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.slf4j</dep:groupId>
+        <dep:artifactId>slf4j-api</dep:artifactId>
+        <dep:version>1.4.3</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>j2ee-server</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>clustering</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-jetty6</dep:artifactId>
+        <dep:version>2.1-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.slf4j</dep:groupId>
+        <dep:artifactId>slf4j-jcl</dep:artifactId>
+        <dep:version>1.4.3</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <gbean name="JettyWebManager" class="org.apache.geronimo.jetty6.JettyManagerImpl"/>
+  <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty6.requestlog.JettyLogManagerImpl">
+    <references name="LogGBeans">
+      <pattern>
+        <!--This is lame and should be replaced by an interface reference-->
+        <name>JettyRequestLog</name>
+      </pattern>
+    </references>
+    <reference name="ServerInfo">
+      <name>ServerInfo</name>
+    </reference>
+  </gbean>
+  <!--default WAR container using Jetty-->
+  <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+    <reference name="WebManager">
+      <name>JettyWebManager</name>
+    </reference>
+  </gbean>
+  <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+    <reference name="JettyContainer">
+      <name>JettyWebContainer</name>
+    </reference>
+    <reference name="ServerInfo">
+      <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.jetty6.connector.HTTPSelectChannelConnector">
+    <attribute name="host">0.0.0.0</attribute>
+    <attribute name="port">8080</attribute>
+    <reference name="JettyContainer">
+      <name>JettyWebContainer</name>
+    </reference>
+    <reference name="ThreadPool">
+      <name>DefaultThreadPool</name>
+    </reference>
+    <attribute name="maxThreads">50</attribute>
+    <!--<attribute name="minThreads">25</attribute>-->
+    <!--<attribute name="lowThreads">25</attribute>-->
+    <!--<attribute name="maxIdleTimeMs">30000</attribute>-->
+    <!--<attribute name="lowThreadsMaxIdleTimeMs">800</attribute>-->
+  </gbean>
+  <gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty6.connector.AJP13Connector">
+    <attribute name="host">0.0.0.0</attribute>
+    <attribute name="port">8019</attribute>
+    <reference name="JettyContainer">
+      <name>JettyWebContainer</name>
+    </reference>
+    <reference name="ThreadPool">
+      <name>DefaultThreadPool</name>
+    </reference>
+    <attribute name="maxThreads">50</attribute>
+    <!--<attribute name="minThreads">10</attribute>-->
+  </gbean>
+  <!--DONT USE THIS ONE-->
+  <!--<gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSocketConnector">
+        <attribute name="host">0.0.0.0</attribute>
+        <attribute name="port">8443</attribute>
+        <attribute name="keyStore">geronimo-default</attribute>
+        <attribute name="keyAlias">geronimo</attribute>
+        <attribute name="trustStore">geronimo-default</attribute>
+        <attribute name="clientAuthRequired">false</attribute>
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="secureProtocol">TLS</attribute>
+        <attribute name="maxThreads">50</attribute>
+        <reference name="JettyContainer">
+            <name>JettyWebContainer</name>
+        </reference>
+        <reference name="ThreadPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="KeystoreManager">
+            <name>KeystoreManager</name>
+        </reference>
+    </gbean>-->
+  <!--USE THIS ONE-->
+  <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector">
+    <attribute name="host">0.0.0.0</attribute>
+    <attribute name="port">8443</attribute>
+    <attribute name="keyStore">geronimo-default</attribute>
+    <attribute name="keyAlias">geronimo</attribute>
+    <attribute name="trustStore">geronimo-default</attribute>
+    <attribute name="clientAuthRequired">false</attribute>
+    <attribute name="algorithm">Default</attribute>
+    <attribute name="secureProtocol">TLS</attribute>
+    <attribute name="maxThreads">50</attribute>
+    <reference name="JettyContainer">
+      <name>JettyWebContainer</name>
+    </reference>
+    <reference name="ThreadPool">
+      <name>DefaultThreadPool</name>
+    </reference>
+    <reference name="KeystoreManager">
+      <name>KeystoreManager</name>
+    </reference>
+  </gbean>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml Mon Sep  3 10:38:54 2007
@@ -32,6 +32,11 @@
     <artifactId>jsp-examples-jetty</artifactId>
     <name>Geronimo Configs :: JSP Examples Jetty</name>
     <packaging>car</packaging>
+    <description>
+        The JSP examples originally developed for Tomcat.  Can be found
+        via HTTP at /jsp-examples/ after installation.  These examples give
+        a basic introduction to JSP development along with sample code.
+    </description>
 
     <dependencies>
         
@@ -97,6 +102,33 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
+                    
+                    <category>Example</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jasper</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                    <prerequisites>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>jetty6</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>The Jetty web container</description>
+                        </prerequisite>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>jasper</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>The Jasper subsystem</description>
+                        </prerequisite>
+                    </prerequisites>
                 </configuration>
             </plugin>
         </plugins>

Added: geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+  <context-root>/jsp-examples</context-root>
+  <security-realm-name>geronimo-admin</security-realm-name>
+  <security>
+    <role-mappings>
+      <role role-name="tomcat">
+        <principal name="admin" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+      </role>
+    </role-mappings>
+  </security>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jsp-examples-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml Mon Sep  3 10:38:54 2007
@@ -32,6 +32,11 @@
     <artifactId>jsp-examples-tomcat</artifactId>
     <name>Geronimo Configs :: JSP Examples Tomcat</name>
     <packaging>car</packaging>
+    <description>
+        The JSP examples originally developed for Tomcat.  Can be found
+        via HTTP at /jsp-examples/ after installation.  These examples give
+        a basic introduction to JSP development along with sample code.
+    </description>
     
     <dependencies>
         
@@ -89,6 +94,32 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
+                    <category>Example</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jasper</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                    <prerequisites>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>tomcat</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>The Tomcat web container</description>
+                        </prerequisite>
+                        <prerequisite>
+                            <id>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>jasper</artifactId>
+                            </id>
+                            <resource-type>Web Container</resource-type>
+                            <description>The Jasper subsystem</description>
+                        </prerequisite>
+                    </prerequisites>
                 </configuration>
             </plugin>
         </plugins>

Added: geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml?rev=572395&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml Mon Sep  3 10:38:54 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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$ $Date$-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+  <context-root>/jsp-examples</context-root>
+  <security-realm-name>geronimo-admin</security-realm-name>
+  <security>
+    <role-mappings>
+      <role role-name="tomcat">
+        <principal name="admin" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+      </role>
+    </role-mappings>
+  </security>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/pom.xml?rev=572395&r1=572394&r2=572395&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/configs/jsr88-cli/pom.xml Mon Sep  3 10:38:54 2007
@@ -100,6 +100,28 @@
             <artifactId>jline</artifactId>
         </dependency>
 
+        <!-- used by plugin installer -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>



Mime
View raw message