geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r574483 [1/3] - in /geronimo/server/trunk: assemblies/ assemblies/geronimo-framework/ assemblies/geronimo-framework/src/main/resources/var/config/ configs/ configs/jetty6/ configs/myfaces-deployer/ configs/myfaces-deployer/src/main/plan/ co...
Date Tue, 11 Sep 2007 06:34:57 GMT
Author: djencks
Date: Mon Sep 10 23:34:53 2007
New Revision: 574483

URL: http://svn.apache.org/viewvc?rev=574483&view=rev
Log:
Clean up a lot more configs so geronimo-plugin.xml is reasonable.  Make use of local maven repo more likely to work.  Trim framework down to actual minimal size.

Modified:
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/myfaces-deployer/pom.xml
    geronimo/server/trunk/configs/myfaces-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/myfaces/pom.xml
    geronimo/server/trunk/configs/myfaces/src/main/plan/plan.xml
    geronimo/server/trunk/configs/offline-deployer/pom.xml
    geronimo/server/trunk/configs/online-deployer/pom.xml
    geronimo/server/trunk/configs/online-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/configs/openejb-corba-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/openejb-deployer/pom.xml
    geronimo/server/trunk/configs/openejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/openjpa/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/configs/remote-deploy-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/server/trunk/configs/remote-deploy-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/configs/rmi-naming/pom.xml
    geronimo/server/trunk/configs/rmi-naming/src/main/plan/plan.xml
    geronimo/server/trunk/configs/server-security-config/pom.xml
    geronimo/server/trunk/configs/server-security-config/src/main/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6-deployer/pom.xml
    geronimo/server/trunk/configs/tomcat6-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6/pom.xml
    geronimo/server/trunk/configs/tomcat6/src/main/plan/plan.xml
    geronimo/server/trunk/configs/transaction/pom.xml
    geronimo/server/trunk/configs/transaction/src/main/plan/plan.xml
    geronimo/server/trunk/configs/transformer-agent/pom.xml
    geronimo/server/trunk/configs/transformer-agent/src/main/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/configs/webservices-common/pom.xml
    geronimo/server/trunk/configs/webservices-common/src/main/plan/plan.xml
    geronimo/server/trunk/configs/xmlbeans/pom.xml
    geronimo/server/trunk/configs/xmlbeans/src/main/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Mon Sep 10 23:34:53 2007
@@ -68,17 +68,24 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <artifactId>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>connector-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -115,27 +122,27 @@
             <type>car</type>
         </dependency>
  
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-client-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-webservices-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>unavailable-ejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>unavailable-client-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>unavailable-webservices-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>unavailable-ejb-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+        <!---->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml Mon Sep 10 23:34:53 2007
@@ -34,7 +34,7 @@
         </gbean>
         <gbean name="DownloadedPluginRepos">
           <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
-          <attribute name="userRepositories">[]</attribute>
+          <attribute name="userRepositories">~/.m2/repository</attribute>
         </gbean>
     </module>
     
@@ -47,22 +47,6 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
-        <gbean name="Deployer">
-            <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary + PortOffset}</attribute>
-        </gbean>
-    </module>
-    
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
-        <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0</attribute>
-        </gbean>
-    </module>
-
-    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
-
-    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/server-security-config/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${version}/car"/>
-
 </attributes>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Mon Sep 10 23:34:53 2007
@@ -42,16 +42,20 @@
     <modules>
         <module>geronimo-boilerplate-minimal</module>
         <module>geronimo-boilerplate-jee5</module>
+<!--
         <module>geronimo-jetty6-jee5</module>
         <module>geronimo-tomcat6-jee5</module>
+-->
         <!--
         NOTE: Don't enable by default for now...
         
         <module>geronimo-jetty6-javaee5-gshell</module>
         -->
         <module>geronimo-framework</module>
+<!--
         <module>geronimo-jetty6-minimal</module>
         <module>geronimo-tomcat6-minimal</module>
+-->
     </modules>
 
 </project>

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Mon Sep 10 23:34:53 2007
@@ -71,22 +71,22 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jcl</artifactId>
         </dependency>
