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 nl...@apache.org on 2004/12/01 00:58:57 UTC
svn commit: r109262 - in portals/pluto/trunk: . container/src/conf/org/apache/pluto deploy portal portal/src/webapp/WEB-INF/config/services testsuite testsuite/src/webapp/WEB-INF/classes
Author: nlothian
Date: Tue Nov 30 15:58:56 2004
New Revision: 109262
URL: http://svn.apache.org/viewcvs?view=rev&rev=109262
Log:
Updated version to 1.0.1-rc2
Modified:
portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties
portals/pluto/trunk/deploy/project.xml
portals/pluto/trunk/portal/project.xml
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?view=diff&rev=109262&p1=portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties&r1=109261&p2=portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties&r2=109262
==============================================================================
--- portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties (original)
+++ portals/pluto/trunk/container/src/conf/org/apache/pluto/environment.properties Tue Nov 30 15:58:56 2004
@@ -1,22 +1,22 @@
-#
+#
# Copyright 2003,2004 The Apache Software Foundation.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+#
pluto.container.name=Pluto
pluto.container.version.major=1
-pluto.container.version.minor=0.1-rc1
+pluto.container.version.minor=0.1-rc2
javax.portlet.version.major=1
javax.portlet.version.minor=0
Modified: portals/pluto/trunk/deploy/project.xml
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/project.xml?view=diff&rev=109262&p1=portals/pluto/trunk/deploy/project.xml&r1=109261&p2=portals/pluto/trunk/deploy/project.xml&r2=109262
==============================================================================
--- portals/pluto/trunk/deploy/project.xml (original)
+++ portals/pluto/trunk/deploy/project.xml Tue Nov 30 15:58:56 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -50,10 +50,10 @@
<id>commons-cli</id>
<version>1.0</version>
</dependency>
-
+
<dependency>
<id>pluto</id>
- <version>1.0.1-rc1</version>
+ <version>1.0.1-rc2</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
@@ -62,12 +62,12 @@
<dependency>
<id>pluto-portal</id>
<groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
+ <version>1.0.1-rc2</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<id>portlet-api</id>
<groupId>portlet-api</groupId>
@@ -83,7 +83,7 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<id>xerces</id>
<version>2.3.0</version>
@@ -92,14 +92,14 @@
</properties>
</dependency>
- <dependency>
+ <dependency>
<id>xml-apis</id>
<version>2.0.2</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
</dependency>
-
+
</dependencies>
Modified: portals/pluto/trunk/portal/project.xml
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/project.xml?view=diff&rev=109262&p1=portals/pluto/trunk/portal/project.xml&r1=109261&p2=portals/pluto/trunk/portal/project.xml&r2=109262
==============================================================================
--- portals/pluto/trunk/portal/project.xml (original)
+++ portals/pluto/trunk/portal/project.xml Tue Nov 30 15:58:56 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -54,7 +54,7 @@
<dependency>
<id>pluto</id>
<groupId>pluto</groupId>
- <version>1.0.1-rc1</version>
+ <version>1.0.1-rc2</version>
<properties>
<war.bundle>false</war.bundle>
<tomcat.shared>true</tomcat.shared>
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?view=diff&rev=109262&p1=portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties&r1=109261&p2=portals/pluto/trunk/portal/src/webapp/WEB-INF/config/services/ConfigService.properties&r2=109262
==============================================================================
--- 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 Nov 30 15:58:56 2004
@@ -24,7 +24,7 @@
host.port.http = 8080
host.port.https =
-portaldriver.info = pluto-driver/1.0.1-rc1
+portaldriver.info = pluto-driver/1.0.1-rc2
supported.portletmode = view
supported.portletmode = edit
Modified: portals/pluto/trunk/project.xml
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/project.xml?view=diff&rev=109262&p1=portals/pluto/trunk/project.xml&r1=109261&p2=portals/pluto/trunk/project.xml&r2=109262
==============================================================================
--- portals/pluto/trunk/project.xml (original)
+++ portals/pluto/trunk/project.xml Tue Nov 30 15:58:56 2004
@@ -20,7 +20,7 @@
<name>portals-pluto</name>
<id>pluto-project</id>
<groupId>pluto</groupId>
- <currentVersion>1.0.1-rc1</currentVersion>
+ <currentVersion>1.0.1-rc2</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?view=diff&rev=109262&p1=portals/pluto/trunk/testsuite/project.xml&r1=109261&p2=portals/pluto/trunk/testsuite/project.xml&r2=109262
==============================================================================
--- portals/pluto/trunk/testsuite/project.xml (original)
+++ portals/pluto/trunk/testsuite/project.xml Tue Nov 30 15:58:56 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -47,10 +47,10 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<id>pluto</id>
- <version>1.0.1-rc1</version>
+ <version>1.0.1-rc2</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
@@ -64,7 +64,7 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<id>portlet-api</id>
<groupId>portlet-api</groupId>
@@ -81,7 +81,7 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<id>xerces</id>
<version>2.3.0</version>
@@ -90,14 +90,14 @@
</properties>
</dependency>
- <dependency>
+ <dependency>
<id>xml-apis</id>
<version>2.0.2</version>
<properties>
<war.bundle>false</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<id>jstl</id>
<version>1.0.2</version>
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?view=diff&rev=109262&p1=portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties&r1=109261&p2=portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties&r2=109262
==============================================================================
--- portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties (original)
+++ portals/pluto/trunk/testsuite/src/webapp/WEB-INF/classes/expectedResults.properties Tue Nov 30 15:58:56 2004
@@ -1,16 +1,16 @@
-#
+#
# Copyright 2004 The Apache Software Foundation
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
+# You may obtain a copy of the License at
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
-#
+#
# See the License for the specific language governing permissions and
# limitations under the License.
#
@@ -24,11 +24,11 @@
# The value we expect to return from renderRequest.getPortalContext().getPortalInfo();
-expected.serverInfo = Pluto/1.0.1-rc1
+expected.serverInfo = Pluto/1.0.1-rc2
expected.version.major=1
expected.version.minor=0
-expected.portalInfo = pluto-driver/1.0.1-rc1
+expected.portalInfo = pluto-driver/1.0.1-rc2
expected.security.role=tomcat
expected.security.role.mapped=plutoTestRole