geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r573957 [1/2] - in /geronimo/server/trunk: configs/ configs/activemq-broker/ configs/activemq-broker/src/main/plan/ configs/activemq-ra/ configs/activemq-ra/src/main/plan/ configs/axis-deployer/ configs/axis-deployer/src/main/plan/ configs/...
Date Sun, 09 Sep 2007 08:14:59 GMT
Author: djencks
Date: Sun Sep  9 01:14:57 2007
New Revision: 573957

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

Modified:
    geronimo/server/trunk/configs/activemq-broker/pom.xml
    geronimo/server/trunk/configs/activemq-broker/src/main/plan/plan.xml
    geronimo/server/trunk/configs/activemq-ra/pom.xml
    geronimo/server/trunk/configs/activemq-ra/src/main/plan/plan.xml
    geronimo/server/trunk/configs/axis-deployer/pom.xml
    geronimo/server/trunk/configs/axis-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/axis/pom.xml
    geronimo/server/trunk/configs/axis/src/main/plan/plan.xml
    geronimo/server/trunk/configs/axis2-deployer/pom.xml
    geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/axis2/pom.xml
    geronimo/server/trunk/configs/axis2/src/main/plan/plan.xml
    geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
    geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
    geronimo/server/trunk/configs/clustering/pom.xml
    geronimo/server/trunk/configs/clustering/src/main/plan/plan.xml
    geronimo/server/trunk/configs/connector-deployer/pom.xml
    geronimo/server/trunk/configs/connector-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/cxf-deployer/pom.xml
    geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/cxf/pom.xml
    geronimo/server/trunk/configs/cxf/src/main/plan/plan.xml
    geronimo/server/trunk/configs/dojo-jetty6/pom.xml
    geronimo/server/trunk/configs/dojo-tomcat/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java

Modified: geronimo/server/trunk/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-broker/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq-broker/pom.xml Sun Sep  9 01:14:57 2007
@@ -30,8 +30,10 @@
     </parent>
 
     <artifactId>activemq-broker</artifactId>
-    <name>Geronimo Configs :: ActiveMQ Broker</name>
+    <name>Geronimo Module :: ActiveMQ Broker</name>
     <packaging>car</packaging>
+
+    <description>Apache ActiveMQ integration into geronimo.  This module starts an activemq broker embedded in geronimo.</description>
     
     <dependencies>
         
@@ -71,5 +73,36 @@
         </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>JMS</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="ActiveMQ.tcp.default">
+                                    <attribute name="host">#{ServerHostname}</attribute>
+                                    <attribute name="port">#{ActiveMQPort + PortOffset}</attribute>
+                                </gbean>
+                                <gbean name="ActiveMQ.stomp.default">
+                                    <attribute name="host">#{ServerHostname}</attribute>
+                                    <attribute name="port">#{ActiveMQStompPort + PortOffset}</attribute>
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="ActiveMQPort">61616</config-substitution>
+                            <config-substitution key="ActiveMQStompPort">61613</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/activemq-broker/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-broker/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/activemq-broker/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/activemq-broker/src/main/plan/plan.xml Sun Sep  9 01:14:57 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,97 +13,56 @@
     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>activemq-broker</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq-management</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activeio-core</artifactId>
-        <version>3.0.0-incubator</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
-        <version>4.1.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <version>2.2</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="ActiveMQManager" class="org.apache.geronimo.activemq.management.ActiveMQManagerGBean"/>
-  <gbean name="ActiveMQ" class="org.apache.geronimo.activemq.BrokerServiceGBeanImpl">
-    <!--Instead of using the limited configuration syntax in this file,
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="ActiveMQManager" class="org.apache.geronimo.activemq.management.ActiveMQManagerGBean"/>
+
+    <gbean name="ActiveMQ" class="org.apache.geronimo.activemq.BrokerServiceGBeanImpl">
+        <!-- Instead of using the limited configuration syntax in this file,
              you can set the brokerUri property to externally specify the
              configuration for the broker.
