geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r574101 [1/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
Author: djencks
Date: Sun Sep  9 16:14:43 2007
New Revision: 574101

URL: http://svn.apache.org/viewvc?rev=574101&view=rev
Log:
update some more configs to build more reasonable geronimo-plugin.xml metadata

Modified:
    geronimo/server/trunk/configs/hot-deployer/pom.xml
    geronimo/server/trunk/configs/hot-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
    geronimo/server/trunk/configs/j2ee-corba-yoko/src/main/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-deployer/pom.xml
    geronimo/server/trunk/configs/j2ee-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-security/pom.xml
    geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-server/pom.xml
    geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-system/pom.xml
    geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jasper-deployer/pom.xml
    geronimo/server/trunk/configs/jasper-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jasper/pom.xml
    geronimo/server/trunk/configs/jasper/src/main/plan/plan.xml
    geronimo/server/trunk/configs/javamail/pom.xml
    geronimo/server/trunk/configs/jaxws-deployer/pom.xml
    geronimo/server/trunk/configs/jaxws-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jee-specs/pom.xml
    geronimo/server/trunk/configs/jee-specs/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
    geronimo/server/trunk/configs/jetty6-clustering-wadi/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-deployer/pom.xml
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/wadi-clustering/pom.xml
    geronimo/server/trunk/configs/wadi-clustering/src/main/plan/plan.xml

Modified: geronimo/server/trunk/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/hot-deployer/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/hot-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/hot-deployer/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,6 +32,8 @@
     <artifactId>hot-deployer</artifactId>
     <name>Geronimo Configs :: Hot Deployer</name>
     <packaging>car</packaging>
+
+    <description>The hot deployer is a bad substitute for using explicit deploy commands from maven, the command line, or the console.</description>
     
     <dependencies>
         
@@ -69,4 +71,30 @@
         
     </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>Fluff</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
+                                  <attribute name="path">deploy/</attribute>
+                                  <attribute name="pollIntervalMillis">2000</attribute>
+                                </gbean>
+                             </config-xml-content>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/hot-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/hot-deployer/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/hot-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/hot-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,63 +13,25 @@
     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>hot-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-deploy-tool</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>rmi-naming</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-hot-deploy</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <reference name="ConfigManager">
-      <name>ConfigurationManager</name>
-    </reference>
-    <attribute name="path">deploy/</attribute>
-    <attribute name="pollIntervalMillis">2000</attribute>
-    <dependency>
-      <name>EARBuilder</name>
-    </dependency>
-  </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="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="ConfigManager">
+            <name>ConfigurationManager</name>
+        </reference>
+		<attribute name="path">deploy/</attribute>
+        <attribute name="pollIntervalMillis">2000</attribute>
+        <dependency>
+            <name>EARBuilder</name>
+        </dependency>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: J2EE Corba Yoko ORB</name>
     <packaging>car</packaging>
 
+    <description>Yoko Orb server setup with naming service, protected orb, and unprotected orb.</description>
+
     <dependencies>
 
         <!--<dependency>-->
@@ -110,6 +112,35 @@
                         <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
                         <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>EJB</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="NameServer">
+                                    <attribute name="port">#{COSNamingPort + PortOffset}</attribute>
+                                    <attribute name="host">#{COSNamingHost}</attribute>
+                                </gbean>
+                                <gbean name="Server">
+                                    <attribute name="port">#{ORBSSLPort + PortOffset}</attribute>
+                                    <attribute name="host">#{ORBSSLHost}</attribute>
+                                </gbean>
+                                <gbean name="UnprotectedServer">
+                                    <attribute name="port">#{ORBPort + PortOffset}</attribute>
+                                    <attribute name="host">#{ORBHost}</attribute>
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="COSNamingHost">localhost</config-substitution>
+                            <config-substitution key="COSNamingPort">1050</config-substitution>
+                            <config-substitution key="ORBSSLHost">localhost</config-substitution>
+                            <config-substitution key="ORBSSLPort">2001</config-substitution>
+                            <config-substitution key="ORBHost">localhost</config-substitution>
+                            <config-substitution key="ORBPort">6882</config-substitution>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/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,174 +13,126 @@
     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">
-  <!--CORBA-->
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>j2ee-corba-yoko</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-yoko</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.bcel</groupId>
-        <artifactId>bcel</artifactId>
-        <version>5.2</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-impl</artifactId>
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-core</artifactId>
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-corba</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="DynamicORBStubClassLoader" class="org.apache.geronimo.corba.util.DynamicStubClassLoaderGBean">
-    <dependency>
-      <name>ORBConfigAdapter</name>
-    </dependency>
-  </gbean>
-  <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapterGBean"/>
-  <gbean name="NameServer" class="org.apache.geronimo.corba.NameServiceGBean">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <reference name="ConfigAdapter">
-      <name>ORBConfigAdapter</name>
-    </reference>
-    <attribute name="port">1050</attribute>
-    <attribute name="host">localhost</attribute>
-  </gbean>
-  <gbean name="CORBASSLConfig" class="org.apache.geronimo.corba.security.config.ssl.SSLConfigGBean">
-    <attribute name="keyStore">geronimo-default</attribute>
-    <attribute name="keyAlias">geronimo</attribute>
-    <attribute name="trustStore">geronimo-default</attribute>
-    <attribute name="algorithm">Default</attribute>
-    <attribute name="protocol">SSL</attribute>
-    <reference name="KeystoreManager">
-      <name>KeystoreManager</name>
-    </reference>
-  </gbean>
-  <!--connections require SSL, no client cert, client logs in with password, no identity token-->
-  <gbean name="Server" class="org.apache.geronimo.corba.CORBABeanGBean">
-    <attribute name="host">localhost</attribute>
-    <attribute name="port">2001</attribute>
-    <reference name="ConfigAdapter">
-      <name>ORBConfigAdapter</name>
-    </reference>
-    <reference name="NameService">
-      <name>NameServer</name>
-    </reference>
-    <reference name="OpenEjbSystem"/>
-    <reference name="SSLConfig">
-      <name>CORBASSLConfig</name>
-    </reference>
-    <xml-attribute name="tssConfig">
-      <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
-        <!--<tss:default-principal>-->
-        <!--<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>-->
-        <!--</tss:default-principal>-->
-        <tss:SSL port="2001" hostname="localhost">
-          <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
-          <tss:requires>Integrity Confidentiality</tss:requires>
-        </tss:SSL>
-        <tss:compoundSecMechTypeList>
-          <tss:compoundSecMech>
-            <tss:GSSUP required="true" targetName="default"/>
-            <tss:sasMech>
-              <tss:identityTokenTypes>
-                <tss:ITTAbsent/>
-              </tss:identityTokenTypes>
-            </tss:sasMech>
-          </tss:compoundSecMech>
-        </tss:compoundSecMechTypeList>
-      </tss:tss>
-    </xml-attribute>
-  </gbean>
-  <!--orb with no security whatsoever-->
-  <gbean name="UnprotectedServer" class="org.apache.geronimo.corba.CORBABeanGBean">
-    <attribute name="host">localhost</attribute>
-    <attribute name="port">6882</attribute>
-    <reference name="ConfigAdapter">
-      <name>ORBConfigAdapter</name>
-    </reference>
-    <reference name="NameService">
-      <name>NameServer</name>
-    </reference>
-    <reference name="SSLConfig">
-      <name>CORBASSLConfig</name>
-    </reference>
-    <xml-attribute name="tssConfig">
-      <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
-        <!--<tss:default-principal>-->
-        <!--<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>-->
-        <!--</tss:default-principal>-->
-        <tss:compoundSecMechTypeList>
-          <tss:compoundSecMech>
-            <tss:GSSUP required="true" targetName="default"/>
-            <tss:sasMech>
-              <tss:identityTokenTypes>
-                <tss:ITTAbsent/>
-              </tss:identityTokenTypes>
-            </tss:sasMech>
-          </tss:compoundSecMech>
-        </tss:compoundSecMechTypeList>
-      </tss:tss>
-    </xml-attribute>
-  </gbean>
-  <!--tss bean examples, specify requirements for connection to orb.  Provide a ref in an ejb-->
-  <!--<gbean name="SSLClientCert" class="org.apache.geronimo.corba.TSSBeanGBean">
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!-- CORBA -->
+    <gbean name="DynamicORBStubClassLoader" class="org.apache.geronimo.corba.util.DynamicStubClassLoaderGBean">
+        <dependency>
+            <name>ORBConfigAdapter</name>
+        </dependency>
+    </gbean>
+
+    <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapterGBean"/>
+
+    <gbean name="NameServer" class="org.apache.geronimo.corba.NameServiceGBean">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="ConfigAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <attribute name="port">${PlanCOSNamingPort}</attribute>
+        <attribute name="host">${PlanCOSNamingHost}</attribute>
+    </gbean>
+
+    <gbean name="CORBASSLConfig" class="org.apache.geronimo.corba.security.config.ssl.SSLConfigGBean">
+        <attribute name="keyStore">geronimo-default</attribute>
+        <attribute name="keyAlias">geronimo</attribute>
+        <attribute name="trustStore">geronimo-default</attribute>
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="protocol">SSL</attribute>
+        <reference name="KeystoreManager">
+            <name>KeystoreManager</name>
+        </reference>
+    </gbean>
+
+    <!-- connections require SSL, no client cert, client logs in with password, no identity token -->
+    <gbean name="Server" class="org.apache.geronimo.corba.CORBABeanGBean">
+        <attribute name="host">${PlanORBSSLHost}</attribute>
+        <attribute name="port">${PlanORBSSLPort}</attribute>
+        <reference name="ConfigAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="NameService">
+            <name>NameServer</name>
+        </reference>
+        <reference name="OpenEjbSystem"/>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
+                <!--<tss:default-principal>-->
+                    <!--<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>-->
+                <!--</tss:default-principal>-->
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                    <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
+                    <tss:requires>Integrity Confidentiality</tss:requires>
+                </tss:SSL>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:GSSUP required="true" targetName="default"/>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAbsent/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+    <!-- orb with no security whatsoever -->
+    <gbean name="UnprotectedServer" class="org.apache.geronimo.corba.CORBABeanGBean">
+        <attribute name="host">${PlanORBHost}</attribute>
+        <attribute name="port">${PlanORBPort}</attribute>
+        <reference name="ConfigAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="NameService">
+            <name>NameServer</name>
+        </reference>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
+                <!--<tss:default-principal>-->
+                    <!--<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>-->
+                <!--</tss:default-principal>-->
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:GSSUP required="true" targetName="default"/>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAbsent/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+<!-- tss bean examples, specify requirements for connection to orb.  Provide a ref in an ejb -->
+    <!--
+    <gbean name="SSLClientCert" class="org.apache.geronimo.corba.TSSBeanGBean">
         <attribute name="POAName">SSLClientCert</attribute>
         <reference name="Server">
             <name>Server</name>
         </reference>
         <xml-attribute name="tssConfig">
-            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
                 <tss:default-principal>
                     <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
                 </tss:default-principal>
-                <tss:SSL port="2001" hostname="localhost">
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
                     <tss:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</tss:supports>
                     <tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>
                 </tss:SSL>
@@ -202,11 +155,11 @@
             <name>Server</name>
         </reference>
         <xml-attribute name="tssConfig">
-            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
                 <tss:default-principal>
                     <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
                 </tss:default-principal>
-                <tss:SSL port="2001" hostname="localhost">
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
                     <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
                     <tss:requires>Integrity Confidentiality</tss:requires>
                 </tss:SSL>
@@ -230,11 +183,11 @@
             <name>Server</name>
         </reference>
         <xml-attribute name="tssConfig">
-            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
                 <tss:default-principal>
                     <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
                 </tss:default-principal>
-                <tss:SSL port="2001" hostname="localhost">
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
                     <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
                     <tss:requires>Integrity Confidentiality</tss:requires>
                 </tss:SSL>
@@ -260,7 +213,7 @@
             <name>UnprotectedServer</name>
         </reference>
         <xml-attribute name="tssConfig">
-            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
                 <tss:default-principal>
                     <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
                 </tss:default-principal>
@@ -286,11 +239,11 @@
             <name>Server</name>
         </reference>
         <xml-attribute name="tssConfig">
-            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
                 <tss:default-principal>
                     <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
                 </tss:default-principal>
-                <tss:SSL port="2001" hostname="localhost">
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
                     <tss:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</tss:supports>
                     <tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>
                 </tss:SSL>
@@ -308,9 +261,11 @@
                 </tss:compoundSecMechTypeList>
             </tss:tss>
         </xml-attribute>
-    </gbean>-->
-  <!--CSS beans for client security.  These specify what the client is willing to provide-->
-  <!--<gbean name="SSLClientCert" class="org.apache.geronimo.corba.CSSBeanGBean">
+    </gbean>
+-->
+    <!--CSS beans for client security.  These specify what the client is willing to provide -->
+    <!--
+    <gbean name="SSLClientCert" class="org.apache.geronimo.corba.CSSBeanGBean">
         <reference name="TransactionManager">
             <name>TransactionManager</name>
         </reference>
@@ -495,5 +450,6 @@
                 </css:compoundSecMechTypeList>
             </css:css>
         </xml-attribute>
-    </gbean>-->
-</module>
\ No newline at end of file
+    </gbean>
+-->
+</module>

Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,10 @@
     <name>Geronimo Configs :: J2EE Deployer</name>
     <packaging>car</packaging>
 
+    <description>
+        Basic JavaEE deployer functionality including the ear deployer.
+    </description>
+
     <dependencies>
 
         <dependency>
@@ -109,4 +113,106 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>JavaEE deployment</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-j2ee-schema</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-server</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-test-ddbean</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-naming-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-security-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-security</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <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>geronimo-gbean-deployer</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-client</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.xbean</groupId>
+                        <artifactId>xbean-finder</artifactId>
+                        <version>3.0.1</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </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>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="WebBuilder">
+                                    <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</attribute>
+                                </gbean>
+                                <gbean name="EnvironmentEntryBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                </gbean>
+                             </config-xml-content>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/server/trunk/configs/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-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,232 +13,161 @@
     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>j2ee-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-schema</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-test-ddbean</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-security-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-security</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-      <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>geronimo-gbean-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-client</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <version>3.0.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </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>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-    <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
-    <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
-    <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
-    <attribute name="nonTransactionalTimerAbstractName">?name=NonTransactionalThreadPooledTimer</attribute>
-    <attribute name="corbaGBeanAbstractName">?name=Server</attribute>
-    <attribute name="serverName">?j2eeType=J2EEServer#org.apache.geronimo.management.geronimo.J2EEServer</attribute>
-    <reference name="Repositories">
-      <!--<gbean-name>*:name=Repository,*</gbean-name>-->
-    </reference>
-    <reference name="WebConfigBuilder">
-      <name>WebBuilder</name>
-    </reference>
-    <reference name="SecurityBuilders">
-      <name>SecurityBuilder</name>
-    </reference>
-    <reference name="ServiceBuilders">
-      <name>GBeanBuilder</name>
-    </reference>
-    <references name="PersistenceUnitBuilders">
-      <pattern>
-        <name>PersistenceUnitBuilder</name>
-      </pattern>
-    </references>
-    <references name="EJBConfigBuilder">
-      <pattern>
-        <name>EJBBuilder</name>
-      </pattern>
-      <pattern>
-        <name>UnavailableEJBBuilder</name>
-      </pattern>
-    </references>
-    <reference name="ConnectorConfigBuilder">
-      <name>ConnectorBuilder</name>
-    </reference>
-    <references name="AppClientConfigBuilder">
-      <pattern>
-        <name>AppClientBuilder</name>
-      </pattern>
-      <pattern>
-        <name>UnavailableAppClientBuilder</name>
-      </pattern>
-    </references>
-    <reference name="ArtifactResolvers">
-      <name>ArtifactResolver</name>
-    </reference>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <!--web switching builder-->
-  <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
-    <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
-    <references name="ModuleBuilders">
-      <pattern>
-        <name>JettyWebBuilder</name>
-      </pattern>
-      <pattern>
-        <name>TomcatWebBuilder</name>
-      </pattern>
-    </references>
-  </gbean>
-  <gbean name="SecurityBuilder" class="org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl">
-    <attribute name="credentialStoreName">?name=CredentialStore#</attribute>
-  </gbean>
-  <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
-  <gbean name="CredentialStoreBuilder" class="org.apache.geronimo.security.deployment.CredentialStoreBuilder"/>
-  <!--TODO remove or document why SecurityService is here-->
-  <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-    <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
-    <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
-  </gbean>
-  <gbean name="NamingBuilders" class="org.apache.geronimo.j2ee.deployment.NamingBuilderCollectionGBean">
-    <attribute name="baseElementQNameNamespaceURI">http://geronimo.apache.org/xml/ns/naming-1.2</attribute>
-    <attribute name="baseElementQNameLocalPart">abstract-naming-entry</attribute>
-    <references name="NamingBuilders">
-      <pattern>
-        <name>GBeanRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>PersistenceContextRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>PersistenceUnitRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>ResourceRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>AdminObjectRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>EnvironmentEntryBuilder</name>
-      </pattern>
-      <pattern>
-        <name>SwitchingServiceRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>EjbRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>OpenEjbCorbaRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>CorbaRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>LifecycleMethodBuilder</name>
-      </pattern>
-    </references>
-  </gbean>
-  <gbean name="GBeanRefBuilder" class="org.apache.geronimo.naming.deployment.GBeanRefBuilder"/>
-  <gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-  </gbean>
-  <gbean name="SwitchingServiceRefBuilder" class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-    <references name="JAXRPCBuilder">
-      <pattern>
-        <name>AxisServiceRefBuilder</name>
-      </pattern>
-    </references>
-    <references name="JAXWSBuilder">
-      <pattern>
-        <name>CXFServiceRefBuilder</name>
-      </pattern>
-      <pattern>
-        <name>Axis2ServiceRefBuilder</name>
-      </pattern>
-    </references>
-  </gbean>
-  <gbean name="LifecycleMethodBuilder" class="org.apache.geronimo.naming.deployment.LifecycleMethodBuilder"/>
-</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="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+        <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
+        <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
+        <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
+        <attribute name="nonTransactionalTimerAbstractName">?name=NonTransactionalThreadPooledTimer</attribute>
+        <attribute name="corbaGBeanAbstractName">?name=Server</attribute>
+        <attribute name="serverName">?j2eeType=J2EEServer#org.apache.geronimo.management.geronimo.J2EEServer</attribute>
+        <reference name="Repositories">
+            <!--<gbean-name>*:name=Repository,*</gbean-name>-->
+        </reference>
+        <reference name="WebConfigBuilder">
+            <name>WebBuilder</name>
+        </reference>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+        <references name="PersistenceUnitBuilders">
+            <pattern>
+                <name>PersistenceUnitBuilder</name>
+            </pattern>
+        </references>
+        <references name="EJBConfigBuilder">
+            <pattern>
+                <name>EJBBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableEJBBuilder</name>
+            </pattern>
+        </references>
+        <reference name="ConnectorConfigBuilder">
+            <name>ConnectorBuilder</name>
+        </reference>
+        <references name="AppClientConfigBuilder">
+            <pattern>
+                <name>AppClientBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableAppClientBuilder</name>
+            </pattern>
+        </references>
+        <reference name="ArtifactResolvers">
+            <name>ArtifactResolver</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>j2ee-server</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <!-- web switching builder -->
+    <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
+        <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}</attribute>
+        <references name="ModuleBuilders">
+            <pattern>
+                <name>JettyWebBuilder</name>
+            </pattern>
+            <pattern>
+                <name>TomcatWebBuilder</name>
+            </pattern>
+        </references>
+    </gbean>
+
+    <gbean name="SecurityBuilder" class="org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl">
+        <attribute name="credentialStoreName">?name=CredentialStore#</attribute>
+    </gbean>
+
+    <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
+
+    <gbean name="CredentialStoreBuilder" class="org.apache.geronimo.security.deployment.CredentialStoreBuilder"/>
+
+    <!-- TODO remove or document why SecurityService is here -->
+    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
+        <attribute name="policyConfigurationFactory">
+            org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
+        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
+    </gbean>
+
+    <gbean name="NamingBuilders" class="org.apache.geronimo.j2ee.deployment.NamingBuilderCollectionGBean">
+        <attribute name="baseElementQNameNamespaceURI">http://geronimo.apache.org/xml/ns/naming-${geronimoSchemaVersion}</attribute>
+        <attribute name="baseElementQNameLocalPart">abstract-naming-entry</attribute>
+        <references name="NamingBuilders">
+            <pattern>
+                <name>GBeanRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>PersistenceContextRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>PersistenceUnitRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>ResourceRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>AdminObjectRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>EnvironmentEntryBuilder</name>
+            </pattern>
+            <pattern>
+                <name>SwitchingServiceRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>EjbRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>OpenEjbCorbaRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>CorbaRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>LifecycleMethodBuilder</name>
+            </pattern>
+        </references>
+    </gbean>
+
+    <gbean name="GBeanRefBuilder" class="org.apache.geronimo.naming.deployment.GBeanRefBuilder"/>
+    <gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+    </gbean>
+
+    <gbean name="SwitchingServiceRefBuilder" class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <references name="JAXRPCBuilder">
+            <pattern>
+                <name>AxisServiceRefBuilder</name>
+            </pattern>
+        </references>
+        <references name="JAXWSBuilder">
+            <pattern>
+                <name>CXFServiceRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>Axis2ServiceRefBuilder</name>
+            </pattern>
+        </references>
+    </gbean>
+    <gbean name="LifecycleMethodBuilder" class="org.apache.geronimo.naming.deployment.LifecycleMethodBuilder"/>
+
+</module>

