geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r264671 - in /geronimo/trunk: applications/console-ear/ applications/console-ear/src/application/META-INF/ applications/console-ear/src/plan/ assemblies/j2ee-server/ assemblies/j2ee-server/src/var/config/ configs/j2ee-deployer/src/plan/ con...
Date Tue, 30 Aug 2005 02:18:07 GMT
Author: jboynes
Date: Mon Aug 29 19:17:54 2005
New Revision: 264671

URL: http://svn.apache.org/viewcvs?rev=264671&view=rev
Log:
try and fix problem with no application.xml in console ear; add console into the offline assembly
process

Added:
    geronimo/trunk/applications/console-ear/src/plan/plan.xml
      - copied, changed from r264088, geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
Modified:
    geronimo/trunk/applications/console-ear/maven.xml
    geronimo/trunk/applications/console-ear/project.properties
    geronimo/trunk/applications/console-ear/project.xml
    geronimo/trunk/applications/console-ear/src/application/META-INF/   (props changed)
    geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/j2ee-server/src/plan/plan.xml

Modified: geronimo/trunk/applications/console-ear/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/maven.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/maven.xml (original)
+++ geronimo/trunk/applications/console-ear/maven.xml Mon Aug 29 19:17:54 2005
@@ -8,9 +8,18 @@
         <attainGoal name="ear:install"/>
     </goal>
 
+    <!-- todo when the EAR plugin can generate a 1.4 DD remove this -->
+    <goal name="ear:generate-ear-descriptor">
+        <ant:echo>Generating ${maven.ear.descriptordir}/application.xml</ant:echo>
+        <velocity:merge basedir="${maven.ear.src}/META-INF" template="application.xml"
name="${maven.ear.descriptordir}/application.xml"/>
+    </goal>
+
     <preGoal name="ear:ear">
-        <ant:mkdir dir="${basedir}/target/plan"/>        
-        <velocity:merge basedir="${basedir}/src/application/META-INF" template="application.xml"
name="${basedir}/target/plan/application.xml"/>
-        <velocity:merge basedir="${basedir}/src/plan" template="geronimo-application.xml"
name="${basedir}/src/application/META-INF/geronimo-application.xml"/>        
+        <ant:mkdir dir="${maven.ear.resources}/META-INF"/>
+        <velocity:merge basedir="${maven.src.dir}/plan" template="geronimo-application.xml"
name="${maven.ear.resources}/META-INF/geronimo-application.xml"/>
     </preGoal>
+
+    <postGoal name="ear:install">
+        <attainGoal name="car:install"/>
+    </postGoal>
 </project>

Modified: geronimo/trunk/applications/console-ear/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/project.properties?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/project.properties (original)
+++ geronimo/trunk/applications/console-ear/project.properties Mon Aug 29 19:17:54 2005
@@ -1,2 +1,6 @@
 maven.multiproject.type=ear
-maven.ear.appxml=target/plan/application.xml
\ No newline at end of file
+
+maven.ear.appxml.generate=true
+maven.ear.appxml.version=1.4
+
+geronimo.packaging.moduleFile=${maven.build.dir}/${maven.ear.final.name}

Modified: geronimo/trunk/applications/console-ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/project.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/project.xml (original)
+++ geronimo/trunk/applications/console-ear/project.xml Mon Aug 29 19:17:54 2005
@@ -15,6 +15,7 @@
             <type>war</type>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.appxml.war.context-root>/console</ear.appxml.war.context-root>
             </properties>
         </dependency>
         <dependency>