-        <attribute name="brokerUri">xbean:file:/path/to/activemq.xml</attribute>-->
-    <!--<attribute name="brokerName">possibly-unique-broker</attribute>-->
-    <attribute name="useShutdownHook">false</attribute>
-    <attribute name="dataDirectory">var/activemq</attribute>
-    <reference name="dataSource">
-      <name>SystemDatasource</name>
-    </reference>
-    <reference name="manager">
-      <name>ActiveMQManager</name>
-    </reference>
-    <reference name="serverInfo">
-      <name>ServerInfo</name>
-    </reference>
-    <reference name="mbeanServerReference">
-      <name>MBeanServerReference</name>
-    </reference>
-  </gbean>
-  <gbean name="ActiveMQ.tcp.default" class="org.apache.geronimo.activemq.TransportConnectorGBeanImpl">
-    <attribute name="protocol">tcp</attribute>
-    <attribute name="host">localhost</attribute>
-    <attribute name="port">61616</attribute>
-    <reference name="brokerService">
-      <name>ActiveMQ</name>
-    </reference>
-  </gbean>
-  <gbean name="ActiveMQ.stomp.default" class="org.apache.geronimo.activemq.TransportConnectorGBeanImpl">
-    <attribute name="protocol">stomp</attribute>
-    <attribute name="host">localhost</attribute>
-    <attribute name="port">61613</attribute>
-    <reference name="brokerService">
-      <name>ActiveMQ</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+        <attribute name="brokerUri">xbean:file:/path/to/activemq.xml</attribute>
+        -->
+        <!--
+        <attribute name="brokerName">possibly-unique-broker</attribute>
+        -->
+        <attribute name="useShutdownHook">false</attribute>
+        <attribute name="dataDirectory">var/activemq</attribute>
+        <reference name="dataSource">
+            <name>SystemDatasource</name>
+        </reference>
+        <reference name="manager">
+            <name>ActiveMQManager</name>
+        </reference>
+        <reference name="serverInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="mbeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ActiveMQ.tcp.default" class="org.apache.geronimo.activemq.TransportConnectorGBeanImpl">
+        <attribute name="protocol">tcp</attribute>
+        <attribute name="host">localhost</attribute>
+        <attribute name="port">61616</attribute>
+        <reference name="brokerService">
+            <name>ActiveMQ</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ActiveMQ.stomp.default" class="org.apache.geronimo.activemq.TransportConnectorGBeanImpl">
+        <attribute name="protocol">stomp</attribute>
+        <attribute name="host">localhost</attribute>
+        <attribute name="port">61613</attribute>
+        <reference name="brokerService">
+            <name>ActiveMQ</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-ra/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq-ra/pom.xml Sun Sep  9 01:14:57 2007
@@ -32,6 +32,8 @@
     <artifactId>activemq-ra</artifactId>
     <name>Geronimo Configs :: ActiveMQ Resource Adapter</name>
     <packaging>car</packaging>
+
+    <description>Geronimo ActiveMQ integration: ActiveMQ resource adapter connecting to (embedded) activemq broker.</description>
     
     <dependencies>
         
@@ -78,6 +80,21 @@
                         <version>${version}</version>
                         <type>rar</type>
                     </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>JMS</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="ActiveMQ RA">
+                                        <attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>
+                                </gbean>
+                             </config-xml-content>
+                            <config-substitution key="ActiveMQPort">61616</config-substitution>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/activemq-ra/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-ra/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/activemq-ra/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/activemq-ra/src/main/plan/plan.xml Sun Sep  9 01:14:57 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,71 +13,59 @@
     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">
