geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r574101 [2/2] - in /geronimo/server/trunk/configs: hot-deployer/ hot-deployer/src/main/plan/ j2ee-corba-yoko/ j2ee-corba-yoko/src/main/plan/ j2ee-deployer/ j2ee-deployer/src/main/plan/ j2ee-security/ j2ee-security/src/main/plan/ j2ee-server...
Date Sun, 09 Sep 2007 23:14:45 GMT
Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml Sun Sep  9 16:14:43 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,53 +13,28 @@
     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
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="JspModuleBuilderExtension" class="org.apache.geronimo.jasper.deployment.JspModuleBuilderExtension">
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>jasper</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jasper/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Jasper</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Jasper jsp integration including injection support.</description>
+
     <dependencies>
 
         <dependency>
@@ -87,42 +89,22 @@
             <artifactId>juli</artifactId>
         </dependency>
 
-        <!-- start myfaces dependencies -->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.myfaces.core</groupId>-->
-            <!--<artifactId>myfaces-impl</artifactId>-->
-        <!--</dependency>-->
-
-<!--
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-        </dependency>
-
--->
-        <!-- end myfaces dependencies -->
-
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Framework</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml Sun Sep  9 16:14:43 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,79 +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>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>
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
   <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
+</module>

Modified: geronimo/server/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/javamail/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/javamail/pom.xml (original)
+++ geronimo/server/trunk/configs/javamail/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,6 +32,8 @@
     <artifactId>javamail</artifactId>
     <name>Geronimo Configs :: JavaMail</name>
     <packaging>car</packaging>
+
+    <description>Geronimo JavaMail support</description>
     
     <dependencies>
         
@@ -55,4 +57,32 @@
         
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>JavaEE</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="SMTPTransport">
+                                    <attribute name="host">#{mailHost}</attribute>
+                                    <attribute name="port">#{mailPort}</attribute>
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="mailHost">localhost</config-substitution>
+                            <config-substitution key="mailPort">25</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jaxws-deployer/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jaxws-deployer/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,6 +32,8 @@
     <artifactId>jaxws-deployer</artifactId>
     <name>Geronimo Configs :: JAXWS Deployer</name>
     <packaging>car</packaging>
+
+    <description>Command line access to jaxws deployment tools.</description>
     
     <dependencies>
         
@@ -114,6 +116,14 @@
                         </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
+
+
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+
                 </configuration>
             </plugin>
         </plugins>

Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml Sun Sep  9 16:14:43 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,41 +13,10 @@
   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>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
+</module>

Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: JavaEE Specs</name>
     <packaging>car</packaging>
 
+    <description>The JavaEE spec jars in a single classloader.</description>
+
     <dependencies>
         <!-- geronimo-javaee-deployment_1.1MR3_spec is intentionally missing, it must be available earlier in the classpath
         Hopefully we can eliminate this restriction in the future. -->
@@ -186,6 +188,11 @@
                         <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
                     </deploymentConfigs>
                     <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>JavaEE</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml Sun Sep  9 16:14:43 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,194 +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.-->
-<!--$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
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+</module>

Modified: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,11 +33,7 @@
     <name>Geronimo Configs :: Jetty 6 :: Clustering Builder for WADI</name>
     <packaging>car</packaging>
 
-    <properties>
-        <PlanDefaultSweepInterval>36000</PlanDefaultSweepInterval>
-        <PlanDefaultNumPartitions>24</PlanDefaultNumPartitions>
-    </properties>
-    
+    <description>Deployment for WADI clustering on Jetty 6.</description>
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -52,6 +48,7 @@
             <version>${version}</version>
         </dependency>
 
+<!--
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-clustering</artifactId>
@@ -63,13 +60,16 @@
             <artifactId>geronimo-clustering-wadi</artifactId>
             <version>${version}</version>
         </dependency>
+-->
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
+<!--
         <dependency>
             <groupId>org.codehaus.wadi</groupId>
             <artifactId>wadi-core</artifactId>
@@ -89,6 +89,70 @@
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tribes</artifactId>
         </dependency>