Modified: geronimo/server/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,7 +33,9 @@
     <artifactId>j2ee-security</artifactId>
     <name>Geronimo Configs :: J2EE Security</name>
     <packaging>car</packaging>
-    
+
+    <description>Basic Geronimo server security infrastructure</description>
+
     <dependencies>
         
         <!-- parent -->
@@ -58,20 +60,33 @@
         
     </dependencies>
     
-<!--
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Security</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="JMXService">
+                                    <attribute name="protocol">rmi</attribute>
+                                    <attribute name="host">#{ServerHostname}</attribute>
+                                    <attribute name="port">#{JMXPort + PortOffset}</attribute>
+                                    <attribute name="urlPath">/jndi/rmi://#{ServerHostname}:#{NamingPort + PortOffset}/JMXConnector</attribute>
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="JMXPort">9999</config-substitution>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>
     </build>
--->
 
 </project>

Modified: geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/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,48 @@
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.-->
-<!--$Rev$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <!--runtime dependencies-->
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>j2ee-security</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-security</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jmx-remoting</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>rmi-naming</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
-    <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
-  </gbean>
-  <!--Register GeronimoLoginConfiguration as the LoginConfiguration handler-->
-  <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
-    <references name="Configurations">
-      <pattern>
-        <type>SecurityRealm</type>
-      </pattern>
-      <pattern>
-        <type>ConfigurationEntry</type>
-      </pattern>
-    </references>
-  </gbean>
-  <!--JMX Remoting-->
-  <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
-    <attribute name="protocol">rmi</attribute>
-    <attribute name="host">0.0.0.0</attribute>
-    <attribute name="port">9999</attribute>
-    <attribute name="urlPath">/jndi/rmi://0.0.0.0:1099/JMXConnector</attribute>
-    <attribute name="applicationConfigName">geronimo-admin</attribute>
-    <reference name="MBeanServerReference">
-      <name>MBeanServerReference</name>
-    </reference>
-  </gbean>
-  <gbean name="KeystoreManager" class="org.apache.geronimo.security.keystore.FileKeystoreManager">
-    <attribute name="keystoreDir">var/security/keystores</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <references name="KeystoreInstances">
-      <pattern>
-        <type>Keystore</type>
-      </pattern>
-    </references>
-  </gbean>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!--runtime dependencies-->
+    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
+        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
+    </gbean>
+
+    <!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
+    <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
+        <references name="Configurations">
+            <pattern><type>SecurityRealm</type></pattern>
+            <pattern><type>ConfigurationEntry</type></pattern>
+        </references>
+    </gbean>
+
+    <!-- JMX Remoting -->
+    <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
+        <attribute name="protocol">rmi</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanJMXPort}</attribute>
+        <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+        <attribute name="applicationConfigName">geronimo-admin</attribute>
+        <reference name="MBeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
+    </gbean>
+
+    <gbean name="KeystoreManager" class="org.apache.geronimo.security.keystore.FileKeystoreManager">
+        <attribute name="keystoreDir">var/security/keystores</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <references name="KeystoreInstances">
+          <pattern>
+            <type>Keystore</type>
+          </pattern>
+        </references>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/pom.xml Sun Sep  9 16:14:43 2007
@@ -32,6 +32,8 @@
     <artifactId>j2ee-server</artifactId>
     <name>Geronimo Configs :: J2EE Server</name>
     <packaging>car</packaging>
