geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r591501 - in /geronimo/server/trunk: applications/ca-helper/ca-helper-jetty/src/plan/ applications/ca-helper/ca-helper-tomcat/src/plan/ framework/configs/client-system/src/plan/ framework/configs/geronimo-gbean-deployer-bootstrap/src/main/p...
Date Fri, 02 Nov 2007 22:42:36 GMT
Author: djencks
Date: Fri Nov  2 15:42:31 2007
New Revision: 591501

URL: http://svn.apache.org/viewvc?rev=591501&view=rev
Log:
Remove duplicate plans, clean up a few plans, set up config.xml correctly for ws-ejb-deployers

Removed:
    geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/src/plan/
    geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/src/plan/
    geronimo/server/trunk/framework/configs/client-system/src/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/plan/
    geronimo/server/trunk/framework/configs/j2ee-security/src/plan/
    geronimo/server/trunk/framework/configs/j2ee-system/src/plan/
    geronimo/server/trunk/framework/configs/jee-specs/src/plan/
    geronimo/server/trunk/plugins/activemq/activemq-broker/src/plan/
    geronimo/server/trunk/plugins/activemq/activemq-ra/src/plan/
    geronimo/server/trunk/plugins/axis/axis-deployer/src/plan/
    geronimo/server/trunk/plugins/axis/axis/src/plan/
    geronimo/server/trunk/plugins/axis2/axis2-deployer/src/plan/
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/plan/
    geronimo/server/trunk/plugins/axis2/axis2-ejb/src/plan/
    geronimo/server/trunk/plugins/axis2/axis2/src/plan/
    geronimo/server/trunk/plugins/client/client-deployer/src/plan/
    geronimo/server/trunk/plugins/client/client-security/src/plan/
    geronimo/server/trunk/plugins/client/client/src/plan/
    geronimo/server/trunk/plugins/clustering/clustering/src/plan/
    geronimo/server/trunk/plugins/connector/client-transaction/src/plan/
    geronimo/server/trunk/plugins/connector/connector-deployer/src/plan/
    geronimo/server/trunk/plugins/corba/client-corba-yoko/src/plan/
    geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/plan/
    geronimo/server/trunk/plugins/cxf/cxf-deployer/src/plan/
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/plan/
    geronimo/server/trunk/plugins/cxf/cxf-ejb/src/plan/
    geronimo/server/trunk/plugins/cxf/cxf/src/plan/
    geronimo/server/trunk/plugins/dojo/dojo-jetty6/src/plan/
    geronimo/server/trunk/plugins/dojo/dojo-tomcat/src/plan/
    geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/plan/
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/plan/
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/plan/
    geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/plan/
    geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/plan/
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/plan/
    geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/plan/
    geronimo/server/trunk/plugins/jasper/jasper-deployer/src/plan/
    geronimo/server/trunk/plugins/jasper/jasper/src/plan/
    geronimo/server/trunk/plugins/javamail/javamail/src/plan/
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/plan/
    geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/plan/
    geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/plan/
    geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/plan/
    geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/plan/
    geronimo/server/trunk/plugins/jetty/jetty6/src/plan/
Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/javamail/javamail/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -14,96 +14,94 @@
     See the License for the specific language governing permissions and
     limitations under the License.-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <!--Deployer used to process modules and plans-->
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-deployment</artifactId>
-        <version>2.1-SNAPSHOT</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.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-service-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <version>2.3.0</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <version>1.0</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
-    <reference name="Store">
-      <!--<pattern><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></pattern>-->
-    </reference>
-    <reference name="Builders"></reference>
-    <reference name="Watchers"></reference>
-  </gbean>
-  <!--Builder for handling plans defining Geronimo modules-->
-  <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
-    <!--<attribute name="defaultParentId">geronimo/j2ee-server/2.1-SNAPSHOT/car</attribute>-->
-    <reference name="Repository">
-      <!--<pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>-->
-      <!--<pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>-->
-    </reference>
-    <reference name="ServiceBuilders">
-      <name>GBeanBuilder</name>
-    </reference>
-  </gbean>
-  <!--NamespaceDriveBuilder for handling gbeans-->
-  <gbean name="GBeanBuilder" class="org.apache.geronimo.deployment.service.GBeanBuilder">
-    <reference name="XmlAttributeBuilders">
-      <!--<module>*</module>-->
-      <!--<name>*</name>-->
-    </reference>
-    <reference name="XmlReferenceBuilders">
-      <!--<module>*</module>-->
-      <!--<name>*</name>-->
-    </reference>
-  </gbean>
-  <!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
+    <!--Deployer used to process modules and plans-->
+<!--
+    <environment>
+        <moduleId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <type>car</type>
+        </moduleId>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deployment</artifactId>
+                <version>2.1-SNAPSHOT</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.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-service-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deploy-config</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>1.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+        </dependencies>
+        <hidden-classes/>
+        <non-overridable-classes/>
+    </environment>
+-->
+    <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
+        <reference name="Store">
+        </reference>
+        <reference name="Builders"></reference>
+        <reference name="Watchers"></reference>
+    </gbean>
+
+    <!--Builder for handling plans defining Geronimo modules-->
+    <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+        <reference name="Repository">
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+    </gbean>
+
+    <!--NamespaceDriveBuilder for handling gbeans-->
+    <gbean name="GBeanBuilder" class="org.apache.geronimo.deployment.service.GBeanBuilder">
+        <reference name="XmlAttributeBuilders">
+        </reference>
+        <reference name="XmlReferenceBuilders">
+        </reference>
+    </gbean>
+
+    <!-- environment builder is installed in code because it is needed to deploy this module. -->
+    <!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
 </module>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -14,35 +14,32 @@
     See the License for the specific language governing permissions and
     limitations under the License.-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