-        
+
         <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>jasper</artifactId>-->
-            <!--<type>car</type>-->
-            <!--<version>${version}</version>-->
+        <!--<groupId>org.apache.geronimo.configs</groupId>-->
+        <!--<artifactId>jasper</artifactId>-->
+        <!--<type>car</type>-->
+        <!--<version>${version}</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -126,7 +126,7 @@
                                     <attribute name="host">#{ServerHostname}</attribute>
                                     <attribute name="port">#{HTTPSPort + PortOffset}</attribute>
                                 </gbean>
-                             </config-xml-content>
+                            </config-xml-content>
                             <config-substitution key="HTTPPort">8080</config-substitution>
                             <config-substitution key="AJPPort">8009</config-substitution>
                             <config-substitution key="HTTPSPort">8443</config-substitution>
@@ -139,5 +139,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/trunk/configs/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/myfaces-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/myfaces-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -54,5 +54,40 @@
             <version>${version}</version>
         </dependency>
 
-    </dependencies>    
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Web Framework</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-myfaces-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>myfaces</artifactId>
+                        <type>car</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>

Modified: geronimo/server/trunk/configs/myfaces-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/myfaces-deployer/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/myfaces-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/myfaces-deployer/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,54 +13,29 @@
     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>myfaces-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-myfaces-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>myfaces</artifactId>
-        <type>car</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="MyFacesModuleBuilderExtension" class="org.apache.geronimo.myfaces.deployment.MyFacesModuleBuilderExtension">
-    <attribute name="providerFactoryNameQuery">?name=MyFacesLifecycleProviderFactory#org.apache.geronimo.myfaces.LifecycleProviderFactoryGBean</attribute>
-    <reference name="NamingBuilders">
-      <name>NamingBuilders</name>
-    </reference>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>myfaces</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="MyFacesModuleBuilderExtension" class="org.apache.geronimo.myfaces.deployment.MyFacesModuleBuilderExtension">
+        <attribute name="providerFactoryNameQuery">?name=MyFacesLifecycleProviderFactory#org.apache.geronimo.myfaces.LifecycleProviderFactoryGBean</attribute>
+        <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>myfaces</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/myfaces/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/myfaces/pom.xml (original)
+++ geronimo/server/trunk/configs/myfaces/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>myfaces</artifactId>
     <name>Geronimo Configs :: MyFaces</name>
     <packaging>car</packaging>
+
+    <description>Geronimo MyFaces jsf integration</description>
     
     <dependencies>
         <!-- parent -->
@@ -78,4 +80,21 @@
         </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>Web Framework</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/server/trunk/configs/myfaces/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/myfaces/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/myfaces/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/myfaces/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,74 +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>myfaces</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.6.1</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.geronimo.modules</groupId>
-        <artifactId>geronimo-myfaces</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.myfaces.core</groupId>
-        <artifactId>myfaces-impl</artifactId>
-        <version>1.2.0</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>commons-digester</groupId>
-        <artifactId>commons-digester</artifactId>
-        <version>1.8</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.3</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>commons-discovery</groupId>
-        <artifactId>commons-discovery</artifactId>
-        <version>0.4</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="MyFacesLifecycleProviderFactory" class="org.apache.geronimo.myfaces.LifecycleProviderFactoryGBean"/>
-</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="MyFacesLifecycleProviderFactory" class="org.apache.geronimo.myfaces.LifecycleProviderFactoryGBean"/>
+
+</module>

Modified: geronimo/server/trunk/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/offline-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/offline-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Offline Deployer</name>
     <packaging>car</packaging>
 
+    <description>Offline deployer</description>
+
     <dependencies>
         
         <dependency>
@@ -43,5 +45,21 @@
         </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>Deployment</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: geronimo/server/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Online Deployer</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Online Deployer</description>
+
     <dependencies>
         
         <dependency>
@@ -139,6 +141,11 @@
                         </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Deployment</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,142 +13,97 @@
     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">
