portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r387661 - in /portals/jetspeed-2/trunk: maven-plugin/plugin.jelly project.properties
Date Tue, 21 Mar 2006 22:52:25 GMT
Author: ate
Date: Tue Mar 21 14:52:24 2006
New Revision: 387661

URL: http://svn.apache.org/viewcvs?rev=387661&view=rev
Log:
See http://issues.apache.org/jira/browse/JS2-174#action_12371328
Updating deps to use new 1.0.1-dev version of bridge-common.
The maven-1 plugin will now automatically clean out any old version of shared/lib jars,
so no more classloader problems because of duplicate jars there ...

Modified:
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/project.properties

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=387661&r1=387660&r2=387661&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Tue Mar 21 14:52:24 2006
@@ -459,7 +459,30 @@
     <attainGoal name="j2:catalina.shared"/>
   </goal>
   
-  <goal name="j2:catalina.base.shared" description="Copy all base jars necessary for common
container">
+  <goal name="j2:remove.catalina.base.shared" description="Clean out old base jars necessary
for common container">
+      <echo>Removing misc. old jars from Tomcat shared/lib</echo>
+      <delete quiet="true">
+        <fileset dir="${org.apache.jetspeed.server.shared}">
+          <include name="pluto-*.jar"/>
+          <include name="portals-bridges-common-*.jar"/>
+          <include name="derby-*.jar"/>
+        </fileset>
+      </delete>
+  </goal>
+  
+  <goal name="j2:remove.catalina.shared" description="Clean out old jars necessary for
common container">
+      <echo>Removing old container jars from Tomcat shared/lib</echo>
+      <delete quiet="true">
+        <fileset dir="${org.apache.jetspeed.server.shared}">
+          <include name="jetspeed-commons-*.jar"/>
+          <include name="jetspeed-api-*.jar"/>
+          <include name="portlet-api-*.jar"/>
+        </fileset>
+      </delete>
+  </goal>
+  
+  <goal name="j2:catalina.base.shared" description="Copy all base jars necessary for common
container" 
+        prereqs="j2:remove.catalina.base.shared">
     <echo>Deploys misc. jars shared/lib to Tomcat</echo>
     <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared}...</echo>
     <copy file="${maven.repo.local}/org.apache.pluto/jars/pluto-${pluto.version}.jar"
@@ -470,7 +493,8 @@
           todir="${org.apache.jetspeed.server.shared}"/>
   </goal>
 
-  <goal name="j2:catalina.shared" description="Copy all jars necessary for common container">
+  <goal name="j2:catalina.shared" description="Copy all jars necessary for common container"
+        prereqs="j2:remove.catalina.shared">
     <echo>Deploys container jars to shared/lib to Tomcat</echo>
     <copy file="${maven.repo.local}/${plugin.groupId}/jars/jetspeed-commons-${jetspeed.version}.jar"
           todir="${org.apache.jetspeed.server.shared}"/>

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=387661&r1=387660&r2=387661&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Tue Mar 21 14:52:24 2006
@@ -22,7 +22,7 @@
 spring.version=1.1.5
 bridges.groupId=org.apache.portals.bridges
 portals.bridges.version=1.0
-portals.bridges.common.version=1.0
+portals.bridges.common.version=1.0.1-dev
 portals.bridges.frameworks.version=1.0
 portals.bridges.jsf.version=1.0
 portals.bridges.perl.version=1.0



---------------------------------------------------------------------
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