portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddew...@apache.org
Subject svn commit: r231151 - in /portals/pluto/trunk: ./ container/src/conf/org/apache/pluto/ deploy/ portal/ portal/src/webapp/WEB-INF/classes/ portal/src/webapp/WEB-INF/config/services/ testsuite/ testsuite/src/webapp/WEB-INF/classes/
Date Wed, 10 Aug 2005 02:12:57 GMT
Author: ddewolf
Date: Tue Aug  9 19:12:48 2005
New Revision: 231151

URL: http://svn.apache.org/viewcvs?rev=231151&view=rev
Log:
Build Updates:
- PLUTO-152: Thanks Jeremy Boynes - Updating Maven Build
- Updating 1.0.1-rc4 properties to 1.0.1-SNAPSHOT

Modified:
    portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties
    portals/pluto/trunk/deploy/build.xml
    portals/pluto/trunk/deploy/project.xml
    portals/pluto/trunk/portal/project.xml
    portals/pluto/trunk/portal/src/webapp/WEB-INF/classes/pluto-admin.properties
    portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties
    portals/pluto/trunk/project.xml
    portals/pluto/trunk/testsuite/project.xml
    portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties

Modified: portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties (original)
+++ portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties Tue Aug
 9 19:12:48 2005
@@ -16,7 +16,7 @@
 
 pluto.container.name=Pluto
 pluto.container.version.major=1
-pluto.container.version.minor=0.1-rc4
+pluto.container.version.minor=0.1-SNAPSHOT
 
 javax.portlet.version.major=1
 javax.portlet.version.minor=0

Modified: portals/pluto/trunk/deploy/build.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/build.xml?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/deploy/build.xml (original)
+++ portals/pluto/trunk/deploy/build.xml Tue Aug  9 19:12:48 2005
@@ -21,7 +21,7 @@
   <property name="lib.dir" value="./target/lib"/>
 
   <!-- Primary Dependencies -->
-  <property name="pluto-descriptors" value="pluto-descriptors-1.0.1-rc4.jar"/>
+  <property name="pluto-descriptors" value="pluto-descriptors-1.0.1-SNAPSHOT.jar"/>
 
   <!-- Secondary Dependencies -->
   <property name="castor" value="castor-0.9.5.3.jar"/>

Modified: portals/pluto/trunk/deploy/project.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/project.xml?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/deploy/project.xml (original)
+++ portals/pluto/trunk/deploy/project.xml Tue Aug  9 19:12:48 2005
@@ -19,7 +19,6 @@
   <extend>${basedir}/../project.xml</extend>
   <name>Pluto Portlet Deployment</name>
   <id>pluto-deploy</id>
-  <groupId>pluto</groupId>
 
   <organization>
     <logo>/../../images/jakarta-logo-blue.gif</logo>
@@ -39,9 +38,9 @@
 
     <!-- Pluto Portal Dependencies -->
     <dependency>
-      <id>pluto-descriptors</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto-descriptors</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
     </dependency>
 
  	<dependency>

Modified: portals/pluto/trunk/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/project.xml?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/portal/project.xml (original)
+++ portals/pluto/trunk/portal/project.xml Tue Aug  9 19:12:48 2005
@@ -53,9 +53,9 @@
     </dependency>
 
     <dependency>
-      <id>pluto</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>false</war.bundle>
         <tomcat.shared>true</tomcat.shared>
@@ -63,18 +63,18 @@
     </dependency>
 
     <dependency>
-      <id>pluto-descriptors</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto-descriptors</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
     </dependency>
 
     <dependency>
-      <id>pluto-deploy</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto-deploy</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>

Modified: portals/pluto/trunk/portal/src/webapp/WEB-INF/classes/pluto-admin.properties
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/webapp/WEB-INF/classes/pluto-admin.properties?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/webapp/WEB-INF/classes/pluto-admin.properties (original)
+++ portals/pluto/trunk/portal/src/webapp/WEB-INF/classes/pluto-admin.properties Tue Aug 
9 19:12:48 2005
@@ -18,7 +18,7 @@
 #Properties for the Pluto Admin Portlet Application
 #Full path to Pluto webapps dir (set if there are problems in PlutoAdminContext.parseDeploymentPaths()).
 # Path needs to use File Separator for OS (\\ for Windows / for Unix)
-#pluto-home=c:\\pluto-1.0.1-rc4\\webapps\\pluto
+#pluto-home=c:\\pluto-1.0.1-SNAPSHOT\\webapps\\pluto
 #Portlet deployment environment directory
 portlet-deploy-dir=portlet-deploy
 #Relative path to 'data' directory holding pageregistry.xml and portletentityregistry.xml

Modified: portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties
(original)
+++ portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties
Tue Aug  9 19:12:48 2005
@@ -24,7 +24,7 @@
 host.port.http = 8080
 host.port.https = 
 
-portaldriver.info = pluto-driver/1.0.1-rc4
+portaldriver.info = pluto-driver/1.0.1-SNAPSHOT
 
 supported.portletmode = view
 supported.portletmode = edit

Modified: portals/pluto/trunk/project.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/project.xml?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/project.xml (original)
+++ portals/pluto/trunk/project.xml Tue Aug  9 19:12:48 2005
@@ -19,8 +19,8 @@
   <pomVersion>3</pomVersion>
   <name>portals-pluto</name>
   <id>pluto-project</id>
-  <groupId>pluto</groupId>
-  <currentVersion>1.0.1-rc4</currentVersion>
+  <groupId>org.apache.pluto</groupId>
+  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://portals.apache.org/</url>

Modified: portals/pluto/trunk/testsuite/project.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/project.xml?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/testsuite/project.xml (original)
+++ portals/pluto/trunk/testsuite/project.xml Tue Aug  9 19:12:48 2005
@@ -19,7 +19,6 @@
   <extend>${basedir}/../project.xml</extend>
   <name>Pluto Portlet Test Suite</name>
   <id>testsuite</id>
-  <groupId>pluto</groupId>
 
   <organization>
     <logo>/../../images/apache-portals.gif</logo>
@@ -49,35 +48,36 @@
     </dependency>
 
     <dependency>
-      <id>pluto</id>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
 
     <dependency>
-      <id>pluto-descriptors</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto-descriptors</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
 
     <dependency>
-      <id>pluto-deploy</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto-deploy</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
 
     <dependency>
-      <id>pluto-portal</id>
-      <groupId>pluto</groupId>
-      <version>1.0.1-rc4</version>
+      <artifactId>pluto-portal</artifactId>
+	  <groupId>${pom.groupId}</groupId>
+	  <version>${pom.currentVersion}</version>
       <properties>
         <war.bundle>false</war.bundle>
       </properties>

Modified: portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties?rev=231151&r1=231150&r2=231151&view=diff
==============================================================================
--- portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties (original)
+++ portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties Tue
Aug  9 19:12:48 2005
@@ -24,11 +24,11 @@
 
 # The value we expect to return from renderRequest.getPortalContext().getPortalInfo();
 
-expected.serverInfo = Pluto/1.0.1-rc4
+expected.serverInfo = Pluto/1.0.1-SNAPSHOT
 expected.version.major=1
 expected.version.minor=0
 
-expected.portalInfo = pluto-driver/1.0.1-rc4
+expected.portalInfo = pluto-driver/1.0.1-SNAPSHOT
 
 expected.security.role=tomcat
 expected.security.role.mapped=plutoTestRole



Mime
View raw message