-  <!--ServerInfo service-->
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>online-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
-        <version>1.1</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>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>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <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>
-  <!--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="readOnly">true</attribute>
-    <attribute name="configFile">var/config/jsr88-configurer-config.xml</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>
-  <!--Server attribute service-->
-  <gbean name="ServerAttributeManager" class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <attribute name="configFile">var/config/config.xml</attribute>
-  </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>ServerAttributeManager</name>
-    </reference>
-    <reference name="ArtifactManager">
-      <name>ArtifactManager</name>
-    </reference>
-    <reference name="ArtifactResolver">
-      <name>ArtifactResolver</name>
-    </reference>
-  </gbean>
-  <!--System Properties-->
-  <gbean name="ServerSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
-    <attribute name="systemProperties">java.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl</attribute>
-  </gbean>
-  <!--Logging service-->
-  <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
-    <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
-    <attribute name="refreshPeriodSeconds">60</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</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}">
+
+    <!-- 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>
+
+    <!--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="readOnly">true</attribute>
+        <attribute name="configFile">var/config/jsr88-configurer-config.xml</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>
+
+    <!--Server attribute service-->
+    <gbean name="ServerAttributeManager" class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <attribute name="configFile">var/config/config.xml</attribute>
+    </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>ServerAttributeManager</name>
+        </reference>
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="ArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
+    </gbean>
+
+    <!-- System Properties -->
+    <gbean name="ServerSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemProperties">
+             java.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl
+        </attribute>
+    </gbean>
+
+    <!-- Logging service -->
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+        <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -21,20 +21,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>openejb-corba-deployer</artifactId>
     <name>Geronimo Configs :: Geronimo CORBA Deployer</name>
     <packaging>car</packaging>
-    
+
+    <description>Geronimo deployer for corba security configurations for openejb.</description>
+
     <dependencies>
-    
+
         <!-- ideally we wouldn't need this -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -66,5 +68,45 @@
         </dependency>
 
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>EJB Container</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb-deployer</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-corba-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</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-corba</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     
 </project>

Modified: geronimo/server/trunk/configs/openejb-corba-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,119 +13,94 @@
     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>openejb-corba-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb-deployer</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-corba-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>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-corba</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="CSSAttributeBuilder" class="org.apache.geronimo.corba.security.config.css.CSSConfigEditor"/>
-  <gbean name="TSSAttributeBuilder" class="org.apache.geronimo.corba.security.config.tss.TSSConfigEditor"/>
-  <gbean name="OpenEjbCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.OpenEjbCorbaRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="OpenEjbClientCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.OpenEjbCorbaRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba-yoko</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="CorbaRefBuilder" class="org.apache.geronimo.corba.deployment.CorbaRefBuilder">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-    <reference name="CorbaGBeanNameSource">
-      <name>EARBuilder</name>
-    </reference>
-  </gbean>
-  <gbean name="ClientCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.CorbaRefBuilder">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba-yoko</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-    <reference name="CorbaGBeanNameSource">
-      <name>AppClientBuilder</name>
-    </reference>
-  </gbean>
-  <gbean name="CorbaModuleBuilderExtension" class="org.apache.geronimo.corba.deployment.CorbaModuleBuilderExtension">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</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="CSSAttributeBuilder" class="org.apache.geronimo.corba.security.config.css.CSSConfigEditor"/>
+    <gbean name="TSSAttributeBuilder" class="org.apache.geronimo.corba.security.config.tss.TSSConfigEditor"/>
+
+    <gbean name="OpenEjbCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.OpenEjbCorbaRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="OpenEjbClientCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.OpenEjbCorbaRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>client-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="CorbaRefBuilder" class="org.apache.geronimo.corba.deployment.CorbaRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="CorbaGBeanNameSource">
+            <name>EARBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ClientCorbaRefBuilder" class="org.apache.geronimo.corba.deployment.CorbaRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>client-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="CorbaGBeanNameSource">
+            <name>AppClientBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="CorbaModuleBuilderExtension" class="org.apache.geronimo.corba.deployment.CorbaModuleBuilderExtension">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+
+</module>

Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -21,20 +21,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>openejb-deployer</artifactId>
     <name>Geronimo Configs :: OpenEJB Deployer</name>
     <packaging>car</packaging>
