geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r591525 - in /geronimo/server/trunk: applications/remote-deploy/remote-deploy-jetty/src/plan/ applications/remote-deploy/remote-deploy-tomcat/src/plan/ applications/sharedlib/src/main/plan/ applications/sharedlib/src/plan/ applications/uddi...
Date Sat, 03 Nov 2007 00:43:58 GMT
Author: djencks
Date: Fri Nov  2 17:43:55 2007
New Revision: 591525

URL: http://svn.apache.org/viewvc?rev=591525&view=rev
Log:
More duplicate plan removal and plan cleanup

Removed:
    geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/src/plan/
    geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/src/plan/
    geronimo/server/trunk/applications/sharedlib/src/plan/
    geronimo/server/trunk/applications/uddi-server/uddi-jetty6/src/plan/
    geronimo/server/trunk/applications/uddi-server/uddi-tomcat/src/plan/
    geronimo/server/trunk/applications/welcome/welcome-jetty/src/plan/
    geronimo/server/trunk/components/spring/src/plan/
    geronimo/server/trunk/components/transformer-agent/src/plan/
    geronimo/server/trunk/framework/configs/offline-deployer/src/plan/
    geronimo/server/trunk/framework/configs/online-deployer/src/plan/
    geronimo/server/trunk/framework/configs/rmi-naming/src/plan/
    geronimo/server/trunk/framework/configs/server-security-config/src/plan/
    geronimo/server/trunk/framework/configs/shutdown/src/plan/
    geronimo/server/trunk/framework/configs/upgrade-cli/src/plan/
    geronimo/server/trunk/framework/configs/xmlbeans/src/plan/
    geronimo/server/trunk/plugins/clustering/wadi-clustering/src/plan/
    geronimo/server/trunk/plugins/connector/transaction/src/plan/
    geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/plan/
    geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/src/plan/
    geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/src/plan/
    geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/plan/
    geronimo/server/trunk/plugins/myfaces/myfaces/src/plan/
    geronimo/server/trunk/plugins/openejb/openejb-deployer/src/plan/
    geronimo/server/trunk/plugins/openejb/openejb/src/plan/
    geronimo/server/trunk/plugins/openjpa/openjpa/src/plan/
    geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/src/plan/
    geronimo/server/trunk/plugins/system-database/system-database/src/plan/
    geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/plan/
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/plan/
    geronimo/server/trunk/plugins/webservices/webservices-common/src/plan/
Modified:
    geronimo/server/trunk/applications/sharedlib/src/main/plan/plan.xml
    geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml
    geronimo/server/trunk/applications/uddi-server/uddi-jetty6/src/main/plan/plan.xml
    geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml
    geronimo/server/trunk/applications/uddi-server/uddi-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/applications/welcome/welcome-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/applications/welcome/welcome-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/components/upgrade/pom.xml
    geronimo/server/trunk/components/upgrade/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
    geronimo/server/trunk/plugins/openjpa/openjpa/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml

Modified: geronimo/server/trunk/applications/sharedlib/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/sharedlib/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/sharedlib/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/sharedlib/src/main/plan/plan.xml Fri Nov  2 17:43:55 2007
@@ -15,12 +15,12 @@
     limitations under the License.-->
 <!--$Rev$ $Date$-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <!--The SharedLib Service-->
-  <gbean name="SharedLib" class="org.apache.geronimo.system.sharedlib.SharedLib">
-    <attribute name="classesDirs">var/shared/classes</attribute>
-    <attribute name="libDirs">var/shared/lib</attribute>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
+    <!--The SharedLib Service-->
+    <gbean name="SharedLib" class="org.apache.geronimo.system.sharedlib.SharedLib">
+        <attribute name="classesDirs">var/shared/classes</attribute>
+        <attribute name="libDirs">var/shared/lib</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
 </module>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml Fri Nov  2 17:43:55 2007
@@ -117,6 +117,11 @@
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <category>Web Services</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-jetty6/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-jetty6/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,100 +13,68 @@
     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$-->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-  <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>uddi-jetty6</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>jasper</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>axis</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>system-database</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.applications</dep:groupId>