-  <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>activemq-ra</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>activemq-broker</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  <resourceadapter>
-    <resourceadapter-instance>
-      <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
-      <config-property-setting name="ServerUrl">tcp://0.0.0.0:61616</config-property-setting>
-      <config-property-setting name="UserName">geronimo</config-property-setting>
-      <config-property-setting name="Password">geronimo</config-property-setting>
-      <workmanager>
-        <gbean-link>DefaultWorkManager</gbean-link>
-      </workmanager>
-    </resourceadapter-instance>
-    <outbound-resourceadapter>
-      <connection-definition>
-        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-        <connectiondefinition-instance>
-          <name>DefaultActiveMQConnectionFactory</name>
-          <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-          <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-          <connectionmanager>
-            <xa-transaction>
-              <transaction-caching/>
-            </xa-transaction>
-            <single-pool>
-              <max-size>10</max-size>
-              <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-              <match-one/>
-            </single-pool>
-          </connectionmanager>
-        </connectiondefinition-instance>
-      </connection-definition>
-    </outbound-resourceadapter>
-  </resourceadapter>
-  <adminobject>
-    <adminobject-interface>javax.jms.Queue</adminobject-interface>
-    <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-    <adminobject-instance>
-      <message-destination-name>MDBTransferBeanOutQueue</message-destination-name>
-      <config-property-setting name="PhysicalName">MDBTransferBeanOutQueue</config-property-setting>
-    </adminobject-instance>
-  </adminobject>
-  <adminobject>
-    <adminobject-interface>javax.jms.Queue</adminobject-interface>
-    <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-    <adminobject-instance>
-      <message-destination-name>SendReceiveQueue</message-destination-name>
-      <config-property-setting name="PhysicalName">SendReceiveQueue</config-property-setting>
-    </adminobject-instance>
-  </adminobject>
-</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>
+        <resourceadapter-instance>
+            <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
+            <config-property-setting name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort}</config-property-setting>
+            <config-property-setting name="UserName">geronimo</config-property-setting>
+            <config-property-setting name="Password">geronimo</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>DefaultActiveMQConnectionFactory</name>
+                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>MDBTransferBeanOutQueue</message-destination-name>
+            <config-property-setting name="PhysicalName">MDBTransferBeanOutQueue</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>SendReceiveQueue</message-destination-name>
+            <config-property-setting name="PhysicalName">SendReceiveQueue</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+
+</connector>

Modified: geronimo/server/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/pom.xml Sun Sep  9 01:14:57 2007
@@ -21,7 +21,7 @@
 <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>
@@ -32,7 +32,9 @@
     <artifactId>axis-deployer</artifactId>
     <name>Geronimo Configs :: Axis Deployer</name>
     <packaging>car</packaging>
-    
+
+    <description>Web Services Deployer for Geronimo Axis 1 integration</description>
+
     <dependencies>
         <!-- parent -->
         <dependency>
@@ -70,5 +72,73 @@
         </dependency>
 
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>axis</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-webservices-builder</artifactId>
+                            <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-axis-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>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="AxisServiceRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                </gbean>
+                                <gbean name="AxisModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                    <attribute name="defaultEnvironment">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>#{webcontainerName}</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/axis-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/src/main/plan/plan.xml Sun Sep  9 01:14:57 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,103 +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.-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>axis-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>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>axis</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </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-axis-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="AxisModuleBuilderExtension" class="org.apache.geronimo.axis.builder.AxisModuleBuilderExtension">
-    <!--This attribute and the environment must be updated appropriately in the config.xml file-->
-    <attribute name="listener">?name=WebContainer</attribute>
-    <reference name="WebServiceBuilder">
-      <name>WebServiceBuilder</name>
-    </reference>
-  </gbean>
-  <gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
-    <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>axis</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-    <reference name="AxisBuilder">
-      <name>WebServiceBuilder</name>
-    </reference>
-  </gbean>
-  <gbean name="AxisClientServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
-    <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>axis</artifactId>
-            <type>car</type>
-            <!--<import>classes</import>-->
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-    <reference name="AxisBuilder">
-      <name>WebServiceBuilder</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+    limitations under the License.
+-->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="AxisModuleBuilderExtension" class="org.apache.geronimo.axis.builder.AxisModuleBuilderExtension">
+        <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
+        <attribute name="listener">?name=WebContainer</attribute>
+
+        <reference name="WebServiceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
+        <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>axis</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="AxisBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="AxisClientServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
+        <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>axis</artifactId>
+                        <type>car</type>
+                        <!--<import>classes</import>-->
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="AxisBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis/pom.xml (original)
+++ geronimo/server/trunk/configs/axis/pom.xml Sun Sep  9 01:14:57 2007
@@ -32,6 +32,8 @@
     <artifactId>axis</artifactId>
     <name>Geronimo Configs :: Axis</name>
     <packaging>car</packaging>