-    
+
+    <description>Geronimo Deployer for OpenEJB Container.</description>
+
     <dependencies>
-    
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
@@ -60,23 +62,85 @@
             <artifactId>geronimo-webservices-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <!--dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-axis</artifactId>
         </dependency-->
-        
+
         <!--dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
         </dependency-->
-        
+
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>EJB Container</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>connector-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-webservices-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-openejb-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>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="EjbRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                </gbean>
+
+                                <gbean name="ClientEjbRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                    <attribute name="host">${ServerHostname}</attribute>
+                                    <attribute name="port">${OpenEJBPort + PortOffset}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="OpenEJBPort">4201</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/openejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,140 +13,106 @@
     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>openejb-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>connector-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-webservices-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-openejb-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>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="EJBBuilder" class="org.apache.geronimo.openejb.deployment.EjbModuleBuilder">
-    <attribute name="defaultCmpJTADataSource">SystemDatasource</attribute>
-    <attribute name="defaultCmpNonJTADataSource">NoTxDatasource</attribute>
-    <reference name="OpenEjbSystem">
-      <name>OpenEjbSystem</name>
-    </reference>
-    <references name="ModuleBuilderExtensions">
-      <pattern>
-        <name>PersistenceUnitBuilder</name>
-      </pattern>
-      <pattern>
-        <name>CXFModuleBuilderExtension</name>
-      </pattern>
-      <pattern>
-        <name>Axis2ModuleBuilderExtension</name>
-      </pattern>
-      <pattern>
-        <name>AxisModuleBuilderExtension</name>
-      </pattern>
-      <pattern>
-        <name>CorbaModuleBuilderExtension</name>
-      </pattern>
-    </references>
-    <reference name="SecurityBuilders">
-      <name>SecurityBuilder</name>
-    </reference>
-    <reference name="ServiceBuilders">
-      <name>GBeanBuilder</name>
-    </reference>
-    <reference name="NamingBuilders">
-      <name>NamingBuilders</name>
-    </reference>
-    <reference name="ResourceEnvironmentSetter">
-      <name>ResourceRefBuilder</name>
-    </reference>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <type>car</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="EjbRefBuilder" class="org.apache.geronimo.openejb.deployment.EjbRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <type>jar</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="ClientEjbRefBuilder" class="org.apache.geronimo.openejb.deployment.EjbRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-    <attribute name="host">127.0.0.1</attribute>
-    <attribute name="port">4201</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <type>jar</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="EJBBuilder" class="org.apache.geronimo.openejb.deployment.EjbModuleBuilder">
+        <attribute name="defaultCmpJTADataSource">SystemDatasource</attribute>
+        <attribute name="defaultCmpNonJTADataSource">NoTxDatasource</attribute>
+        <reference name="OpenEjbSystem">
+            <name>OpenEjbSystem</name>
+        </reference>
+        <references name="ModuleBuilderExtensions">
+            <pattern>
+                <name>PersistenceUnitBuilder</name>
+            </pattern>
+            <pattern>
+                <name>CXFModuleBuilderExtension</name>
+            </pattern>
+            <pattern>
+                <name>Axis2ModuleBuilderExtension</name>
+            </pattern>
+            <pattern>
+                <name>AxisModuleBuilderExtension</name>
+            </pattern>
+            <pattern>
+                <name>CorbaModuleBuilderExtension</name>
+            </pattern>
+        </references>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
+        <reference name="ResourceEnvironmentSetter">
+            <name>ResourceRefBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>openejb</artifactId>
+                        <type>car</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>system-database</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+
+    <gbean name="EjbRefBuilder" class="org.apache.geronimo.openejb.deployment.EjbRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>openejb-core</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-openejb</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="ClientEjbRefBuilder" class="org.apache.geronimo.openejb.deployment.EjbRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <attribute name="host">localhost</attribute>
+        <attribute name="port">4201</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>openejb-core</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-openejb</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+</module>

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: OpenEJB</name>
     <packaging>car</packaging>
 
