svn commit: r752341 [2/2] - in /portals/pluto/trunk: pluto-container/src/main/java/org/apache/pluto/container/driver/ pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ pluto-container/src/main/java/org/apache/pluto/container/impl/ p...

[at...@apache.org]

Copied: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd (from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_2_0.xsd)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd?p2=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd&p1=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_2_0.xsd&r1=752154&r2=752341&rev=752341&view=diff
==============================================================================
    (empty)

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd (from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/web-app_2_3.dtd)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd?p2=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd&p1=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/web-app_2_3.dtd&r1=752154&r2=752341&rev=752341&view=diff
==============================================================================
    (empty)

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/DefaultNamespaceMapperTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/DefaultNamespaceMapperTest.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/DefaultNamespaceMapperTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/DefaultNamespaceMapperTest.java Wed Mar 11 01:44:50 2009
@@ -18,7 +18,7 @@
 
 import org.apache.pluto.container.NamespaceMapper;
 import org.apache.pluto.container.PortletWindowID;
-import org.apache.pluto.driver.impl.DefaultNamespaceMapper;
+import org.apache.pluto.container.driver.impl.DefaultNamespaceMapper;
 import org.apache.pluto.util.PlutoTestCase;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java Wed Mar 11 01:44:50 2009
@@ -22,7 +22,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.pluto.container.impl.ResourceBundleFactory;
+import org.apache.pluto.container.driver.impl.ResourceBundleFactory;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.PortletInfo;
 import org.apache.pluto.container.om.portlet.impl.PortletType;

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java Wed Mar 11 01:44:50 2009
@@ -20,7 +20,7 @@
 import java.lang.reflect.Method;
 
 import org.apache.pluto.container.driver.PlutoServices;
-import org.apache.pluto.driver.impl.PlutoContainerServices;
+import org.apache.pluto.container.driver.impl.PlutoContainerServices;
 import org.jmock.MockObjectTestCase;
 
 /**

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Wed Mar 11 01:44:50 2009
@@ -20,8 +20,8 @@
 
 import org.apache.pluto.container.EventCoordinationService;
 import org.apache.pluto.container.PortletRequestContextService;
+import org.apache.pluto.container.driver.impl.PlutoContainerServices;
 import org.apache.pluto.driver.config.DriverConfiguration;
-import org.apache.pluto.driver.impl.PlutoContainerServices;
 
 /**
  * The Portal Driver's <code>PortletContainerServices</code> implementation. The

Copied: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventImpl.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventImpl.java?p2=portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventImpl.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.impl;
+package org.apache.pluto.driver.services.container;
 
 import javax.portlet.Event;
 import javax.xml.namespace.QName;

Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Wed Mar 11 01:44:50 2009
@@ -49,7 +49,6 @@
 import org.apache.pluto.container.driver.PlutoServices;
 import org.apache.pluto.container.driver.PortletContextService;
 import org.apache.pluto.container.driver.PortletRegistryService;
-import org.apache.pluto.container.impl.EventImpl;
 import org.apache.pluto.container.om.portlet.EventDefinition;
 import org.apache.pluto.container.om.portlet.EventDefinitionReference;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java Wed Mar 11 01:44:50 2009
@@ -41,7 +41,6 @@
 import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.driver.PortletContextService;
-import org.apache.pluto.container.impl.EventImpl;
 import org.apache.pluto.container.om.portlet.EventDefinition;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.driver.core.PortalServletRequest;