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 es...@apache.org on 2007/02/11 17:59:11 UTC
svn commit: r506066 - in /portals/pluto/trunk/pluto-portal: pom.xml src/main/resources/pluto-portal-driver-config.xml src/main/webapp/WEB-INF/pluto-portal-driver-config.xml

Author: esm
Date: Sun Feb 11 08:59:11 2007
New Revision: 506066

URL: http://svn.apache.org/viewvc?view=rev&rev=506066
Log:
[PLUTO-259]: Forgot to include pluto-portal-driver-config.xml when automating version numbers for relase.  With this patch, pluto-portal-driver-config.xml's <portal-version> is interpolated with the pom.xml version.

Added:
    portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
      - copied, changed from r506064, portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
Removed:
    portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
Modified:
    portals/pluto/trunk/pluto-portal/pom.xml

Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?view=diff&rev=506066&r1=506065&r2=506066
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Sun Feb 11 08:59:11 2007
@@ -77,7 +77,23 @@
         <finalName>pluto-portal</finalName>
 
         <plugins>
-            <plugin>
+             <plugin>
+               <artifactId>maven-war-plugin</artifactId>
+               <configuration>
+                 <webResources>
+                   <resource>
+                     <filtering>true</filtering>
+                     <directory>${pom.basedir}/src/main/resources</directory>
+                     <includes>
+                       <include>pluto-portal-driver-config.xml</include>
+                     </includes>
+                     <!-- <targetPath> requires version 2.0.2 of maven-war-plugin -->
+                     <targetPath>WEB-INF</targetPath>
+                   </resource>
+                 </webResources>
+               </configuration>
+             </plugin>
+             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.1</version>
                 <configuration>

Copied: portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml (from r506064, portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml?view=diff&rev=506066&p1=portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml&r1=506064&p2=portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml&r2=506066
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/resources/pluto-portal-driver-config.xml Sun Feb 11 08:59:11 2007
@@ -26,7 +26,7 @@
     version="1.1">
 
   <portal-name>pluto-portal-driver</portal-name>
-  <portal-version>1.1.0-SNAPSHOT</portal-version>
+  <portal-version>${pom.version}</portal-version>
   <container-name>Pluto Portal Driver</container-name>
 
   <supports>