portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r605359 - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-container: pom.xml src/main/resources/org/apache/pluto/environment.properties
Date Tue, 18 Dec 2007 23:14:27 GMT
Author: cdoremus
Date: Tue Dec 18 15:14:26 2007
New Revision: 605359

URL: http://svn.apache.org/viewvc?rev=605359&view=rev
Log:
Fix for MiscTest.checkContextServerInfo testsuite test.

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/resources/org/apache/pluto/environment.properties

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml?rev=605359&r1=605358&r2=605359&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml Tue Dec 18 15:14:26
2007
@@ -122,6 +122,23 @@
   </dependencies>
 
   <build>
+       <resources>
+           <resource>
+               <directory>src/main/resources</directory>
+               <filtering>true</filtering>
+           </resource>
+      <resource>
+        <directory>src/main/resources/META-INF</directory>
+        <targetPath>/META-INF</targetPath>
+      </resource>
+       </resources>
+       <testResources>
+           <testResource>
+               <directory>src/main/resources</directory>
+               <filtering>true</filtering>
+           </testResource>
+       </testResources>
+
     <plugins>
       <!-- Assembly Plugin: Create Distributions =========================== -->
       <plugin>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/resources/org/apache/pluto/environment.properties
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/resources/org/apache/pluto/environment.properties?rev=605359&r1=605358&r2=605359&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/resources/org/apache/pluto/environment.properties
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/resources/org/apache/pluto/environment.properties
Tue Dec 18 15:14:26 2007
@@ -16,10 +16,13 @@
 #
 ######################################################################
 
-pluto.container.name=Pluto
-pluto.container.version.major=1
-pluto.container.version.minor=2.0-286-SNAPSHOT
+#pluto.container.name=Pluto
+#pluto.container.version.major=1
+#pluto.container.version.minor=2.0-286-SNAPSHOT
 
-javax.portlet.version.major=2
-javax.portlet.version.minor=0
+pluto.container.name=${pluto.container.name}
+pluto.container.version=${pom.version}
+
+javax.portlet.version.major=${javax.portlet.version.major}
+javax.portlet.version.minor=${javax.portlet.version.minor}
 



Mime
View raw message