+
+    <description>Basic geronimo JavaEE support components including the transaction manager and connector framework.</description>
     
     <dependencies>
         
@@ -90,4 +92,19 @@
         </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>JavaEE</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/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,149 +13,87 @@
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.-->
-<!--$Rev$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <!--JSR77 Management Objects-->
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>j2ee-server</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <version>3.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <version>2.2.3</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-common</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>rmi-naming</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>2.2.3</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-core</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-webservices</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
-    <reference name="Servers"/>
-  </gbean>
-  <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <reference name="JVMs"/>
-    <references name="Resources">
-      <pattern>
-        <type>JCAResource</type>
-      </pattern>
-      <pattern>
-        <type>JavaMailResource</type>
-      </pattern>
-      <pattern>
-        <type>JDBCResource</type>
-      </pattern>
-      <pattern>
-        <type>JMSResource</type>
-      </pattern>
-      <pattern>
-        <type>JNDIResource</type>
-      </pattern>
-      <pattern>
-        <type>JTAResource</type>
-      </pattern>
-      <pattern>
-        <type>RMI_IIOPResource</type>
-      </pattern>
-      <pattern>
-        <type>URLResource</type>
-      </pattern>
-    </references>
-    <reference name="Applications"/>
-    <reference name="AppClientModules"/>
-    <reference name="WebModules"/>
-    <reference name="EJBModules"/>
-    <reference name="ResourceAdapterModules"/>
-    <reference name="WebManagers"/>
-    <reference name="EJBManagers"/>
-    <reference name="JMSManagers"/>
-    <reference name="ThreadPools"/>
-    <reference name="Repositories"/>
-    <reference name="WritableRepos"/>
-    <reference name="SecurityRealms"/>
-    <reference name="KeystoreManagers"/>
-    <reference name="PluginRepoLists"/>
-    <reference name="PluginInstaller">
-      <name>PluginInstaller</name>
-    </reference>
-    <reference name="ConfigurationManager">
-      <name>ConfigurationManager</name>
-    </reference>
-  </gbean>
-  <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl">
-    <reference name="SystemLog">
-      <name>Logger</name>
-    </reference>
-  </gbean>
-  <gbean name="ServerSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
-    <attribute name="systemProperties">javax.xml.soap.MessageFactory=org.apache.geronimo.webservices.saaj.GeronimoMessageFactory
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!-- JSR77 Management Objects -->
+    <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
+        <reference name="Servers"/>
+    </gbean>
+
+    <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="JVMs"/>
+        <references name="Resources">
+            <pattern>
+                <type>JCAResource</type>
+            </pattern>
+            <pattern>
+                <type>JavaMailResource</type>
+            </pattern>
+            <pattern>
+                <type>JDBCResource</type>
+            </pattern>
+            <pattern>
+                <type>JMSResource</type>
+            </pattern>
+            <pattern>
+                <type>JNDIResource</type>
+            </pattern>
+            <pattern>
+                <type>JTAResource</type>
+            </pattern>
+            <pattern>
+                <type>RMI_IIOPResource</type>
+            </pattern>
+            <pattern>
+                <type>URLResource</type>
+            </pattern>
+        </references>
+        <reference name="Applications"/>
+        <reference name="AppClientModules"/>
+        <reference name="WebModules"/>
+        <reference name="EJBModules"/>
+        <reference name="ResourceAdapterModules"/>
+        <reference name="WebManagers"/>
+        <reference name="EJBManagers"/>
+        <reference name="JMSManagers"/>
+        <reference name="ThreadPools"/>
+        <reference name="Repositories"/>
+        <reference name="WritableRepos"/>
+        <reference name="SecurityRealms"/>
+        <reference name="KeystoreManagers"/>
+        <reference name="PluginRepoLists"/>
+        <reference name="PluginInstaller">
+            <name>PluginInstaller</name>
+        </reference>
+        <reference name="ConfigurationManager">
+            <name>ConfigurationManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl">
+        <reference name="SystemLog">
+            <name>Logger</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ServerSystemProperties"
+           class="org.apache.geronimo.system.properties.SystemProperties">
+         <attribute name="systemProperties">
+           javax.xml.soap.MessageFactory=org.apache.geronimo.webservices.saaj.GeronimoMessageFactory
            javax.xml.soap.SOAPFactory=org.apache.geronimo.webservices.saaj.GeronimoSOAPFactory
            javax.xml.soap.SOAPConnectionFactory=org.apache.geronimo.webservices.saaj.GeronimoSOAPConnectionFactory
            javax.xml.soap.MetaFactory=org.apache.geronimo.webservices.saaj.GeronimoMetaFactory
            org.apache.cxf.jaxws.checkPublishEndpointPermission=true
