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 dd...@apache.org on 2005/03/08 18:08:00 UTC

svn commit: r156546 - in portals/pluto/trunk/deploy: maven.xml project.xml

Author: ddewolf
Date: Tue Mar  8 09:07:59 2005
New Revision: 156546

URL: http://svn.apache.org/viewcvs?view=rev&rev=156546
Log:
Modifying Deploy Subproject to use the new deployer.

Modified:
    portals/pluto/trunk/deploy/maven.xml
    portals/pluto/trunk/deploy/project.xml

Modified: portals/pluto/trunk/deploy/maven.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/maven.xml?view=diff&r1=156545&r2=156546
==============================================================================
--- portals/pluto/trunk/deploy/maven.xml (original)
+++ portals/pluto/trunk/deploy/maven.xml Tue Mar  8 09:07:59 2005
@@ -18,20 +18,16 @@
          xmlns:j="jelly:core"
          xmlns:maven="jelly:maven"
          xmlns:ant="jelly:ant">     
-         
-         
  <goal name="deploy">
-         <java classname="org.apache.pluto.portalImpl.Deploy" fork="yes">
-          <classpath>
-            <path refid="maven.dependency.classpath"/>
-            <pathelement path="${maven.build.dest}"/>
-          </classpath>
-            <arg value="${maven.tomcat.home}/webapps" />
-            <arg value="pluto" />
-            <arg value="${deploy}" />
-            <arg value=".." />    
-         </java>       
+    <java classname="org.apache.pluto.driver.deploy.CLI" fork="yes">
+      <classpath>
+        <path refid="maven.dependency.classpath"/>
+        <pathelement path="${maven.build.dest}"/>
+      </classpath>
+      <arg value="-verbose"/>
+      <arg value="-p"/><arg value="${maven.tomcat.home}/webapps/pluto"/>
+      <arg value="-d"/><arg value="${maven.tomcat.home}/webapps"/>
+      <arg value="${deploy}" />
+    </java>       
  </goal>
-         
-
 </project>

Modified: portals/pluto/trunk/deploy/project.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/project.xml?view=diff&r1=156545&r2=156546
==============================================================================
--- portals/pluto/trunk/deploy/project.xml (original)
+++ portals/pluto/trunk/deploy/project.xml Tue Mar  8 09:07:59 2005
@@ -26,33 +26,21 @@
   </organization>
   <logo>/../../images/pluto-feather.gif</logo>
 
-  <shortDescription>Deployment of portlets</shortDescription>
+  <shortDescription>
+    Utilities for deploying portlets.
+  </shortDescription>
 
   <description>
-    Deployment of portlets
+    Maven and Ant based utilities for deploying
+    portlets.
   </description>
 
   <dependencies>
-  	<dependency>
-      <id>castor</id>
-      <version>0.9.5</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.4</version>
-    </dependency>
 
+    <!-- Pluto Portal Dependencies -->
     <dependency>
-      <id>commons-cli</id>
-      <version>1.0</version>
-    </dependency>
-
-    <dependency>
-      <id>pluto</id>
+      <id>pluto-descriptors</id>
+      <groupId>pluto</groupId>
       <version>1.0.1-rc3</version>
       <properties>
         <war.bundle>false</war.bundle>
@@ -67,6 +55,16 @@
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
+k
+    <dependency>
+      <id>pluto</id>
+      <version>1.0.1-rc3</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- Secondary Dependencies -->
 
     <dependency>
       <id>portlet-api</id>
@@ -76,6 +74,7 @@
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
+
     <dependency>
       <id>servletapi</id>
       <version>2.3</version>
@@ -84,6 +83,16 @@
       </properties>
     </dependency>
 
+ 	<dependency>
+      <id>castor</id>
+      <version>0.9.5.3</version>
+    </dependency>
+
+    <dependency>
+      <id>commons-logging</id>
+      <version>1.0.4</version>
+    </dependency>
+
     <dependency>
       <id>xerces</id>
       <version>2.3.0</version>
@@ -99,8 +108,6 @@
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
-
-
   </dependencies>
 
   <build>
@@ -109,7 +116,6 @@
 
     <sourceDirectory>src/java</sourceDirectory>
     <aspectSourceDirectory/>
-
   </build>
 
 </project>