geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422158 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies: ./ geronimo-jetty-j2ee/src/main/var/config/ geronimo-jetty-minimal/src/main/var/config/ geronimo-tomcat-j2ee/src/main/var/config/ geronimo-tomcat-minimal/src/main/var/config/
Date Sat, 15 Jul 2006 07:17:46 GMT
Author: jdillon
Date: Sat Jul 15 00:17:45 2006
New Revision: 422158

URL: http://svn.apache.org/viewvc?rev=422158&view=rev
Log:
Remove the need for ${geronimoGroupId} 

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=422158&r1=422157&r2=422158&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
Sat Jul 15 00:17:45 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    <module name="${geronimoGroupId}/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -20,9 +20,9 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/j2ee-server/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
     </module>
-    <module name="${geronimoGroupId}/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -34,14 +34,14 @@
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/axis/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/j2ee-corba/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -53,20 +53,20 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
-    <!--<module name="${geronimoGroupId}/activemq-broker/${pom.version}/car">-->
+    <!--<module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">-->
         <!--<gbean name="ActiveMQ.tcp.default">-->
             <!--<attribute name="host">${PlanServerHostname}</attribute>-->
             <!--<attribute name="port">${PlanActiveMQPort}</attribute>-->
         <!--</gbean>-->
     <!--</module>-->
-    <!--<module name="${geronimoGroupId}/activemq/${pom.version}/car"/>-->
-    <module name="${geronimoGroupId}/jetty/${pom.version}/car">
+    <!--<module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>-->
+    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -83,39 +83,39 @@
     </module>
     <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so
that defaultEnvironment
     overrides work properly -->
-    <module name="${geronimoGroupId}/geronimo-gbean-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/client-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/axis-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/javamail/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
 
-    <!--<module name="${geronimoGroupId}/sharedlib/${pom.version}/car">-->
+    <!--<module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">-->
         <!--<gbean name="SharedLib">-->
             <!--<attribute name="classesDirs">var/shared/classes</attribute>-->
             <!--<attribute name="libDirs">var/shared/lib</attribute>-->
         <!--</gbean>-->
     <!--</module>-->
 
-    <module name="${geronimoGroupId}/jetty-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
     
-    <module name="${geronimoGroupId}/welcome-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
     
-    <!--<module name="${geronimoGroupId}/webconsole-jetty/${pom.version}/car"/>-->
-    <!--<module name="${geronimoGroupId}/uddi-jetty/${pom.version}/car" load="false"/>-->
-    <!--<module name="${geronimoGroupId}/remote-deploy-jetty/${pom.version}/car" />-->
-    <!--<module name="${geronimoGroupId}/hot-deployer/${pom.version}/car" />-->
+    <!--<module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>-->
+    <!--<module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>-->
+    <!--<module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"
/>-->
+    <!--<module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"
/>-->
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?rev=422158&r1=422157&r2=422158&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
Sat Jul 15 00:17:45 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
     
-    <module name="${geronimoGroupId}/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,9 +22,9 @@
         </gbean>
     </module>
     
-    <module name="${geronimoGroupId}/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
     
-    <module name="${geronimoGroupId}/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -37,7 +37,7 @@
         </gbean>
     </module>
 
-    <module name="${geronimoGroupId}/jetty/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -53,31 +53,31 @@
         </gbean>
     </module>
     
-    <module name="${geronimoGroupId}/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
     
-    <module name="${geronimoGroupId}/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
         </gbean>
     </module>
 
-    <module name="${geronimoGroupId}/jetty-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
 
-    <module name="${geronimoGroupId}/unavailable-ejb-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car"/>
 
-    <module name="${geronimoGroupId}/unavailable-webservices-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car"/>
     
-    <module name="${geronimoGroupId}/unavailable-client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
 
-    <module name="${geronimoGroupId}/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <!--<module name="${geronimoGroupId}/remote-deploy-jetty/${pom.version}/car" />-->
+    <!--<module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"
/>-->
     
-    <!--<module name="${geronimoGroupId}/hot-deployer/${pom.version}/car"/>-->
+    <!--<module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>-->
     
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?rev=422158&r1=422157&r2=422158&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
Sat Jul 15 00:17:45 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    <module name="${geronimoGroupId}/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -20,9 +20,9 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/j2ee-server/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
     </module>
-    <module name="${geronimoGroupId}/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -34,14 +34,14 @@
           <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/axis/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/j2ee-corba/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -53,20 +53,20 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
-    <!-- module name="${geronimoGroupId}/activemq-broker/${pom.version}/car">
+    <!-- module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module  -->
-    <!-- module name="${geronimoGroupId}/activemq/${pom.version}/car"/  -->
-    <module name="${geronimoGroupId}/tomcat/${pom.version}/car">
+    <!-- module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/  -->
+    <module name="org.apache.geronimo.configs/tomcat/${pom.version}/car">
         <gbean name="TomcatEngine">
             <reference name="TomcatValveChain" />
         </gbean>
@@ -92,37 +92,37 @@
     </module>
     <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so
that defaultEnvironment
     overrides work properly -->
-    <module name="${geronimoGroupId}/geronimo-gbean-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=TomcatWebContainer</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/client-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/axis-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/javamail/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
 
-    <!-- module name="${geronimoGroupId}/sharedlib/${pom.version}/car">
+    <!-- module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module  -->
 
-    <module name="${geronimoGroupId}/tomcat-deployer/${pom.version}/car"/>
-    <!-- module name="${geronimoGroupId}/welcome-tomcat/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/webconsole-tomcat/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/uddi-tomcat/${pom.version}/car" load="false"/>
-    <module name="${geronimoGroupId}/remote-deploy-tomcat/${pom.version}/car" />
-    <module name="${geronimoGroupId}/hot-deployer/${pom.version}/car" /  -->
+    <module name="org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car"/>
+    <!-- module name="org.apache.geronimo.configs/welcome-tomcat/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-tomcat/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/uddi-tomcat/${pom.version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car"
/>
+    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car" /  -->
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?rev=422158&r1=422157&r2=422158&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
Sat Jul 15 00:17:45 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    <module name="${geronimoGroupId}/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -20,8 +20,8 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/j2ee-server/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -34,7 +34,7 @@
         </gbean>
     </module>
 
-    <module name="${geronimoGroupId}/tomcat/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/tomcat/${pom.version}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -51,27 +51,27 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </module>
-    <module name="${geronimoGroupId}/geronimo-gbean-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
     </module>
 
-    <module name="${geronimoGroupId}/tomcat-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car"/>
 
-    <module name="${geronimoGroupId}/unavailable-ejb-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car"/>
 
-    <module name="${geronimoGroupId}/unavailable-webservices-deployer/${pom.version}/car"/>
-    <module name="${geronimoGroupId}/unavailable-client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
 
-    <module name="${geronimoGroupId}/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <!--<module name="${geronimoGroupId}/remote-deploy-tomcat/${pom.version}/car"/>-->
-    <!--<module name="${geronimoGroupId}/hot-deployer/${pom.version}/car"/>-->
+    <!--<module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car"/>-->
+    <!--<module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>-->
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml?rev=422158&r1=422157&r2=422158&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml Sat Jul 15 00:17:45 2006
@@ -50,14 +50,6 @@
     <properties>
         <!--
         
-        TODO: Remove the need for this... if this changes... search/replace works just as
good
-              and IMO it would be better to have this clearly in the config file.
-        
-        -->
-        <geronimoGroupId>org.apache.geronimo.configs</geronimoGroupId>
-        
-        <!--
-        
         TODO: Move this where it can be shared with the configs/pom.xml values
         
         -->



Mime
View raw message