-           java.net.preferIPv4Stack=true</attribute>
-  </gbean>
-</module>
\ No newline at end of file
+           java.net.preferIPv4Stack=true
+         </attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: J2EE System</name>
     <packaging>car</packaging>
 
+    <description>Base geronimo server that sets up the kernel.</description>
+
     <dependencies>
 
         <dependency>
@@ -213,108 +215,11 @@
                     <classpathPrefix>../lib</classpathPrefix>
 
 
-
                     <category>Geronimo Core</category>
-                    <dependencies>
-                        <dependency>
-                          <groupId>com.sun.xml.bind</groupId>
-                          <artifactId>jaxb-impl</artifactId>
-                          <version>2.0.5</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>org.apache.geronimo.specs</groupId>
-                          <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                          <version>1.0</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>org.apache.geronimo.modules</groupId>
-                          <artifactId>geronimo-common</artifactId>
-                          <version>2.1-SNAPSHOT</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>jline</groupId>
-                          <artifactId>jline</artifactId>
-                          <version>0.9.91</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>org.apache.geronimo.modules</groupId>
-                          <artifactId>geronimo-util</artifactId>
-                          <version>2.1-SNAPSHOT</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>ognl</groupId>
-                          <artifactId>ognl</artifactId>
-                          <version>2.6.9</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>asm</groupId>
-                          <artifactId>asm</artifactId>
-                          <version>2.2.3</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>commons-jexl</groupId>
-                          <artifactId>commons-jexl</artifactId>
-                          <version>1.1</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>asm</groupId>
-                          <artifactId>asm-commons</artifactId>
-                          <version>2.2.3</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>commons-cli</groupId>
-                          <artifactId>commons-cli</artifactId>
-                          <version>1.0</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>woodstox</groupId>
-                          <artifactId>wstx-asl</artifactId>
-                          <version>3.2.1</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>javax.xml.bind</groupId>
-                          <artifactId>jaxb-api</artifactId>
-                          <version>2.0</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>org.apache.geronimo.specs</groupId>
-                          <artifactId>geronimo-activation_1.1_spec</artifactId>
-                          <version>1.0</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                        <dependency>
-                          <groupId>org.apache.geronimo.modules</groupId>
-                          <artifactId>geronimo-system</artifactId>
-                          <version>2.1-SNAPSHOT</version>
-                          <type>jar</type>
-                          <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
 
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/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,82 +13,98 @@
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.-->
-<!--Configuration for the innermost ring of a Geronimo server.
+    limitations under the License.
+-->
+
+<!--
+Configuration for the innermost ring of a Geronimo server.
 This module should only contain critical services needed to
 run other Configurations - for example, the ServerInfo, Logging
 and Repository services used to load them.
 
 This module should *NOT* be used to provide server or application
