You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/04/08 16:40:55 UTC

svn commit: r763255 - in /portals/pluto/trunk: maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java pluto-container/pom.xml pluto-portal-driver-impl/pom.xml pluto-portal-driver/pom.xml

Author: ate
Date: Wed Apr  8 14:40:52 2009
New Revision: 763255

URL: http://svn.apache.org/viewvc?rev=763255&view=rev
Log:
Additional changes required for PLUTO-545 to properly separate the dependencies and the portal to deploy again

Modified:
    portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
    portals/pluto/trunk/pluto-container/pom.xml
    portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
    portals/pluto/trunk/pluto-portal-driver/pom.xml

Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java?rev=763255&r1=763254&r2=763255&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java Wed Apr  8 14:40:52 2009
@@ -62,6 +62,10 @@
             new InstallationDependency("org.apache.pluto", "pluto-taglib", 
                     VERSION_PROPERTIES.getProperty("pluto.version"));
 
+    public static final InstallationDependency CONTAINER_DRIVER_API =
+        new InstallationDependency("org.apache.pluto", "pluto-container-driver-api", 
+                VERSION_PROPERTIES.getProperty("pluto.version"));
+
     public static final InstallationDependency  PORTAL =
             new InstallationDependency("org.apache.pluto", "pluto-portal", 
                     VERSION_PROPERTIES.getProperty("pluto.version"), "war");
@@ -129,6 +133,7 @@
     static {
         SHARED.add(PORTLET_API);
         SHARED.add(CONTAINER_API);
+        SHARED.add(CONTAINER_DRIVER_API);
         SHARED.add(TAGLIB);
         SHARED.add(CCPP_API);
     }

Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=763255&r1=763254&r2=763255&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Wed Apr  8 14:40:52 2009
@@ -38,13 +38,6 @@
 
         <dependency>
             <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-container-api</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-container-driver-api</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>

Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=763255&r1=763254&r2=763255&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Wed Apr  8 14:40:52 2009
@@ -35,6 +35,12 @@
 
         <dependency>
             <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-container-api</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-container</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>

Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=763255&r1=763254&r2=763255&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Wed Apr  8 14:40:52 2009
@@ -35,6 +35,12 @@
 
         <dependency>
             <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-container-api</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-container</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>