+    <description>Geronimo integration of the OpenEJB  ejb container.</description>
+
     <dependencies>
 
         <dependency>
@@ -140,5 +142,21 @@
         </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>EJB Container</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: geronimo/server/trunk/configs/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Mon Sep 10 23:34:53 2007
@@ -80,45 +80,16 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+<!--
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <category>Geronimo</category>
-                    <dependencies>
-                      <dependency>
-                        <groupId>commons-lang</groupId>
-                        <artifactId>commons-lang</artifactId>
-                        <version>2.0</version>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>commons-collections</groupId>
-                        <artifactId>commons-collections</artifactId>
-                        <version>3.1</version>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>transaction</artifactId>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>net.sourceforge.serp</groupId>
-                        <artifactId>serp</artifactId>
-                        <version>1.11.0</version>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.openjpa</groupId>
-                        <artifactId>openjpa</artifactId>
-                        <version>1.0.0-SNAPSHOT</version>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
-                    </dependencies>
+-->
+                    <category>Persistence</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Persistence Deployer</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Persistence Unit deployer.</description>
+
     <dependencies>
 
         <dependency>
@@ -49,8 +51,8 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.apache.xbean</groupId>-->
-            <!--<artifactId>xbean-finder</artifactId>-->
+        <!--<groupId>org.apache.xbean</groupId>-->
+        <!--<artifactId>xbean-finder</artifactId>-->
         <!--</dependency>-->
 
         <dependency>
@@ -63,10 +65,71 @@
 
         <!--todo get the schema classes in a config -->
         <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.schema</groupId>-->
-            <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
+        <!--<groupId>org.apache.geronimo.schema</groupId>-->
+        <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
         <!--</dependency>-->
 
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Persistence</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>transaction</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-persistence-jpa10-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>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="PersistenceUnitBuilder">
+                                    <attribute name="defaultPersistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
+                                    <attribute name="defaultPersistenceUnitProperties">
+                                        openjpa.Log=commons
+                                        openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+                                        openjpa.jdbc.UpdateManager=operation-order
+                                        openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)
+                                    </attribute>
+                                    <attribute name="defaultEnvironment">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>openjpa</artifactId>
+                                                    <type>car</type>
+                                                </dependency>
+                                            </dependencies>
+                                        </environment>
+                                    </attribute>
+                                </gbean>
+                            </config-xml-content>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,84 +13,62 @@
   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>persistence-jpa10-deployer</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>transaction</dep:artifactId>
-        <dep:type>car</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-persistence-jpa10-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>j2ee-deployer</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <gbean name="PersistenceUnitBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitBuilder">
-    <attribute name="defaultPersistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
-    <attribute name="extendedEntityManagerRegistryName">?name=ExtendedEntityManagerRegistry#org.apache.geronimo.persistence.ExtendedEntityManagerRegistry</attribute>
-    <attribute name="defaultPersistenceUnitProperties">openjpa.Log=commons
+
+    <gbean name="PersistenceUnitBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitBuilder">
+        <attribute name="defaultPersistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
+        <attribute name="extendedEntityManagerRegistryName">?name=ExtendedEntityManagerRegistry#org.apache.geronimo.persistence.ExtendedEntityManagerRegistry</attribute>
+        <attribute name="defaultPersistenceUnitProperties">
+            openjpa.Log=commons
             openjpa.jdbc.DBDictionary=org.apache.openjpa.jdbc.sql.DerbyDictionary
             openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
             openjpa.jdbc.UpdateManager=operation-order
-            openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <!--TODO possibly the ref builders only need a dependency on transaction-->
-  <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceContextRefBuilder">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="PersistenceUnitRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitRefBuilder">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-</module>
\ No newline at end of file
+            openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)
+        </attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>openjpa</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+    <!-- TODO possibly the ref builders only need a dependency on transaction -->
+    <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceContextRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>openjpa</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+    <gbean name="PersistenceUnitRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>openjpa</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+
+</module>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Sep 10 23:34:53 2007
@@ -113,8 +113,9 @@
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
                             <jvm-version>1.5</jvm-version>
