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 cd...@apache.org on 2006/05/04 17:05:01 UTC

svn commit: r399725 - in /portals/pluto/tags/release-1.1.0-beta1: README pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties

Author: cdoremus
Date: Thu May  4 08:05:00 2006
New Revision: 399725

URL: http://svn.apache.org/viewcvs?rev=399725&view=rev
Log:
Merged in changes from trunk since creating this branch

Modified:
    portals/pluto/tags/release-1.1.0-beta1/README
    portals/pluto/tags/release-1.1.0-beta1/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties

Modified: portals/pluto/tags/release-1.1.0-beta1/README
URL: http://svn.apache.org/viewcvs/portals/pluto/tags/release-1.1.0-beta1/README?rev=399725&r1=399724&r2=399725&view=diff
==============================================================================
--- portals/pluto/tags/release-1.1.0-beta1/README (original)
+++ portals/pluto/tags/release-1.1.0-beta1/README Thu May  4 08:05:00 2006
@@ -74,6 +74,7 @@
     * [PLUTO-220] - flush causing problem in doEndTag() in BasicURLTag.java
     * [PLUTO-221-231] - Sub-project descriptors referencing basedir break multi-project build
     * [PLUTO-235] - Add example of installing Pluto on Windows
+    * [PLUTO-237] - org.apache.pluto.internal package missing LocalStrings.properties
 
 ** Improvement
     * [PLUTO-151] - New class hierarchy to implement portlet request and response, and resolve the dispatching parameters problem.

Modified: portals/pluto/tags/release-1.1.0-beta1/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties
URL: http://svn.apache.org/viewcvs/portals/pluto/tags/release-1.1.0-beta1/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties?rev=399725&r1=399724&r2=399725&view=diff
==============================================================================
--- portals/pluto/tags/release-1.1.0-beta1/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties (original)
+++ portals/pluto/tags/release-1.1.0-beta1/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties Thu May  4 08:05:00 2006
@@ -20,7 +20,7 @@
 
 error.load.portlet.xml=Unable to load portlet.xml for context {0} {1}
 
-error.context.descriptor.load
+error.context.descriptor.load=An error occured while loading the context descriptor {0}
 
 
 ####################################