@@ -24,39 +25,73 @@
             <type>war</type>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.appxml.war.context-root>/console-standard</ear.appxml.war.context-root>
             </properties>
         </dependency>
 
         <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>${portlet_api_version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
             <version>${pluto_version}</version>
         </dependency>
-
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-console-core</artifactId>
-            <version>${pom.currentVersion}</version>
+            <version>${geronimo_version}</version>
         </dependency>
+
         <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>${portlet_api_version}</version>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeio_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo_version}</version>
         </dependency>
         <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-            <version>${castor_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${geronimo_version}</version>
         </dependency>
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${geronimo_version}</version>
         </dependency>
+
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>${standard_taglibs_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
         </dependency>
     </dependencies>
 </project>

Propchange: geronimo/trunk/applications/console-ear/src/application/META-INF/
            ('svn:ignore' removed)

Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Mon Aug 29 19:17:54
2005
@@ -6,14 +6,19 @@
 
     <!-- these dependencies must be kept here so that their classes are loaded in the
"EARs" classloader. -->
     <dependency>
-        <uri>portlet-api/jars/portlet-api-${portlet_api_version}.jar</uri>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${portlet_api_version}</version>
     </dependency>
     <dependency>
-        <uri>org.apache.pluto/jars/pluto-${pluto_version}.jar</uri>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>${pluto_version}</version>
     </dependency>
-
     <dependency>
-        <uri>geronimo/jars/geronimo-console-core-${pom.currentVersion}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-console-core</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
 
     <module>

Copied: geronimo/trunk/applications/console-ear/src/plan/plan.xml (from r264088, geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/plan.xml?p2=geronimo/trunk/applications/console-ear/src/plan/plan.xml&p1=geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml&r1=264088&r2=264671&rev=264671&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/plan.xml Mon Aug 29 19:17:54 2005
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
-    configId="org/apache/geronimo/Console"
-    parentId="org/apache/geronimo/RuntimeDeployer">
+    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
+    >
 
     <!-- these dependencies must be kept here so that their classes are loaded in the
"EARs" classloader. -->
     <dependency>
-        <uri>portlet-api/jars/portlet-api-${portlet_api_version}.jar</uri>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${portlet_api_version}</version>
     </dependency>
     <dependency>
-        <uri>org.apache.pluto/jars/pluto-${pluto_version}.jar</uri>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>${pluto_version}</version>
     </dependency>
-
     <dependency>
-        <uri>geronimo/jars/geronimo-console-core-${pom.currentVersion}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-console-core</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
 
     <module>
@@ -58,10 +64,10 @@
     <!-- Console specific server info -->
     <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
         <reference name="ServerInfo">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
         </reference>
         <reference name="LoginModule">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
         </reference>
     </gbean>
 </application>

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Mon Aug 29 19:17:54 2005
@@ -660,6 +660,31 @@
             </properties>
         </dependency>
 
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>${portlet_api_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+            <version>${pluto_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-console-core</artifactId>
+            <version>${geronimo_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+
         <!-- Specification dependencies to preload into the repository -->
         <dependency>
             <groupId>geronimo-spec</groupId>
@@ -1022,6 +1047,15 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-welcome</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-console</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

Modified: geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list (original)
+++ geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list Mon Aug 29 19:17:54 2005
@@ -2,3 +2,4 @@
 geronimo/cars/rmi-naming-1.0-SNAPSHOT.car
 geronimo/cars/j2ee-server-1.0-SNAPSHOT.car
 geronimo/cars/geronimo-welcome-1.0-SNAPSHOT.car
+geronimo/cars/geronimo-console-1.0-SNAPSHOT.car

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Mon Aug 29 19:17:54 2005
@@ -201,8 +201,7 @@
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">geronimo.server:name=WebContainer,*</attribute>
         <reference name="DefaultServlets">
-            <module>${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car</module>
-            <name>*</name>
+            <gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=DefaultServlet,*</gbean-name>
         </reference>
         <reference name="PojoWebServiceTemplate">
             <!-- todo replace with module/name reference -->

Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Mon Aug 29 19:17:54 2005
@@ -32,6 +32,11 @@
             <version>${geronimo_version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>
@@ -64,6 +69,11 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
         <dependency>

Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=264671&r1=264670&r2=264671&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Mon Aug 29 19:17:54 2005
@@ -59,6 +59,11 @@
     </dependency>
     <dependency>
         <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
         <artifactId>geronimo-connector</artifactId>
         <version>${geronimo_version}</version>
     </dependency>



Mime
View raw message