-                            <source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
+                            <!--<source-repository>http://repo1.maven.org/maven2/</source-repository>-->
+                            <source-repository>~/.m2/repository/</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml Mon Sep 10 23:34:53 2007
@@ -32,6 +32,8 @@
     <artifactId>remote-deploy-jetty</artifactId>
     <name>Geronimo Configs :: Remote Deploy Jetty</name>
     <packaging>car</packaging>
+
+    <description>Geronimo remote deploy upload servlet (Jetty)</description>
     
     <dependencies>
     
@@ -85,6 +87,23 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
+                    <category>Deployment</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>jetty6</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Jetty web container</description>
+                            </prerequisite>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/remote-deploy-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-jetty/src/main/plan/plan.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-jetty/src/main/plan/plan.xml Mon Sep 10 23:34:53 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,43 +13,27 @@
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.-->
-<!--$Rev$ $Date$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <cfg:environment>
-    <cfg:moduleId>
-      <cfg:groupId>org.apache.geronimo.configs</cfg:groupId>
-      <cfg:artifactId>remote-deploy-jetty</cfg:artifactId>
-      <cfg:version>2.1-SNAPSHOT</cfg:version>
-      <cfg:type>car</cfg:type>
-    </cfg:moduleId>
-    <cfg:dependencies>
-      <cfg:dependency>
-        <cfg:groupId>org.apache.geronimo.configs</cfg:groupId>
-        <cfg:artifactId>jasper</cfg:artifactId>
-        <cfg:type>car</cfg:type>
-      </cfg:dependency>
-      <cfg:dependency>
-        <cfg:groupId>org.apache.geronimo.configs</cfg:groupId>
-        <cfg:artifactId>xmlbeans</cfg:artifactId>
-        <cfg:type>car</cfg:type>
-      </cfg:dependency>
-    </cfg:dependencies>
-    <cfg:hidden-classes/>
-    <cfg:non-overridable-classes/>
-  </cfg:environment>
-  <context-root>/remote-deploy</context-root>
-  <security-realm-name>geronimo-admin</security-realm-name>
-  <sec:security>
-    <!--<sec:default-subject>-->
-    <!--<sec:realm>geronimo-admin</sec:realm>-->
-    <!--<sec:id>anonymous</sec:id>-->
-    <!--</sec:default-subject>-->
-    <sec:role-mappings>
-      <sec:role role-name="admin">
-        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
-      </sec:role>
-    </sec:role-mappings>
-  </sec:security>
-  <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
-</web-app>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <context-root>/remote-deploy</context-root>
+    <security-realm-name>geronimo-admin</security-realm-name>
+    <sec:security>
+        <!--<sec:default-subject>-->
+            <!--<sec:realm>geronimo-admin</sec:realm>-->
+            <!--<sec:id>anonymous</sec:id>-->
+        <!--</sec:default-subject>-->
+        <sec:role-mappings>
+            <sec:role role-name="admin">
+                <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+                               name="admin"/>
+            </sec:role>
+        </sec:role-mappings>
+    </sec:security>
+    <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
+
+</web-app>

Modified: geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml?rev=574483&r1=574482&r2=574483&view=diff
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml Mon Sep 10 23:34:53 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Remote Deploy Tomcat</name>
     <packaging>car</packaging>
     
+    <description>Geronimo remote deploy upload servlet (Tomcat)</description>
+
     <dependencies>
     
         <dependency>
@@ -85,6 +87,23 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
+                    <category>Deployment</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <prerequisite>
+                                <id>
+                                    <groupId>org.apache.geronimo.configs</groupId>
+                                    <artifactId>tomcat</artifactId>
+                                </id>
+                                <resource-type>Web Container</resource-type>
+                                <description>The Tomcat web container</description>
+                            </prerequisite>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message