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 at...@apache.org on 2009/03/10 17:25:15 UTC
svn commit: r752156 [2/3] - in /portals/pluto/trunk:
pluto-container-api/src/main/java/org/apache/pluto/container/
pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/pluto/container/
pluto-container/src/main/java/o...
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.Locale;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.Locale;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java Tue Mar 10 16:25:11 2009
@@ -17,5 +17,5 @@
* @version $Id$
*/
@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ContainerRuntimeOptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ContainerRuntimeOptionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ContainerRuntimeOptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ContainerRuntimeOptionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomPortletModeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomPortletModeType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomPortletModeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomPortletModeType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomWindowStateType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomWindowStateType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomWindowStateType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomWindowStateType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DescriptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DescriptionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DescriptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DescriptionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DisplayNameType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DisplayNameType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DisplayNameType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DisplayNameType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/InitParamType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/InitParamType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/InitParamType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/InitParamType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ObjectFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ObjectFactory.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ObjectFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ObjectFactory.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletAppType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletAppType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletAppType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletAppType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.ArrayList;
import java.util.List;
@@ -145,7 +145,7 @@
public PortletApplicationDefinition upgrade()
{
- PortletApplicationDefinition app = new org.apache.pluto.descriptors.portlet.PortletAppType();
+ PortletApplicationDefinition app = new org.apache.pluto.container.om.portlet.impl.PortletAppType();
app.setVersion(version);
if (portlet != null)
{
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletCollectionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletCollectionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletCollectionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletCollectionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletInfoType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletInfoType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletInfoType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletInfoType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletPreferencesType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletPreferencesType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletPreferencesType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletPreferencesType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PreferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PreferenceType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PreferenceType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PreferenceType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityConstraintType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityConstraintType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityConstraintType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityRoleRefType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityRoleRefType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityRoleRefType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityRoleRefType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SupportsType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SupportsType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SupportsType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SupportsType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserAttributeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserAttributeType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserAttributeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserAttributeType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserDataConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserDataConstraintType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserDataConstraintType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserDataConstraintType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/package-info.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/package-info.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/package-info.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/package-info.java Tue Mar 10 16:25:11 2009
@@ -17,5 +17,5 @@
* @version $Id$
*/
@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.pluto.descriptors.portlet10;
+package org.apache.pluto.container.portlet10.impl;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.io.IOException;
import java.net.URL;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyPrintWriter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyPrintWriter.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyPrintWriter.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyPrintWriter.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.io.OutputStream;
import java.io.PrintWriter;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyServletOutputStream.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyServletOutputStream.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyServletOutputStream.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyServletOutputStream.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.io.IOException;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/Enumerator.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/Enumerator.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/Enumerator.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/Enumerator.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.util.Collection;
import java.util.Enumeration;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.io.IOException;
import java.io.PrintWriter;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.net.URLClassLoader;
import java.text.MessageFormat;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringUtils.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringUtils.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringUtils.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringUtils.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto.container.util;
import java.util.HashMap;
import java.util.Map;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ApplicationIdResolver.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ApplicationIdResolver.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import javax.servlet.ServletContext;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/AttributeApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/AttributeApplicationIdResolver.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/AttributeApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/AttributeApplicationIdResolver.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import javax.servlet.ServletContext;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/Configuration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/Configuration.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/Configuration.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/Configuration.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultApplicationIdResolver.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultApplicationIdResolver.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.net.MalformedURLException;
import java.net.URL;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultNamespaceMapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultNamespaceMapper.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultNamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultNamespaceMapper.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import org.apache.pluto.container.NamespaceMapper;
import org.apache.pluto.container.PortletWindowID;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultOptionalContainerServices.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultOptionalContainerServices.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultOptionalContainerServices.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultOptionalContainerServices.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import org.apache.pluto.container.CCPPProfileService;
import org.apache.pluto.container.NamespaceMapper;
@@ -28,7 +28,7 @@
import org.apache.pluto.container.driver.PortalDriverServices;
import org.apache.pluto.container.driver.PortletContextService;
import org.apache.pluto.container.driver.PortletRegistryService;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
+import org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl;
/**
* Default Optional Container Services and Portal Driver Services implementation.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortalAdministrationService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortalAdministrationService.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortalAdministrationService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortalAdministrationService.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletEnvironmentService.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletEnvironmentService.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -39,15 +39,15 @@
import org.apache.pluto.container.PortletResourceRequestContext;
import org.apache.pluto.container.PortletResourceResponseContext;
import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.internal.impl.ActionRequestImpl;
-import org.apache.pluto.internal.impl.ActionResponseImpl;
-import org.apache.pluto.internal.impl.EventRequestImpl;
-import org.apache.pluto.internal.impl.EventResponseImpl;
-import org.apache.pluto.internal.impl.PortletSessionImpl;
-import org.apache.pluto.internal.impl.RenderRequestImpl;
-import org.apache.pluto.internal.impl.RenderResponseImpl;
-import org.apache.pluto.internal.impl.ResourceRequestImpl;
-import org.apache.pluto.internal.impl.ResourceResponseImpl;
+import org.apache.pluto.container.impl.ActionRequestImpl;
+import org.apache.pluto.container.impl.ActionResponseImpl;
+import org.apache.pluto.container.impl.EventRequestImpl;
+import org.apache.pluto.container.impl.EventResponseImpl;
+import org.apache.pluto.container.impl.PortletSessionImpl;
+import org.apache.pluto.container.impl.RenderRequestImpl;
+import org.apache.pluto.container.impl.RenderResponseImpl;
+import org.apache.pluto.container.impl.ResourceRequestImpl;
+import org.apache.pluto.container.impl.ResourceResponseImpl;
public class DefaultPortletEnvironmentService implements PortletEnvironmentService
{
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletInvokerService.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletInvokerService.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.io.IOException;
@@ -45,7 +45,7 @@
import org.apache.pluto.container.PortletWindow;
import org.apache.pluto.container.driver.PortletContextService;
import org.apache.pluto.container.driver.PortletServlet;
-import org.apache.pluto.util.StringManager;
+import org.apache.pluto.container.util.StringManager;
/**
* Used internally to invoke/dispatch requests from the container to
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletPreferencesService.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletPreferencesService.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.util.Collections;
import java.util.HashMap;
@@ -30,17 +30,17 @@
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.PortletPreferencesService;
import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.impl.PortletPreferenceImpl;
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.Preference;
import org.apache.pluto.container.om.portlet.Preferences;
-import org.apache.pluto.internal.impl.PortletPreferenceImpl;
/**
* Default implementation of the portlet preferences service. The portlet
* preferences service is a singleton held by the pluto portlet container.
*
* @see javax.portlet.PortletPreferences
- * @see org.apache.pluto.internal.impl.PortletPreferencesImpl
+ * @see org.apache.pluto.container.impl.PortletPreferencesImpl
* @see javax.portlet.PortletPreferences
*
*/
@@ -99,7 +99,7 @@
* </p>
* @return the default preferences set
*
- * @see org.apache.pluto.descriptors.portlet.PreferenceType
+ * @see org.apache.pluto.container.om.portlet.impl.PreferenceType
*/
public Map<String,PortletPreference> getDefaultPreferences( PortletWindow portletWindow,
PortletRequest request )
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultUserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultUserInfoService.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultUserInfoService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultUserInfoService.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.util.Collections;
import java.util.Map;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DummyCCPPProfileServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DummyCCPPProfileServiceImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DummyCCPPProfileServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DummyCCPPProfileServiceImpl.java Tue Mar 10 16:25:11 2009
@@ -1,13 +1,13 @@
/**
*
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import javax.ccpp.Profile;
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.container.CCPPProfileService;
-import org.apache.pluto.internal.impl.DummyProfile;
+import org.apache.pluto.container.impl.DummyProfile;
/**
*
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/InitParameterApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/InitParameterApplicationIdResolver.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/InitParameterApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/InitParameterApplicationIdResolver.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import javax.servlet.ServletContext;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PlutoContainerServices.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PlutoContainerServices.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PlutoContainerServices.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PlutoContainerServices.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import javax.portlet.PortalContext;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletContextManager.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletContextManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletContextManager.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -38,12 +38,12 @@
import org.apache.pluto.container.driver.PortletRegistryEvent;
import org.apache.pluto.container.driver.PortletRegistryListener;
import org.apache.pluto.container.driver.PortletRegistryService;
+import org.apache.pluto.container.impl.Configuration;
+import org.apache.pluto.container.impl.PortletConfigImpl;
+import org.apache.pluto.container.impl.PortletContextImpl;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.container.om.portlet.PortletDefinition;
-import org.apache.pluto.internal.impl.Configuration;
-import org.apache.pluto.internal.impl.PortletConfigImpl;
-import org.apache.pluto.internal.impl.PortletContextImpl;
-import org.apache.pluto.util.ClasspathScanner;
+import org.apache.pluto.container.util.ClasspathScanner;
/**
* Manager used to cache the portlet configurations which have
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletDescriptorRegistry.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletDescriptorRegistry.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletDescriptorRegistry.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver.impl;
import java.io.InputStream;
import java.util.Map;
@@ -26,7 +26,7 @@
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.driver.PlutoConfigurationException;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.util.StringManager;
+import org.apache.pluto.container.util.StringManager;
/**
* Simple caching mechanism used to manage portlet descriptors. This mechanism
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=752156&r1=752155&r2=752156&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 Tue Mar 10 16:25:11 2009
@@ -18,7 +18,7 @@
import org.apache.pluto.container.NamespaceMapper;
import org.apache.pluto.container.PortletWindowID;
-import org.apache.pluto.core.DefaultNamespaceMapper;
+import org.apache.pluto.driver.impl.DefaultNamespaceMapper;
import org.apache.pluto.util.PlutoTestCase;
/**
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java Tue Mar 10 16:25:11 2009
@@ -24,6 +24,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.junit.After;
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ConfigurationTest.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ConfigurationTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ConfigurationTest.java Tue Mar 10 16:25:11 2009
@@ -1,5 +1,6 @@
package org.apache.pluto.internal.impl;
+import org.apache.pluto.container.impl.Configuration;
import org.apache.pluto.util.PlutoTestCase;
public class ConfigurationTest extends PlutoTestCase {
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java Tue Mar 10 16:25:11 2009
@@ -18,6 +18,7 @@
import java.util.Properties;
+import org.apache.pluto.container.impl.Environment;
import org.apache.pluto.util.PlutoTestCase;
/**
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java Tue Mar 10 16:25:11 2009
@@ -29,7 +29,8 @@
import org.apache.pluto.container.PortletURLProvider;
import org.apache.pluto.container.PortletWindow;
import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.core.PortletContainerImpl;
+import org.apache.pluto.container.impl.PortletContainerImpl;
+import org.apache.pluto.container.impl.RenderRequestImpl;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
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=752156&r1=752155&r2=752156&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 Tue Mar 10 16:25:11 2009
@@ -22,9 +22,10 @@
import junit.framework.Assert;
+import org.apache.pluto.container.impl.ResourceBundleFactory;
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.PortletInfo;
-import org.apache.pluto.descriptors.portlet.PortletType;
+import org.apache.pluto.container.om.portlet.impl.PortletType;
import org.apache.pluto.util.PlutoTestCase;
/**
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java Tue Mar 10 16:25:11 2009
@@ -16,6 +16,8 @@
*/
package org.apache.pluto.util;
+import org.apache.pluto.container.util.ArgumentUtility;
+
/**
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=752156&r1=752155&r2=752156&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 Tue Mar 10 16:25:11 2009
@@ -20,7 +20,7 @@
import java.lang.reflect.Method;
import org.apache.pluto.container.driver.PlutoServices;
-import org.apache.pluto.core.PlutoContainerServices;
+import org.apache.pluto.driver.impl.PlutoContainerServices;
import org.jmock.MockObjectTestCase;
/**
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java Tue Mar 10 16:25:11 2009
@@ -19,6 +19,8 @@
import java.util.Iterator;
import java.util.Map;
+import org.apache.pluto.container.util.StringUtils;
+
/**
* Test Class
*
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=752156&r1=752155&r2=752156&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 Tue Mar 10 16:25:11 2009
@@ -20,8 +20,8 @@
import org.apache.pluto.container.EventCoordinationService;
import org.apache.pluto.container.PortletRequestContextService;
-import org.apache.pluto.core.PlutoContainerServices;
import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.driver.impl.PlutoContainerServices;
/**
* The Portal Driver's <code>PortletContainerServices</code> implementation. The
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=752156&r1=752155&r2=752156&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 Tue Mar 10 16:25:11 2009
@@ -49,6 +49,7 @@
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;
@@ -61,7 +62,6 @@
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.url.impl.PortalURLParserImpl;
-import org.apache.pluto.internal.impl.EventImpl;
public class EventProviderImpl implements org.apache.pluto.container.EventProvider,
Cloneable {
Copied: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java?p2=portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.impl;
+package org.apache.pluto.driver.services.container;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java?p2=portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.impl;
+package org.apache.pluto.driver.services.container;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java?p2=portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.impl;
+package org.apache.pluto.driver.services.container;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -27,6 +27,7 @@
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletMimeResponseContext;
+import org.apache.pluto.container.PortletURLProvider;
import org.apache.pluto.container.PortletWindow;
/**
@@ -152,4 +153,13 @@
{
// TODO Auto-generated method stub
}
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.container.PortletMimeResponseContext#getPortletURLProvider()
+ */
+ public PortletURLProvider getPortletURLProvider()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java?p2=portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.impl;
+package org.apache.pluto.driver.services.container;
import java.util.Collection;
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRequestContextImpl.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRequestContextImpl.java?p2=portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRequestContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRequestContextImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.impl;
+package org.apache.pluto.driver.services.container;
import java.util.Enumeration;
import java.util.Locale;