svn commit: r123063 - in cocoon/branches/BRANCH_2_1_X: lib lib/optional src/blocks/portal/java/org/apache/cocoon/portal/pluto/om

[cziegeler]

Author: cziegeler
Date: Wed Dec 22 00:31:22 2004
New Revision: 123063

URL: http://svn.apache.org/viewcvs?view=rev&rev=123063
Log:
Update to pluto rc2
Added:
   cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc2.jar   (contents, 
props changed)
Removed:
   cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc1.jar
Modified:
   cocoon/branches/BRANCH_2_1_X/lib/jars.xml
   
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
   
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
Url: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?view=diff&rev=123063&p1=cocoon/branches/BRANCH_2_1_X/lib/jars.xml&r1=123062&p2=cocoon/branches/BRANCH_2_1_X/lib/jars.xml&r2=123063
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml   (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml   Wed Dec 22 00:31:22 2004
@@ -1101,7 +1101,7 @@
       original spec.
     </description>
     <used-by>Portal</used-by>
-    <lib>optional/pluto-1.0.1-rc1.jar</lib>
+    <lib>optional/pluto-1.0.1-rc2.jar</lib>
     <homepage>http://portals.apache.org/pluto/</homepage>
   </file>
 

Deleted: /cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc1.jar
Url: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc1.jar?view=auto&rev=123062
==============================================================================

Added: cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc2.jar
Url: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc2.jar?view=auto&rev=123063
==============================================================================
Binary file. No diff available.

Modified: 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
Url: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java?view=diff&rev=123063&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java&r1=123062&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java&r2=123063
==============================================================================
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
 (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
 Wed Dec 22 00:31:22 2004
@@ -26,7 +26,6 @@
 import org.apache.pluto.om.servlet.WebApplicationDefinition;
 import org.apache.cocoon.portal.pluto.om.common.AbstractSupportSet;
 import org.apache.cocoon.portal.pluto.om.common.Support;
-import org.apache.cocoon.portal.PortalService;
 
 /**
  * 

Modified: 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
Url: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java?view=diff&rev=123063&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java&r1=123062&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java&r2=123063
==============================================================================
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
        (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
        Wed Dec 22 00:31:22 2004
@@ -19,7 +19,6 @@
 import java.util.Locale;
 
 import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.pluto.om.common.PreferenceSetImpl;
 import org.apache.pluto.om.common.Description;
 import org.apache.pluto.om.common.ObjectID;
 import org.apache.pluto.om.common.PreferenceSet;