-        <dep:artifactId>geronimo-uddi-db</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>juddi</dep:groupId>
-        <dep:artifactId>juddi</dep:artifactId>
-        <dep:version>0.9rc4</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <ext-module>
-    <web>uddi-jetty</web>
-    <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
-      <dep:artifactId>geronimo-uddi-server</dep:artifactId>
-      <dep:type>war</dep:type>
-    </external-path>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-      <context-root>/juddi</context-root>
-      <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
-        <!--copies uddi derby db files into specified location-->
-        <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
-        <attribute name="path">var/derby</attribute>
-        <reference name="ServerInfo">
-          <name>ServerInfo</name>
-        </reference>
-      </gbean>
-    </web-app>
-  </ext-module>
-  <ext-module>
-    <connector>uddi-db</connector>
-    <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:groupId>org.tranql</dep:groupId>
-      <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
-      <dep:type>rar</dep:type>
-    </external-path>
-    <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-      <resourceadapter>
-        <outbound-resourceadapter>
-          <connection-definition>
-            <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-            <connectiondefinition-instance>
-              <name>jdbc/juddiDB</name>
-              <config-property-setting name="UserName"/>
-              <config-property-setting name="Password"/>
-              <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
-              <config-property-setting name="CreateDatabase">false</config-property-setting>
-              <connectionmanager>
-                <local-transaction/>
-                <single-pool>
-                  <max-size>100</max-size>
-                  <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                  <match-one/>
-                </single-pool>
-              </connectionmanager>
-            </connectiondefinition-instance>
-          </connection-definition>
-        </outbound-resourceadapter>
-      </resourceadapter>
-    </connector>
-  </ext-module>
-  <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
-</application>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
+
+    <ext-module>
+        <web>uddi-jetty</web>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+            <dep:artifactId>geronimo-uddi-server</dep:artifactId>
+            <dep:type>war</dep:type>
+        </external-path>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
+            <context-root>/juddi</context-root>
+            <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+                <!-- copies uddi derby db files into specified location -->
+                <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
+                <attribute name="path">var/derby</attribute>
+                <reference name="ServerInfo">
+                    <name>ServerInfo</name>
+                </reference>
+            </gbean>
+        </web-app>
+    </ext-module>
+
+    <ext-module>
+        <connector>uddi-db</connector>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jdbc/juddiDB</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
+                            <config-property-setting name="CreateDatabase">false</config-property-setting>
+                            <connectionmanager>
+                                <local-transaction/>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+
+
+        </connector>
+    </ext-module>
+
+    <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
+
+</application>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml Fri Nov  2 17:43:55 2007
@@ -123,6 +123,11 @@
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <category>Web Services</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-tomcat/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-tomcat/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,107 +13,69 @@
     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$-->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-  <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>uddi-tomcat</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.derby</dep:groupId>
-        <dep:artifactId>derby</dep:artifactId>
-        <dep:version>10.2.2.0</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>axis</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>system-database</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>jasper</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.applications</dep:groupId>
-        <dep:artifactId>geronimo-uddi-db</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>juddi</dep:groupId>
-        <dep:artifactId>juddi</dep:artifactId>
-        <dep:version>0.9rc4</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <ext-module>
-    <web>uddi-tomcat</web>
-    <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
-      <dep:artifactId>geronimo-uddi-server</dep:artifactId>
-      <dep:type>war</dep:type>
-    </external-path>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-      <context-root>/juddi</context-root>
-      <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
-        <!--copies uddi derby db files into specified location-->
-        <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
-        <attribute name="path">var/derby</attribute>
-        <reference name="ServerInfo">
-          <name>ServerInfo</name>
-        </reference>
-      </gbean>
-    </web-app>
-  </ext-module>
-  <ext-module>
-    <connector>uddi-db</connector>
-    <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-      <dep:groupId>org.tranql</dep:groupId>
-      <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
-      <dep:type>rar</dep:type>
-    </external-path>
-    <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-      <resourceadapter>
-        <outbound-resourceadapter>
-          <connection-definition>
-            <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-            <connectiondefinition-instance>
-              <name>jdbc/juddiDB</name>
-              <config-property-setting name="UserName"/>
-              <config-property-setting name="Password"/>
-              <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
-              <config-property-setting name="CreateDatabase">false</config-property-setting>
-              <connectionmanager>
-                <local-transaction/>
-                <single-pool>
-                  <max-size>100</max-size>
-                  <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                  <match-one/>
-                </single-pool>
-              </connectionmanager>
-            </connectiondefinition-instance>
-          </connection-definition>
-        </outbound-resourceadapter>
-      </resourceadapter>
-    </connector>
-  </ext-module>
-  <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
-</application>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
+
+    <ext-module>
+        <web>uddi-tomcat</web>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+            <dep:artifactId>geronimo-uddi-server</dep:artifactId>
+            <dep:type>war</dep:type>
+        </external-path>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
+
+            <context-root>/juddi</context-root>
+            <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+                <!-- copies uddi derby db files into specified location -->
+                <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
+                <attribute name="path">var/derby</attribute>
+                <reference name="ServerInfo">
+                    <name>ServerInfo</name>
+                </reference>
+            </gbean>
+        </web-app>
+    </ext-module>
+
+    <ext-module>
+        <connector>uddi-db</connector>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jdbc/juddiDB</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
+                            <config-property-setting name="CreateDatabase">false</config-property-setting>
+                            <connectionmanager>
+                                <local-transaction/>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+
+
+        </connector>
+    </ext-module>
+
+    <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
+
+</application>

