geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r468720 - in /geronimo/sandbox/javaee5: assemblies-jee5/geronimo-boilerplate-jee5/ assemblies-jee5/geronimo-jetty5-jee5/ assemblies-jee5/geronimo-jetty5-jee5/src/main/assembly/ assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/ assem...
Date Sat, 28 Oct 2006 18:41:04 GMT
Author: djencks
Date: Sat Oct 28 11:41:04 2006
New Revision: 468720

URL: http://svn.apache.org/viewvc?view=rev&rev=468720
Log:
keep up with trunk build changes

Modified:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/assembly/bin.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml
    geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml Sat Oct 28 11:41:04 2006
@@ -33,7 +33,7 @@
 
     <artifactId>geronimo-boilerplate-jee5</artifactId>
     <name>Geronimo Assemblies :: Boilerplate JEE5</name>
-    <packaging>jar</packaging>
+    <packaging>resource-bundle</packaging>
     
     <description>
         Provides boilerplate files for all Geronimo J2EE server assemblies.

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml Sat Oct 28 11:41:04 2006
@@ -30,11 +30,7 @@
 
     <artifactId>geronimo-jetty5-jee5</artifactId>
     <name>Geronimo Assemblies :: JEE5 + Jetty5</name>
-    <!--
-    HACK: See build/resources below...
-    <packaging>pom</packaging>
-    -->
-    <packaging>jar</packaging>
+    <packaging>application-assembly</packaging>
     
     <description>
         An assembly of Geronimo into a J2EE Server using Jetty as the web container.
@@ -45,189 +41,189 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-jta11</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>directory</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-realm</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
@@ -235,42 +231,42 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webconsole-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>uddi-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
@@ -310,7 +306,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-jee5</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -328,7 +324,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-jetty-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
@@ -379,7 +375,7 @@
                     <execution>
                         <phase>package</phase>
                         <goals>
-                            <goal>installConfig</goal>
+                            <goal>install-modules</goal>
                         </goals>
                     </execution>
                 </executions>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/assembly/bin.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/assembly/bin.xml Sat Oct 28 11:41:04 2006
@@ -94,7 +94,7 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/archive-tmp/repository</directory>
+            <directory>target/repository</directory>
             <outputDirectory>repository</outputDirectory>
         </fileSet>
         

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml Sat Oct 28 11:41:04 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
 
-    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,11 +22,11 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction-jta11/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -39,16 +39,16 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/cxf/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/cxf/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -61,23 +61,23 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty/${version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -97,50 +97,50 @@
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer 
           so that defaultEnvironment overrides work properly
     -->
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/cxf-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/javamail/${version}/car">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/welcome-jetty/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-jetty/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/uddi-jetty/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
     
 </attributes>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml Sat Oct 28 11:41:04 2006
@@ -30,11 +30,7 @@
 
     <artifactId>geronimo-jetty6-jee5</artifactId>
     <name>Geronimo Assemblies :: JEE5 + Jetty6</name>
-    <!--
-    HACK: See build/resources below...
-    <packaging>pom</packaging>
-    -->
-    <packaging>jar</packaging>
+    <packaging>application-assembly</packaging>
     
     <description>
         An assembly of Geronimo into a J2EE Server using Jetty as the web container.
@@ -45,210 +41,229 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-jta11</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>j2ee-corba-yoko</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-clustering-wadi</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-clustering-builder-wadi</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>directory</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-realm</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>client-corba-yoko</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-corba-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>persistence-jpa10-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 <!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
@@ -256,63 +271,63 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webconsole-jetty6</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 <!--        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>uddi-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-builder-wadi</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-wadi</artifactId> 
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -352,7 +367,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-jee5</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -370,7 +385,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-jetty-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
@@ -421,7 +436,7 @@
                     <execution>
                         <phase>package</phase>
                         <goals>
-                            <goal>installConfig</goal>
+                            <goal>install-modules</goal>
                         </goals>
                     </execution>
                 </executions>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml Sat Oct 28 11:41:04 2006
@@ -94,7 +94,7 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/archive-tmp/repository</directory>
+            <directory>target/repository</directory>
             <outputDirectory>repository</outputDirectory>
         </fileSet>
         

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml Sat Oct 28 11:41:04 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
 
-    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,11 +22,11 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction-jta11/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -39,46 +39,47 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/cxf/${pom.version}/car"/>
-    
-    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/axis/${version}/car"/>
+    <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
+
+    <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="port">${PlanCOSNamingPort}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="port">${PlanCOSSunNamingPort}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/jetty6/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty6/${version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -99,9 +100,9 @@
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer 
           so that defaultEnvironment overrides work properly
     -->
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
@@ -110,7 +111,7 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car">
         <gbean name="ResourceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>
@@ -121,9 +122,9 @@
 
     </module>
 
-    <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
             <reference name="ServiceBuilders">
@@ -138,6 +139,9 @@
                 <pattern>
                     <name>CXFBuilder</name>
                 </pattern>
+                <pattern>
+                    <name>WebServiceBuilder</name>
+                </pattern>
             </reference>
         </gbean>
         <gbean name="OpenEjbRemoteRefBuilder">
@@ -154,40 +158,45 @@
 
     </module>
     
-    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/client-deployer/${version}/car">
     </module>
 
-    <module name="org.apache.geronimo.configs/cxf-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" load="false">
         <!--<gbean name="CXFServiceRefBuilder">-->
             <!--<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>-->
         <!--</gbean>-->
     </module>
-    
-    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car">
+        <gbean name="AxisServiceRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+    </module>
+
+    <module name="org.apache.geronimo.configs/javamail/${version}/car">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
 <!--    
-    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/welcome-jetty/${version}/car"/>
 -->
-    <module name="org.apache.geronimo.configs/dojo-jetty6/${pom.version}/car"/>
-    <module name="org.apache.geronimo.configs/webconsole-jetty6/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/dojo-jetty6/${version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-jetty6/${version}/car"/>
 <!--    
-    <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/uddi-jetty/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${version}/car"/>
 -->    
-    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
     
 </attributes>

Modified: geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml Sat Oct 28 11:41:04 2006
@@ -50,6 +50,9 @@
                 <name>CXFBuilder</name>
             </pattern>
             <pattern>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
                 <name>UnavailableWebServiceBuilder</name>
             </pattern>
         </references>

Modified: geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml?view=diff&rev=468720&r1=468719&r2=468720
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml Sat Oct 28 11:41:04 2006
@@ -56,11 +56,6 @@
           <artifactId>geronimo-jpa_3.0_spec</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
-        <!--<dependency>-->
-          <!--<groupId>org.apache.geronimo.specs</groupId>-->
-          <!--<artifactId>geronimo-activation_1.0.2_spec</artifactId>-->
-          <!--<version>1.0</version>-->
-        <!--</dependency>-->
         <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -72,11 +67,6 @@
           <artifactId>openjpa-persistence-jdbc</artifactId>
           <version>0.9.0-incubating-SNAPSHOT</version>
         </dependency>
-        <!--<dependency>-->
-          <!--<groupId>org.apache.derby</groupId>-->
-          <!--<artifactId>derby</artifactId>-->
-          <!--<version>10.1.3.1</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.1_spec</artifactId>



Mime
View raw message