-specific services - those should be provided by children.-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
-  <!--ServerInfo service-->
-  <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
-  <!--Repository-->
-  <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
-    <attribute name="root">repository/</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <!--Pinged and changed when the server completes loading when all the persistent configuration is loaded-->
-  <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
-    <attribute name="serverStarted">false</attribute>
-  </gbean>
-  <!--Configuration Store service-->
-  <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
-    <reference name="Repository">
-      <name>Repository</name>
-    </reference>
-  </gbean>
-  <!--User-editable attribute service-->
-  <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <attribute name="configFile">var/config/config.xml</attribute>
-    <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
-    <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
-  </gbean>
-  <!--ArtifactManager-->
-  <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
-  <!--ArtifactResolver-->
-  <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
-    <reference name="ArtifactManager">
-      <name>ArtifactManager</name>
-    </reference>
-    <reference name="Repositories"/>
-    <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <!--Configuration Manager service-->
-  <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
-    <reference name="Repositories"/>
-    <reference name="Stores"/>
-    <reference name="Watchers"/>
-    <reference name="AttributeStore">
-      <name>AttributeManager</name>
-    </reference>
-    <reference name="PersistentConfigurationList">
-      <type>AttributeStore</type>
-      <name>AttributeManager</name>
-    </reference>
-    <reference name="ArtifactManager">
-      <name>ArtifactManager</name>
-    </reference>
-    <reference name="ArtifactResolver">
-      <name>ArtifactResolver</name>
-    </reference>
-  </gbean>
-  <!--Logging service-->
-  <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
-    <attribute name="configFileName">var/log/server-log4j.properties</attribute>
-    <attribute name="refreshPeriodSeconds">60</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+specific services - those should be provided by children.
+-->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+
+    <!-- ServerInfo service -->
+    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+
+    <!--Repository-->
+    <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+        <attribute name="root">repository/</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- Pinged and changed when the server completes loading when all the persistent configuration is loaded -->
+    <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+        <attribute name="serverStarted">false</attribute>
+    </gbean>
+
+    <!--Configuration Store service-->
+    <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+        <reference name="Repository">
+            <name>Repository</name>
+        </reference>
+    </gbean>
+
+    <!--User-editable attribute service-->
+    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <attribute name="configFile">var/config/config.xml</attribute>
+        <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+    </gbean>
+
+    <!-- ArtifactManager -->
+    <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+
+    <!-- ArtifactResolver -->
+    <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="Repositories"></reference>
+        <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!--Configuration Manager service-->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+        <reference name="Repositories"></reference>
+        <reference name="Stores"></reference>
+        <reference name="Watchers"></reference>
+        <reference name="AttributeStore">
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="PersistentConfigurationList">
+            <type>AttributeStore</type>
+            <name>AttributeManager</name>
+        </reference>
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+
+    <!-- Logging service -->
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+        <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper-deployer/pom.xml?rev=574101&r1=574100&r2=574101&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper-deployer/pom.xml Sun Sep  9 16:14:43 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Jasper Deployer</name>
     <packaging>car</packaging>
 
+    <description>Deployer for Jasper jsps.  Installs injection support components.</description>
+
     <dependencies>
 
         <dependency>
@@ -57,4 +59,38 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>JavaEE deployment</category>
+                    <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>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>



Mime
View raw message