+
+    <description>Apache Axis 1 integration.</description>
     
     <dependencies>
         <!-- parent -->
@@ -70,5 +72,50 @@
         </dependency>
 
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>server-security-config</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>webservices-common</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-axis</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.ws.scout</groupId>
+                        <artifactId>scout</artifactId>
+                        <version>1.0rc1</version>
+                        <type>jar</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>openejb</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                    </dependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/axis/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis/src/main/plan/plan.xml Sun Sep  9 01:14:57 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,51 +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">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>axis</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-axis</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ws.scout</groupId>
-        <artifactId>scout</artifactId>
-        <version>1.0rc1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
-  <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
-</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="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
+
+    <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
+
+</module>

Modified: geronimo/server/trunk/configs/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/pom.xml Sun Sep  9 01:14:57 2007
@@ -32,6 +32,8 @@
     <artifactId>axis2-deployer</artifactId>
     <name>Geronimo Configs :: Axis2 Deployer</name>
     <packaging>car</packaging>
+
+    <description>Geronimo web services deployer for Axis 2</description>
     
     <dependencies>
         <dependency>
@@ -56,4 +58,59 @@
        </dependency>
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>jaxws-deployer</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis2</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-axis2-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="Axis2ModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                    <attribute name="defaultEnvironment">
+                                      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                        <dependencies>
+                                            <dependency>
+                                                <groupId>org.apache.geronimo.configs</groupId>
+                                                <artifactId>#{webcontainerName}</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/axis2-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml Sun Sep  9 01:14:57 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,191 +13,171 @@
   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>axis2-deployer</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-deployer</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>axis2</artifactId>
