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 ta...@apache.org on 2008/10/16 10:25:58 UTC

svn commit: r705172 - in /portals/pluto/branches/2.0-spi-refactoring: maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java pluto-portal/pom.xml

Author: taylor
Date: Thu Oct 16 01:25:57 2008
New Revision: 705172

URL: http://svn.apache.org/viewvc?rev=705172&view=rev
Log:
https://issues.apache.org/jira/browse/PLUTO-511
With this commit you can now run:

mvn clean install
mvn pluto:install -DinstallDir==path/to/appserver

and build/test without errors as well as deploy a full running Pluto portal with the following jars in shared/lib:

pluto-container-api-2.0.0-SNAPSHOT.jar
pluto-taglib-2.0.0-SNAPSHOT.jar
portlet-api-2.0.jar
ccpp-1.0.jar

The Pluto WEB-INF/lib has all other dependencies including the container-impl (deployment included), utils, and driver
(I may want to tweak the dependencies a bit more still)

Modified:
    portals/pluto/branches/2.0-spi-refactoring/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
    portals/pluto/branches/2.0-spi-refactoring/pluto-portal/pom.xml

Modified: portals/pluto/branches/2.0-spi-refactoring/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java?rev=705172&r1=705171&r2=705172&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java Thu Oct 16 01:25:57 2008
@@ -54,14 +54,6 @@
         new InstallationDependency("org.apache.pluto", "pluto-container-api", 
                 VERSION_PROPERTIES.getProperty("pluto.version"));
 
-    public static final InstallationDependency  DESCRIPTOR_API =
-        new InstallationDependency("org.apache.pluto", "pluto-descriptor-api", 
-                VERSION_PROPERTIES.getProperty("pluto.version"));
-
-    public static final InstallationDependency  DESCRIPTOR_IMPL =
-            new InstallationDependency("org.apache.pluto", "pluto-descriptor-impl", 
-                    VERSION_PROPERTIES.getProperty("pluto.version"));
-
     public static final InstallationDependency  CONTAINER =
             new InstallationDependency("org.apache.pluto", "pluto-container", 
                     VERSION_PROPERTIES.getProperty("pluto.version"));
@@ -137,27 +129,20 @@
     static {
 //        ENDORSED.add(XERCES);
 //        ENDORSED.add(XML_PARSER_APIS);
-        SHARED.add(XERCES);
-        SHARED.add(XML_PARSER_APIS);
 
+//        SHARED.add(XERCES);
+//        SHARED.add(XML_PARSER_APIS);
+//      SHARED.add(CONTAINER);
+//      SHARED.add(CASTOR);
+//      SHARED.add(JAXB_IMPL);
+//      SHARED.add(STAX_API);
+//      SHARED.add(STAX_IMPL);
+//      SHARED.add(ACTIVATION);
         SHARED.add(PORTLET_API);
         SHARED.add(CONTAINER_API);
-        SHARED.add(DESCRIPTOR_API);
-        SHARED.add(DESCRIPTOR_IMPL);
-        SHARED.add(CONTAINER);
         SHARED.add(TAGLIB);
-        SHARED.add(CASTOR);
-        
-        SHARED.add(JAXB_API);
-        SHARED.add(JAXB_IMPL);
-        
-        SHARED.add(STAX_API);
-        SHARED.add(STAX_IMPL);
-        
-        SHARED.add(ACTIVATION);
-
+//        SHARED.add(JAXB_API);
         SHARED.add(CCPP_API);
-
     }
 
 

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal/pom.xml?rev=705172&r1=705171&r2=705172&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal/pom.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal/pom.xml Thu Oct 16 01:25:57 2008
@@ -38,7 +38,44 @@
       <scope>compile</scope>
     </dependency>
 
-
+	<dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-util</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-container</artifactId>
+      <version>${pom.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-container-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.portlet</groupId>
+          <artifactId>portlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>      
+	</dependency>
+	
     <dependency>
       <groupId>org.apache.pluto</groupId>
       <artifactId>pluto-portal-driver</artifactId>