portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r770557 - in /portals/jetspeed-2/portal/trunk: enterprise/ear-full/pom.xml enterprise/ear-min/pom.xml enterprise/pom.xml pom.xml
Date Fri, 01 May 2009 07:46:30 GMT
Author: rwatler
Date: Fri May  1 07:46:30 2009
New Revision: 770557

URL: http://svn.apache.org/viewvc?rev=770557&view=rev
Log:
correct portal dependency for enterprise ear builds

Modified:
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=770557&r1=770556&r2=770557&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Fri May  1 07:46:30 2009
@@ -41,12 +41,6 @@
   <!-- Application Dependencies -->
   
   <dependencies>
-    <!-- Provided Dependencies -->
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>j2-admin</artifactId>
-      <type>war</type>
-    </dependency>
     <dependency>
       <groupId>org.apache.portals.applications</groupId>
       <artifactId>apa-demo</artifactId>
@@ -64,6 +58,8 @@
     </dependency>
   </dependencies>
 
+  <!-- POM build -->
+
   <build>
     <plugins>
       <plugin>
@@ -74,7 +70,7 @@
             <!-- skinny wars: must be explicitly repackaged below with maven-ear-plugin-skinny-wars
-->
             <webModule>
               <groupId>${pom.groupId}</groupId>
-              <artifactId>jetspeed</artifactId>
+              <artifactId>jetspeed-demo</artifactId>
               <contextRoot>/jetspeed</contextRoot>
             </webModule>                                              
             <webModule>
@@ -159,7 +155,7 @@
                   </path>
                 </pathconvert>
                 <!-- set skinny wars classpath -->
-                <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-${pom.version}.war"
update="true">
+                <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"
update="true">
                   <manifest>
                     <attribute name="Class-Path" value="${war.manifest.classpath}"/>
                   </manifest>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml?rev=770557&r1=770556&r2=770557&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml Fri May  1 07:46:30 2009
@@ -38,16 +38,7 @@
   <packaging>ear</packaging>
   <name>Jetspeed-2 Minimal Enterprise Archive</name>
 
-  <!-- Application Dependencies -->
-  
-  <dependencies>
-    <!-- Provided Dependencies -->
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>j2-admin</artifactId>
-      <type>war</type>
-    </dependency>
-  </dependencies>
+  <!-- POM build -->
 
   <build>
     <plugins>
@@ -64,7 +55,7 @@
             <!-- skinny wars: must be explicitly repackaged below with maven-ear-plugin-skinny-wars
-->
             <webModule>
               <groupId>${pom.groupId}</groupId>
-              <artifactId>jetspeed</artifactId>
+              <artifactId>jetspeed-demo</artifactId>
               <contextRoot>/jetspeed</contextRoot>
             </webModule>                       
             <webModule>
@@ -134,7 +125,7 @@
                   </path>
                 </pathconvert>
                 <!-- set skinny wars classpath -->
-                <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-${pom.version}.war"
update="true">
+                <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"
update="true">
                   <manifest>
                     <attribute name="Class-Path" value="${war.manifest.classpath}"/>
                   </manifest>

Modified: portals/jetspeed-2/portal/trunk/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/pom.xml?rev=770557&r1=770556&r2=770557&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/pom.xml Fri May  1 07:46:30 2009
@@ -53,10 +53,16 @@
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>jetspeed</artifactId>
+      <artifactId>jetspeed-demo</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>j2-admin</artifactId>
+      <type>war</type>
+    </dependency>
+
+    <dependency>
       <groupId>javax.ccpp</groupId>
       <artifactId>ccpp</artifactId>
     </dependency>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=770557&r1=770556&r2=770557&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri May  1 07:46:30 2009
@@ -496,12 +496,6 @@
         <artifactId>jetspeed-serializer</artifactId>
         <version>${pom.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed</artifactId>
-        <type>war</type>
-        <version>${pom.version}</version>
-      </dependency>
 
       <!-- Portals Applications JARs -->
       <dependency>
@@ -523,6 +517,18 @@
       <!-- Portals Applications -->
       <dependency>
         <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed</artifactId>
+        <type>war</type>
+        <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-demo</artifactId>
+        <type>war</type>
+        <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-layouts</artifactId>
         <type>war</type>
         <version>${pom.version}</version>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message