-    <attribute name="remoteDeployAddress">localhost:8080</attribute>
-    <reference name="Store">
-      <!--<pattern><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></pattern>-->
-    </reference>
-    <reference name="Builders"></reference>
-    <reference name="Watchers"></reference>
-  </gbean>
-  <!--Builder for handling plans defining Geronimo modules-->
-  <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
-    <!--<attribute name="defaultParentId">geronimo/j2ee-server/2.1-SNAPSHOT/car</attribute>-->
-    <reference name="Repository">
-      <!--<pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>-->
-      <!--<pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>-->
-    </reference>
-    <reference name="ServiceBuilders">
-      <name>GBeanBuilder</name>
-    </reference>
-  </gbean>
-  <!--NamespaceDriveBuilder for handling gbeans-->
-  <gbean name="GBeanBuilder" class="org.apache.geronimo.deployment.service.GBeanBuilder">
-    <reference name="XmlAttributeBuilders">
-      <!--<module>*</module>-->
-      <!--<name>*</name>-->
-    </reference>
-    <reference name="XmlReferenceBuilders">
-      <!--<module>*</module>-->
-      <!--<name>*</name>-->
-    </reference>
-  </gbean>
-  <!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
+
+    <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
+        <attribute name="remoteDeployAddress">localhost:8080</attribute>
+        <reference name="Store">
+        </reference>
+        <reference name="Builders"></reference>
+        <reference name="Watchers"></reference>
+    </gbean>
+
+    <!--Builder for handling plans defining Geronimo modules-->
+    <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+        <reference name="Repository">
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+    </gbean>
+
+    <!--NamespaceDriveBuilder for handling gbeans-->
+    <gbean name="GBeanBuilder" class="org.apache.geronimo.deployment.service.GBeanBuilder">
+        <reference name="XmlAttributeBuilders">
+        </reference>
+        <reference name="XmlReferenceBuilders">
+        </reference>
+    </gbean>
+
+    <!-- environment builder is installed in code because it is needed to deploy this module. -->
+    <!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
 </module>

Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml Fri Nov  2 15:42:31 2007
@@ -116,9 +116,6 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>
-                                <gbean name="AxisServiceRefBuilder">
-                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-                                </gbean>
                                 <gbean name="AxisModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                     <attribute name="defaultEnvironment">
@@ -135,9 +132,6 @@
                                 </gbean>
                             </config-xml-content>
                             <config-xml-content server="offline">