Modified: geronimo/server/trunk/applications/welcome/welcome-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-jetty/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-jetty/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,8 +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$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-  <context-root>/</context-root>
-</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}">
+
+    <context-root>/</context-root>
+
+</web-app>

Modified: geronimo/server/trunk/applications/welcome/welcome-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-tomcat/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-tomcat/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,8 +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$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-  <context-root>/</context-root>
-</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/tomcat-${geronimoSchemaVersion}">
+
+    <context-root>/</context-root>
+
+</web-app>

Modified: geronimo/server/trunk/components/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/upgrade/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/components/upgrade/pom.xml (original)
+++ geronimo/server/trunk/components/upgrade/pom.xml Fri Nov  2 17:43:55 2007
@@ -48,12 +48,21 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Deployment</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/server/trunk/components/upgrade/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/upgrade/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/components/upgrade/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/components/upgrade/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,40 +13,15 @@
     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">
-  <!--Deployer used to process modules and plans-->
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>upgrade</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <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-service-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-upgrade</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="Upgrade" class="org.apache.geronimo.upgrade.UpgradeGBean"></gbean>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!-- Deployer used to process modules and plans -->
+    <gbean name="Upgrade" class="org.apache.geronimo.upgrade.UpgradeGBean">
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/plan/plan.xml Fri Nov  2 17:43:55 2007
@@ -15,69 +15,7 @@
     limitations under the License.-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <!--Deployer used to process modules and plans-->
-<!--
-    <environment>
-        <moduleId>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-            <version>2.1-SNAPSHOT</version>
-            <type>car</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deployment</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-service-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xmlbeans</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.3.0</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deploy-config</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                <version>1.0</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-        </dependencies>
-        <hidden-classes/>
-        <non-overridable-classes/>
-    </environment>
--->
+
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
         <reference name="Store">
         </reference>

Modified: geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,31 +13,19 @@
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.-->
-<!--$Rev$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>offline-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>online-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <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/offline-deployer-config.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="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/offline-deployer-config.xml</attribute>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml Fri Nov  2 17:43:55 2007
@@ -50,10 +50,11 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <category>Deployment</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,25 +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>unavailable-client-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="UnavailableAppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder"/>
-</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="UnavailableAppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
+
+</module>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml Fri Nov  2 17:43:55 2007
@@ -50,10 +50,11 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <category>Deployment</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,28 +13,18 @@
     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>unavailable-ejb-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="UnavailableEJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder"/>
-  <!--TODO include new-style unavaliable naming builders-->
-  <!--<gbean name="UnavailableClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />-->
-  <!--<gbean name="UnavailableServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />-->
-</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="UnavailableEJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
+
+    <!-- TODO include new-style unavaliable naming builders -->
+    <!--<gbean name="UnavailableClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />-->
+
+    <!--<gbean name="UnavailableServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />-->
+
+</module>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml Fri Nov  2 17:43:55 2007
@@ -50,10 +50,11 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <category>Deployment</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,26 +13,14 @@
     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>unavailable-webservices-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="UnavailableWebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder"/>
-  <!--TODO need an unavailable naming builder-->
-</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="UnavailableWebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder" />
+
+    <!--TODO need an unavailable naming builder -->
+</module>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml Fri Nov  2 17:43:55 2007
@@ -29,9 +29,9 @@
     </gbean>
 
     <gbean name="ExtendedEntityManagerRegistry" class="org.apache.geronimo.openejb.EntityManagerRegistryImpl">
-    	<dependency>
-    		<name>OpenEjbSystem</name>
-    	</dependency>
+        <dependency>
+            <name>OpenEjbSystem</name>
+        </dependency>
     </gbean>
 
     <gbean name="DefaultStatelessContainer" class="org.apache.geronimo.openejb.EjbContainer">
@@ -64,14 +64,6 @@
         </reference>
     </gbean>
 
-    <!--<gbean name="DefaultMDBContainer" class="org.apache.geronimo.openejb.EjbContainer">-->
-        <!--<attribute name="id">Default MDB Container</attribute>-->
-        <!--<attribute name="type">MESSAGE</attribute>-->
-        <!--<reference name="OpenEjbSystem">-->
-            <!--<name>OpenEjbSystem</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
-
     <gbean name="EJBNetworkService" class="org.apache.geronimo.openejb.EjbDaemonGBean">
         <attribute name="port">${PlanOpenEJBPort}</attribute>
         <attribute name="host">${PlanServerHostname}</attribute>
@@ -80,11 +72,5 @@
             <name>OpenEjbSystem</name>
         </dependency>
     </gbean>