-        <type>car</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-axis2-builder</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="Axis2Builder" class="org.apache.geronimo.axis2.builder.Axis2Builder">
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-  </gbean>
-  <gbean name="Axis2ServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2</artifactId>
-            <type>car</type>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-    <reference name="Axis2Builder">
-      <name>Axis2Builder</name>
-    </reference>
-  </gbean>
-  <gbean name="Axis2ClientServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">
-    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
-    <xml-attribute name="defaultEnvironment">
-      <environment>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-axis2</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jaxws</artifactId>
-            <version>2.1-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-java2wsdl</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-adb</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-metadata</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-saaj</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-dom</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>annogen</groupId>
-            <artifactId>annogen</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-            <type>jar</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-security</artifactId>
-            <type>car</type>
-          </dependency>
-          <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-          </dependency>
-        </dependencies>
-      </environment>
-    </xml-attribute>
-    <reference name="Axis2Builder">
-      <name>Axis2Builder</name>
-    </reference>
-  </gbean>
-  <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
-    <!--This attribute and the environment must be updated appropriately in the config.xml file-->
-    <attribute name="listener">?name=WebContainer</attribute>
-    <reference name="WebServiceBuilder">
-      <name>Axis2Builder</name>
-    </reference>
-    <reference name="WebServiceLinkTemplate">
-      <name>Axis2WebServiceEJBLinkTemplate</name>
-    </reference>
-  </gbean>
-  <gbean name="Axis2WebServiceEJBLinkTemplate" class="org.apache.geronimo.axis2.ejb.EJBWebServiceGBean"/>
-</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="Axis2Builder" class="org.apache.geronimo.axis2.builder.Axis2Builder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis2</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="Axis2ServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">
+        <attribute name="eeNamespaces">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>axis2</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="Axis2Builder">
+            <name>Axis2Builder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Axis2ClientServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">
+        <attribute name="eeNamespaces">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.modules</groupId>
+                        <artifactId>geronimo-axis2</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-jaxws</artifactId>
+                        <version>${version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-j2ee-schema</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-java2wsdl</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-kernel</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-adb</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-jaxws</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-metadata</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-saaj</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.ws.commons.axiom</groupId>
+                        <artifactId>axiom-api</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.ws.commons.axiom</groupId>
+                        <artifactId>axiom-dom</artifactId>
+                    </dependency>
+                    <dependency>
+                         <groupId>org.apache.httpcomponents</groupId>
+                         <artifactId>httpcore</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.ws.commons.axiom</groupId>
+                        <artifactId>axiom-impl</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.ws.commons.schema</groupId>
+                        <artifactId>XmlSchema</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>commons-httpclient</groupId>
+                        <artifactId>commons-httpclient</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.xmlbeans</groupId>
+                        <artifactId>xmlbeans</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>jaxen</groupId>
+                        <artifactId>jaxen</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>annogen</groupId>
+                        <artifactId>annogen</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>wsdl4j</groupId>
+                        <artifactId>wsdl4j</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>xml-resolver</groupId>
+                        <artifactId>xml-resolver</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.neethi</groupId>
+                        <artifactId>neethi</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>client-security</artifactId>
+                        <type>car</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>backport-util-concurrent</groupId>
+                        <artifactId>backport-util-concurrent</artifactId>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="Axis2Builder">
+            <name>Axis2Builder</name>
+        </reference>
+    </gbean>
+
+   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+        <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
+        <attribute name="listener">?name=WebContainer</attribute>
+
+        <reference name="WebServiceBuilder">
+            <name>Axis2Builder</name>
+        </reference>
+        <reference name="WebServiceLinkTemplate">
+            <name>Axis2WebServiceEJBLinkTemplate</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Axis2WebServiceEJBLinkTemplate" class="org.apache.geronimo.axis2.ejb.EJBWebServiceGBean"/>
+
+</module>

Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Sun Sep  9 01:14:57 2007
@@ -33,6 +33,8 @@
     <name>Geronimo Configs :: Axis2</name>
     <packaging>car</packaging>
 
+    <description>Geronimo Axis 2 integration</description>
+
     <dependencies>
 
         <dependency>
@@ -180,4 +182,19 @@
        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/server/trunk/configs/axis2/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2/src/main/plan/plan.xml Sun Sep  9 01:14:57 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,226 +13,11 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.-->
-<!--$Rev$ $Date$-->
+  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>axis2</dep:artifactId>
-      <dep:version>2.1-SNAPSHOT</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.ws.commons.axiom</dep:groupId>
-        <dep:artifactId>axiom-dom</dep:artifactId>
-        <dep:version>1.2.5</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>com.sun.xml.bind</dep:groupId>
-        <dep:artifactId>jaxb-xjc</dep:artifactId>
-        <dep:version>2.0.5</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>commons-codec</dep:groupId>
-        <dep:artifactId>commons-codec</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.ws.commons.schema</dep:groupId>
-        <dep:artifactId>XmlSchema</dep:artifactId>
-        <dep:version>1.3.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>webservices-common</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-metadata</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-jaxws</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-adb</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>commons-logging</dep:groupId>
-        <dep:artifactId>commons-logging</dep:artifactId>
-        <dep:version>1.0.4</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-java2wsdl</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>commons-httpclient</dep:groupId>
-        <dep:artifactId>commons-httpclient</dep:artifactId>
-        <dep:version>3.0.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>server-security-config</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-j2ee-schema</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>com.sun.xml.ws</dep:groupId>
-        <dep:artifactId>jaxws-tools</dep:artifactId>
-        <dep:version>2.0</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-saaj</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>xml-resolver</dep:groupId>
-        <dep:artifactId>xml-resolver</dep:artifactId>
-        <dep:version>1.1</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-server</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-jaxws-api</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.httpcomponents</dep:groupId>
-        <dep:artifactId>httpcore</dep:artifactId>
-        <dep:version>4.0-alpha5</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>jaxen</dep:groupId>
-        <dep:artifactId>jaxen</dep:artifactId>
-        <dep:version>1.1-beta-10</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>backport-util-concurrent</dep:groupId>
-        <dep:artifactId>backport-util-concurrent</dep:artifactId>
-        <dep:version>2.2</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>com.sun.xml.ws</dep:groupId>
-        <dep:artifactId>jaxws-rt</dep:artifactId>
-        <dep:version>2.0</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.neethi</dep:groupId>
-        <dep:artifactId>neethi</dep:artifactId>
-        <dep:version>2.0</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.ws.commons.axiom</dep:groupId>
-        <dep:artifactId>axiom-impl</dep:artifactId>
-        <dep:version>1.2.5</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>transaction</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-axis2</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.xmlbeans</dep:groupId>
-        <dep:artifactId>xmlbeans</dep:artifactId>
-        <dep:version>2.3.0</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>annogen</dep:groupId>
-        <dep:artifactId>annogen</dep:artifactId>
-        <dep:version>0.1.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>openejb</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.ws.commons.axiom</dep:groupId>
-        <dep:artifactId>axiom-api</dep:artifactId>
-        <dep:version>1.2.5</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.axis2</dep:groupId>
-        <dep:artifactId>axis2-kernel</dep:artifactId>
-        <dep:version>1.3</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-</module>
\ No newline at end of file
+
+</module>

Modified: geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-jetty/pom.xml Sun Sep  9 01:14:57 2007
@@ -96,13 +96,10 @@
                         <type>war</type>
                     </module>
                     <category>Security</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jasper</artifactId>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml Sun Sep  9 01:14:57 2007
@@ -96,13 +96,10 @@
                         <type>war</type>
                     </module>
                     <category>Security</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jasper</artifactId>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/server/trunk/configs/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/clustering/pom.xml (original)
+++ geronimo/server/trunk/configs/clustering/pom.xml Sun Sep  9 01:14:57 2007
@@ -32,20 +32,19 @@
     <artifactId>clustering</artifactId>
     <name>Geronimo Configs :: Clustering</name>
     <packaging>car</packaging>
-    
-    <properties>
-        <PlanNodeName>NODE</PlanNodeName>
-    </properties>
 
+    <description>
+        Basic clustering support in use with WADI
+    </description>
     <dependencies>
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
@@ -58,5 +57,31 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Clustering</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="Node">
+                                    <attribute name="nodeName">#{clusterNodeName}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="clusterNodeName">NODE</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/server/trunk/configs/clustering/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/clustering/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/clustering/src/main/plan/plan.xml Sun Sep  9 01:14:57 2007
@@ -1,53 +1,30 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.-->
-<!--$Rev$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>clustering</artifactId>
-      <version>2.1-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-security</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-clustering</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="Node" class="org.apache.geronimo.clustering.BasicLocalNode">
-    <attribute name="nodeName">NODE</attribute>
-    <reference name="JMXConnector">
-      <name>JMXService</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="Node" class="org.apache.geronimo.clustering.BasicLocalNode">
+        <attribute name="nodeName">${PlanNodeName}</attribute>
+        <reference name="JMXConnector">
+            <name>JMXService</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/configs/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/pom.xml Sun Sep  9 01:14:57 2007
@@ -32,6 +32,10 @@
     <artifactId>connector-deployer</artifactId>
     <name>Geronimo Configs :: Connector Deployer</name>
     <packaging>car</packaging>
+
+    <description>
+        Deployer for J2CA connectors
+    </description>
     
     <dependencies>
     
@@ -58,4 +62,77 @@
 
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Connector</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-connector-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>transaction</artifactId>
+                        <type>car</type>
+                        <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="ResourceRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                    <attribute name="defaultEnvironment">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>j2ee-corba-yoko</artifactId>
+                                                    <type>car</type>
+                                                </dependency>
+                                            </dependencies>
+                                        </environment>
+                                    </attribute>
+                                </gbean>
+
+                                <gbean name="AdminObjectRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                </gbean>
+
+                                <gbean name="ClientResourceRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                    <attribute name="defaultEnvironment">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>client-corba-yoko</artifactId>
+                                                    <type>car</type>
+                                                </dependency>
+                                            </dependencies>
+                                        </environment>
+                                    </attribute>
+                                </gbean>
+                            </config-xml-content>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>



Mime
View raw message