-                                <gbean name="AxisServiceRefBuilder">
-                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-                                </gbean>
                                 <gbean name="AxisModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                     <attribute name="defaultEnvironment">

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Fri Nov  2 15:42:31 2007
@@ -34,7 +34,7 @@
     <packaging>car</packaging>
 
     <description>Geronimo JAX-WS EJB deployer for Apache Axis2</description>
-    
+
     <dependencies>
 
         <dependency>
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-             <artifactId>jaxws-ejb-deployer</artifactId>
+            <artifactId>jaxws-ejb-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -63,10 +63,10 @@
             <type>car</type>
             <version>${version}</version>
             <scope>runtime</scope>
-       </dependency>
+        </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -78,35 +78,43 @@
                     </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jaxws-ejb-deployer</artifactId>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>axis2-deployer</artifactId>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>axis2-ejb</artifactId>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-axis2-ejb-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jaxws-ejb-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>axis2-deployer</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>axis2-ejb</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-axis2-ejb-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'">
+                                <gbean name="Axis2ModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'">
+                                <gbean name="Axis2ModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                </gbean>
+                            </config-xml-content>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Fri Nov  2 15:42:31 2007
@@ -36,7 +36,7 @@
     <description>Geronimo JAX-WS EJB deployer for Apache CXF</description>
 
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
@@ -63,10 +63,10 @@
             <type>car</type>
             <version>${version}</version>
             <scope>runtime</scope>
-       </dependency>
+        </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -78,35 +78,43 @@
                     </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jaxws-ejb-deployer</artifactId>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>cxf-deployer</artifactId>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>cxf-ejb</artifactId>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-cxf-ejb-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jaxws-ejb-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>cxf-deployer</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>cxf-ejb</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-cxf-ejb-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'"/>
-                            <config-xml-content server="offline" condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'"/>
+                            <config-xml-content server="default" condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'">
+                                <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-xml-content server="offline" condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'">
+                                <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                </gbean>
+                            </config-xml-content>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,33 +13,13 @@
     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>jsr88-ear-configurer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-cli</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="EARConfigurer" class="org.apache.geronimo.j2ee.jsr88.EARConfigurer"/>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="EARConfigurer" class="org.apache.geronimo.j2ee.jsr88.EARConfigurer"/>
+
+</module>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,32 +13,11 @@
     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.-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>jsr88-jar-configurer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-cli</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-client-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="ClientConfigurer" class="org.apache.geronimo.client.builder.jsr88.ClientConfigurer"/>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="ClientConfigurer" class="org.apache.geronimo.client.builder.jsr88.ClientConfigurer"/>
+
+</module>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,32 +13,13 @@
     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>jsr88-rar-configurer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>connector-deployer</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-cli</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="RARConfigurer" class="org.apache.geronimo.connector.deployment.RARConfigurer"/>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="RARConfigurer" class="org.apache.geronimo.connector.deployment.RARConfigurer"/>
+
+</module>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+  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
@@ -12,33 +13,13 @@
   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$-->
+  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>jsr88-war-configurer</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>jsr88-cli</dep:artifactId>
-        <dep:type>car</dep:type>
-        <dep:import>classes</dep:import>
-      </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:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <gbean name="WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
-</module>
\ No newline at end of file
+
+    <gbean name="WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+
+</module>

Modified: geronimo/server/trunk/plugins/javamail/javamail/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/javamail/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/javamail/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/javamail/javamail/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+    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
@@ -12,47 +13,22 @@
     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.3-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="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
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <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>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+  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
@@ -12,63 +13,19 @@
   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$-->
+  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
+
+    <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
@@ -106,108 +63,119 @@
 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
+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 xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</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
+            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
+            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>

Modified: geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml?rev=591501&r1=591500&r2=591501&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml Fri Nov  2 15:42:31 2007
@@ -38,7 +38,6 @@
         </reference>
     </gbean>
 
-
     <!-- default WAR container using Jetty -->
     <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty</attribute>
@@ -72,10 +71,6 @@
             <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">
@@ -88,7 +83,6 @@
             <name>DefaultThreadPool</name>
         </reference>
         <attribute name="maxThreads">50</attribute>
-        <!--<attribute name="minThreads">10</attribute>-->
     </gbean>
 
     <!-- DONT USE THIS ONE -->



Mime
View raw message