-<!--
-    <gbean name="ejb/mgmt/MEJB" class="org.apache.geronimo.openejb.MEJBGBean">
-        <reference name="StatelessContainer">
-            <name>DefaultStatelessContainer</name>
-        </reference>
-    </gbean>
--->
+
 </module>

Modified: geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml Fri Nov  2 17:43:55 2007
@@ -86,11 +86,6 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-<!--
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                    </deploymentConfigs>
--->
                     <category>Persistence</category>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/server/trunk/plugins/openjpa/openjpa/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/src/main/plan/plan.xml Fri Nov  2 17:43:55 2007
@@ -15,4 +15,5 @@
   limitations under the License.-->
 <!--$Rev$ $Date$-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <gbean name="OpenJPAConfigurationMonitor" class="org.apache.geronimo.openjpa.ConfigurationMonitorGBean"/>
 </module>

Modified: geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml?rev=591525&r1=591524&r2=591525&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml Fri Nov  2 17:43:55 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,99 +13,89 @@
     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$-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-  <resourceadapter>
-    <outbound-resourceadapter>
-      <connection-definition>
-        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-        <connectiondefinition-instance>
-          <name>SystemDatasource</name>
-          <config-property-setting name="UserName"/>
-          <config-property-setting name="Password"/>
-          <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-          <config-property-setting name="CreateDatabase">true</config-property-setting>
-          <connectionmanager>
-            <xa-transaction>
-              <transaction-caching/>
-            </xa-transaction>
-            <single-pool>
-              <max-size>100</max-size>
-              <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-              <select-one-assume-match/>
-            </single-pool>
-          </connectionmanager>
-        </connectiondefinition-instance>
-        <connectiondefinition-instance>
-          <name>NoTxDatasource</name>
-          <config-property-setting name="UserName"/>
-          <config-property-setting name="Password"/>
-          <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-          <config-property-setting name="CreateDatabase">true</config-property-setting>
-          <connectionmanager>
-            <no-transaction/>
-            <single-pool>
-              <max-size>100</max-size>
-              <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-              <select-one-assume-match/>
-            </single-pool>
-          </connectionmanager>
-        </connectiondefinition-instance>
-      </connection-definition>
-    </outbound-resourceadapter>
-  </resourceadapter>
-  <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <attribute name="derbySystemHome">var/derby</attribute>
-  </gbean>
-  <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-    <reference name="derbySystem">
-      <name>DerbySystem</name>
-    </reference>
-    <attribute name="host">localhost</attribute>
-    <attribute name="port">1527</attribute>
-  </gbean>
-  <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
-    <reference name="DerbySystem">
-      <name>DerbySystem</name>
-    </reference>
-  </gbean>
-  <gbean name="DerbyDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
-    <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
-  </gbean>
-  <gbean name="DerbyClientDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
-    <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
-  </gbean>
-  <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-    <attribute name="repeatCount">5</attribute>
-    <reference name="TransactionManager">
-      <name>TransactionManager</name>
-    </reference>
-    <reference name="ManagedConnectionFactoryWrapper">
-      <name>SystemDatasource</name>
-    </reference>
-    <reference name="ThreadPool">
-      <name>DefaultThreadPool</name>
-    </reference>
-    <dependency>
-      <name>DerbySystem</name>
-    </dependency>
-  </gbean>
-  <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-    <reference name="TransactionManager">
-      <name>TransactionManager</name>
-    </reference>
-    <reference name="ManagedConnectionFactoryWrapper">
-      <name>SystemDatasource</name>
-    </reference>
-    <reference name="ThreadPool">
-      <name>DefaultThreadPool</name>
-    </reference>
-    <dependency>
-      <name>DerbySystem</name>
-    </dependency>
-  </gbean>
-</connector>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>SystemDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>NoTxDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="derbySystemHome">var/derby</attribute>
+    </gbean>
+
+    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
+        <reference name="derbySystem"><name>DerbySystem</name></reference>
+        <attribute name="host">localhost</attribute>
+        <attribute name="port">1527</attribute>
+    </gbean>
+
+    <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
+        <reference name="DerbySystem"><name>DerbySystem</name></reference>
+    </gbean>
+
+    <gbean name="DerbyDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
+        <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
+    </gbean>
+
+    <gbean name="DerbyClientDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
+        <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
+    </gbean>
+
+    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+        <attribute name="repeatCount">5</attribute>
+        <reference name="TransactionManager"><name>TransactionManager</name></reference>
+        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
+        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
+        <dependency><name>DerbySystem</name></dependency>
+    </gbean>
+
+    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+        <reference name="TransactionManager"><name>TransactionManager</name></reference>
+        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
+        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
+        <dependency><name>DerbySystem</name></dependency>
+    </gbean>
+
+</connector>



Mime
View raw message