+-->
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Jetty</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jetty6-deployer</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
+                            <version>${version}</version>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jetty6-clustering-wadi</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="JettyClusteringBuilder">
+                                    <attribute name="defaultSweepInterval">${DefaultWadiSweepInterval}</attribute>
+                                    <attribute name="defaultNumPartitions">${DefaultWadiNumPartitions}</attribute>
+                                    <!--<attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>-->
+                                    <!--<attribute name="defaultClusterName">?name=DefaultCluster</attribute>-->
+                                    <!--<xml-attribute name="defaultEnvironment">-->
+                                        <!--<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">-->
+                                            <!--<dependencies>-->
+                                                <!--<dependency>-->
+                                                    <!--<groupId>${pom.groupId}</groupId>-->
+                                                    <!--<artifactId>jetty6-clustering-wadi</artifactId>-->
+                                                    <!--<type>car</type>-->
+                                                <!--</dependency>-->
+                                            <!--</dependencies>-->
+                                        <!--</environment>-->
+                                    <!--</xml-attribute>-->
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="DefaultWadiSweepInterval">36000</config-substitution>
+                            <config-substitution key="DefaultWadiNumPartitions">24</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml Sun Sep  9 16:14:43 2007
@@ -1,108 +1,41 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--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
   (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$-->
+  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
+
+    <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 xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>jetty6-clustering-wadi</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,6 +32,8 @@
     <artifactId>jetty6-clustering-wadi</artifactId>
     <name>Geronimo Configs :: Jetty 6 Clustering over WADI</name>
     <packaging>car</packaging>
+
+    <description>WADI clustering for Jetty.</description>
     
     <dependencies>
         <dependency>
@@ -55,4 +57,20 @@
         </dependency>
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Jetty</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml Sun Sep  9 16:14:43 2007
@@ -1,47 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--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
   (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$-->
+  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
+</module>

Modified: geronimo/server/trunk/configs/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,6 +32,8 @@
     <artifactId>jetty6-deployer</artifactId>
     <name>Geronimo Configs :: Jetty Deployer</name>
     <packaging>car</packaging>
+
+    <description>Geronimo deployer for Jetty 6 Web Server integration.</description>
     
     <dependencies>
         
@@ -77,4 +79,58 @@
 
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Jetty</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>connector-deployer</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.schema</groupId>
+                        <artifactId>geronimo-schema-jee_5</artifactId>
+                        <version>1.1</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>jetty6</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-deployer</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-web-2.5-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-jetty6-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                    </dependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Jetty 6</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Jetty Web Server integration.</description>
+
     <dependencies>
 
         <dependency>
@@ -96,4 +98,46 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Jetty</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="JettyWebConnector">
+                                    <attribute name="host">#{ServerHostname}</attribute>
+                                    <attribute name="port">#{HTTPPort + PortOffset}</attribute>
+                                    <attribute name="redirectPort">#{HTTPSPortPrimary + PortOffset}</attribute>
+                                </gbean>
+                                <gbean name="JettyAJP13Connector">
+                                    <attribute name="host">#{ServerHostname}</attribute>
+                                    <attribute name="port">#{AJPPort + PortOffset}</attribute>
+                                    <attribute name="redirectPort">#{HTTPSPortPrimary + PortOffset}</attribute>
+                                </gbean>
+                                <gbean name="JettySSLConnector">
+                                    <attribute name="host">#{ServerHostname}</attribute>
+                                    <attribute name="port">#{HTTPSPort + PortOffset}</attribute>
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="HTTPPort">8080</config-substitution>
+                            <config-substitution key="AJPPort">8009</config-substitution>
+                            <config-substitution key="HTTPSPort">8443</config-substitution>
+                            <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
+                            <config-substitution key="webcontainer">JettyWebContainer</config-substitution>
+                            <config-substitution key="webcontainerName">jetty6</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: 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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml Sun Sep  9 16:14:43 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,131 +13,85 @@
   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">
-  <!--david jencks is not convinced that these 2 gbeans should be in this
+
+    <!-- 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>
+         a management layer plan. -->
+    <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">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPPort}</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">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanAJPPort}</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">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPSPort}</attribute>
         <attribute name="keyStore">geronimo-default</attribute>
         <attribute name="keyAlias">geronimo</attribute>
         <attribute name="trustStore">geronimo-default</attribute>
@@ -153,26 +108,28 @@
         <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
+    </gbean>
+-->
+<!-- USE THIS ONE -->
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector">
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPSPort}</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>

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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml Sun Sep  9 16:14:43 2007
@@ -53,6 +53,7 @@
             <artifactId>geronimo-jsp-examples</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -104,13 +105,10 @@
                     </module>
 
                     <category>Example</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jasper</artifactId>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

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=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml Sun Sep  9 16:14:43 2007
@@ -45,6 +45,7 @@
             <artifactId>geronimo-jsp-examples</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -95,13 +96,10 @@
                         <type>war</type>
                     </module>
                     <category>Example</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jasper</artifactId>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/server/trunk/configs/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/configs/wadi-clustering/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,14 +32,10 @@
     <artifactId>wadi-clustering</artifactId>
     <name>Geronimo Configs :: Clustering over WADI</name>
     <packaging>car</packaging>
