geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422581 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee: pom.xml src/main/var/config/config.xml
Date Mon, 17 Jul 2006 00:36:57 GMT
Author: jdillon
Date: Sun Jul 16 17:36:56 2006
New Revision: 422581

URL: http://svn.apache.org/viewvc?rev=422581&view=rev
Log:
Fix up evil xml commenting style
Enable SharedLib
Added comment about pom packaging and why we have to use jar right now

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

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=422581&r1=422580&r2=422581&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Sun Jul
16 17:36:56 2006
@@ -30,6 +30,13 @@
 
     <artifactId>geronimo-jetty-j2ee</artifactId>
     <name>Geronimo Assemblies :: J2EE + Jetty</name>
+    <!--
+    
+    HACK:  See build/resources below...
+    
+    <packaging>pom</packaging>
+    -->
+    <packaging>jar</packaging>
     
     <description>
         An assembly of Geronimo into a J2EE Server using Jetty as the web container.
@@ -114,7 +121,8 @@
             <type>car</type>
         </dependency>
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
             <version>${pom.version}</version>
@@ -126,7 +134,8 @@
             <artifactId>activemq</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -212,12 +221,14 @@
             <type>car</type>
         </dependency>
         
-        <!-- dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-demo-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency  -->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -226,7 +237,8 @@
             <type>car</type>
         </dependency>
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>servlets-examples-jetty</artifactId>
             <version>${pom.version}</version>
@@ -238,30 +250,38 @@
             <artifactId>jsp-examples-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webconsole-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jmxdebug-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
-        <!--dependency>
+        <!--
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>uddi-jetty</artifactId>
             <version>${pom.version}</version>
@@ -280,7 +300,8 @@
             <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -291,17 +312,16 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
+            <artifactId>sharedlib</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
-        <!-- unpack -->
-        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-scripts</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
             <version>${pom.version}</version>
+            <type>car</type>
         </dependency>
         
         <!-- lib dependencies -->
@@ -581,6 +601,13 @@
     
     <build>
         <resources>
+            <!--
+            
+            HACK: Because this is a pom packaging and assembly files/file is broke
+                  we need to filter with the resources plugin... and must be a jar packaging
+                  because for some %^&#ing reason maven-resources-plugin can not
+                  be attached!!!!
+            -->
             <resource>
                 <directory>${pom.basedir}/src/main/var/config</directory>
                 <includes>

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=422581&r1=422580&r2=422581&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
Sun Jul 16 17:36:56 2006
@@ -7,6 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+
     <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
@@ -20,8 +21,10 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
+    
     <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
     </module>
+    
     <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -34,13 +37,16 @@
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
+    
     <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="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
@@ -53,19 +59,25 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </module>
+    
     <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="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="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="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>
@@ -81,41 +93,54 @@
             <attribute name="port">8009</attribute>
         </gbean>
     </module>
-    <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so
that defaultEnvironment
-    overrides work properly -->
+    
+    <!--
+    
+    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/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="org.apache.geronimo.configs/openejb-deployer/${pom.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/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="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="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="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/welcome-jetty/${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>



Mime
View raw message