-    
-    <properties>
-        <PlanDefaultSweepInterval>36000</PlanDefaultSweepInterval>
-        <PlanDefaultNumPartitions>24</PlanDefaultNumPartitions>
-        <PlanNbReplica>2</PlanNbReplica>
-        <EndPointURI>http://localhost:8080</EndPointURI>
-        <PlanClusterName>DEFAULT_CLUSTER</PlanClusterName>
-    </properties>
+
+    <description>
+        Geronimo WADI integration.
+    </description>
 
     <dependencies>
        <dependency>
@@ -80,5 +76,50 @@
             <artifactId>juli</artifactId>
         </dependency>
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Clustering</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="DefaultBackingStrategyFactory">
+                                    <attribute name="nbReplica">#{ReplicaCount}</attribute>
+                                </gbean>
+
+                                <gbean name="DefaultDispatcherHolder">
+                                    <attribute name="endPointURI">#{EndPointURI}</attribute>
+                                    <attribute name="clusterName">#{ClusterName}</attribute>
+                                    <reference name="Node">
+                                        <name>Node</name>
+                                    </reference>
+                                </gbean>
+
+                                <gbean name="DefaultCluster">
+                                    <reference name="Node">
+                                        <name>Node</name>
+                                    </reference>
+                                    <reference name="DispatcherHolder">
+                                        <name>DefaultDispatcherHolder</name>
+                                    </reference>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="ReplicaCount">2</config-substitution>
+                            <config-substitution key="EndPointURI">http://localhost:8080</config-substitution>
+                            <config-substitution key="ClusterName">DEFAULT_CLUSTER</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/wadi-clustering/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/wadi-clustering/src/main/plan/plan.xml Sun Sep  9 16:14:43 2007
@@ -1,95 +1,40 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--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
   (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>wadi-clustering</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.codehaus.wadi</groupId>
-        <artifactId>wadi-core</artifactId>
-        <version>2.0-M5</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.wadi</groupId>
-        <artifactId>wadi-group</artifactId>
-        <version>2.0-M5</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>juli</artifactId>
-        <version>6.0.13</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>tribes</artifactId>
-        <version>6.0.13</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>clustering</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-clustering-wadi</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.wadi</groupId>
-        <artifactId>wadi-tribes</artifactId>
-        <version>2.0-M5</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="DefaultBackingStrategyFactory" class="org.apache.geronimo.clustering.wadi.RoundRobinBackingStrategyFactoryGBean">
-    <attribute name="nbReplica">2</attribute>
-  </gbean>
-  <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
-    <attribute name="endPointURI">http://localhost:8080</attribute>
-    <attribute name="clusterName">DEFAULT_CLUSTER</attribute>
-    <reference name="Node">
-      <name>Node</name>
-    </reference>
-  </gbean>
-  <gbean name="DefaultCluster" class="org.apache.geronimo.clustering.wadi.BasicWADICluster">
-    <reference name="Node">
-      <name>Node</name>
-    </reference>
-    <reference name="DispatcherHolder">
-      <name>DefaultDispatcherHolder</name>
-    </reference>
-  </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="DefaultBackingStrategyFactory" class="org.apache.geronimo.clustering.wadi.RoundRobinBackingStrategyFactoryGBean">
+        <attribute name="nbReplica">2</attribute>
+    </gbean>
+
+    <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
+        <attribute name="endPointURI">http://localhost:8080</attribute>
+        <attribute name="clusterName">DEFAULT_CLUSTER</attribute>
+        <reference name="Node">
+            <name>Node</name>
+        </reference>
+    </gbean>
+
+    <gbean name="DefaultCluster" class="org.apache.geronimo.clustering.wadi.BasicWADICluster">
+        <reference name="Node"><name>Node</name></reference>
+        <reference name="DispatcherHolder"><name>DefaultDispatcherHolder</name></reference>
+    </gbean>
+
+</module>



Mime
View raw message