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 2008/10/15 19:18:58 UTC
svn commit: r704963 - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/src/main/java/org/apache/pluto/om/common/
pluto-container-api/src/main/java/org/apache/pluto/om/portlet/
pluto-container/src/main/java/org/apache/pluto/internal/i...
Author: ate
Date: Wed Oct 15 10:18:56 2008
New Revision: 704963
URL: http://svn.apache.org/viewvc?rev=704963&view=rev
Log:
Cleanup after PLUTO-509 & PLUTO-510:
As pluto.om.common isn't really used for shared functionality anymore, moving those interfaces into the om.portlet package now.
As the Icon interface was only used by the pluto.om.servlet interfaces, it is no longer needed and thus deleted as well.
Added:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Description.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/DisplayName.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/InitParam.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityRoleRef.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserDataConstraint.java
- copied, changed from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java
Removed:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomPortletModeType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomWindowStateType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DescriptionType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DisplayNameType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/InitParamType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityConstraintType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityRoleRefType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserAttributeType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserDataConstraintType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DescriptionType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DisplayNameType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/InitParamType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParameterType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityRoleRefType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserDataConstraintType.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java Wed Oct 15 10:18:56 2008
@@ -16,7 +16,6 @@
package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
public interface CustomPortletMode {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java Wed Oct 15 10:18:56 2008
@@ -16,7 +16,6 @@
package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
public interface CustomWindowState {
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Description.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Description.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Description.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java&r1=704743&r2=704963&rev=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Description.java Wed Oct 15 10:18:56 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.om.common;
+package org.apache.pluto.om.portlet;
public interface Description {
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/DisplayName.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/DisplayName.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/DisplayName.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java&r1=704743&r2=704963&rev=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/DisplayName.java Wed Oct 15 10:18:56 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.om.common;
+package org.apache.pluto.om.portlet;
public interface DisplayName {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java Wed Oct 15 10:18:56 2008
@@ -20,7 +20,6 @@
import javax.xml.namespace.QName;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
public interface EventDefinition
{
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java Wed Oct 15 10:18:56 2008
@@ -18,9 +18,6 @@
import java.util.List;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.InitParam;
public interface Filter {
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/InitParam.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/InitParam.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/InitParam.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java&r1=704743&r2=704963&rev=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/InitParam.java Wed Oct 15 10:18:56 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.om.common;
+package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java Wed Oct 15 10:18:56 2008
@@ -16,8 +16,6 @@
package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
public interface Listener {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java Wed Oct 15 10:18:56 2008
@@ -18,10 +18,6 @@
import java.util.List;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.InitParam;
-import org.apache.pluto.om.common.SecurityRoleRef;
public interface Portlet {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java Wed Oct 15 10:18:56 2008
@@ -20,7 +20,6 @@
import javax.xml.namespace.QName;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
public interface PublicRenderParameter {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java Wed Oct 15 10:18:56 2008
@@ -16,8 +16,6 @@
package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.UserDataConstraint;
public interface SecurityConstraint {
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityRoleRef.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityRoleRef.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityRoleRef.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java&r1=704743&r2=704963&rev=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityRoleRef.java Wed Oct 15 10:18:56 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.om.common;
+package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java Wed Oct 15 10:18:56 2008
@@ -16,7 +16,6 @@
package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
public interface UserAttribute {
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserDataConstraint.java (from r704743, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserDataConstraint.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserDataConstraint.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java&r1=704743&r2=704963&rev=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserDataConstraint.java Wed Oct 15 10:18:56 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.om.common;
+package org.apache.pluto.om.portlet;
import org.apache.pluto.om.ElementFactoryList;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java Wed Oct 15 10:18:56 2008
@@ -35,9 +35,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.internal.InternalPortletConfig;
-import org.apache.pluto.om.common.InitParam;
import org.apache.pluto.om.portlet.ContainerRuntimeOption;
import org.apache.pluto.om.portlet.EventDefinitionReference;
+import org.apache.pluto.om.portlet.InitParam;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.PortletApp;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Wed Oct 15 10:18:56 2008
@@ -59,8 +59,8 @@
import org.apache.pluto.PortletEntity;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.spi.optional.RequestAttributeService;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomPortletModeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomPortletModeType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomPortletModeType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomPortletModeType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.portlet.CustomPortletMode;
+import org.apache.pluto.om.portlet.Description;
/**
* A custom portlet mode that one or more portlets in this portlet application supports. Used in: portlet-app <p>Java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomWindowStateType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomWindowStateType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomWindowStateType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomWindowStateType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.portlet.CustomWindowState;
+import org.apache.pluto.om.portlet.Description;
/**
* A custom window state that one or more portlets in this portlet application supports. Used in: portlet-app <p>Java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DescriptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DescriptionType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DescriptionType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DescriptionType.java Wed Oct 15 10:18:56 2008
@@ -26,7 +26,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
/**
* The description element is used to provide text describing the parent element. The description element should include
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DisplayNameType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DisplayNameType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DisplayNameType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DisplayNameType.java Wed Oct 15 10:18:56 2008
@@ -24,7 +24,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.common.DisplayName;
+import org.apache.pluto.om.portlet.DisplayName;
/**
* The display-name type contains a short name that is intended to be displayed by tools. It is used by display-name
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterType.java Wed Oct 15 10:18:56 2008
@@ -25,10 +25,10 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.Filter;
+import org.apache.pluto.om.portlet.InitParam;
/**
* The filter element specifies a filter that can transform the content of portlet requests and portlet responses.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/InitParamType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/InitParamType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/InitParamType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/InitParamType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.InitParam;
/**
* The init-param element contains a name/value pair as an initialization param of the portlet Used in:portlet <p>Java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java Wed Oct 15 10:18:56 2008
@@ -30,16 +30,16 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.InitParam;
-import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.portlet.ContainerRuntimeOption;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.EventDefinitionReference;
+import org.apache.pluto.om.portlet.InitParam;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityConstraintType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityConstraintType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityConstraintType.java Wed Oct 15 10:18:56 2008
@@ -25,10 +25,10 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.UserDataConstraint;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.PortletCollection;
import org.apache.pluto.om.portlet.SecurityConstraint;
+import org.apache.pluto.om.portlet.UserDataConstraint;
/**
* The security-constraintType is used to associate intended security constraints with one or more portlets. Used in:
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityRoleRefType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityRoleRefType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityRoleRefType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityRoleRefType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.SecurityRoleRef;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
/**
* The security-role-ref element contains the declaration of a security role reference in the code of the web
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserAttributeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserAttributeType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserAttributeType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserAttributeType.java Wed Oct 15 10:18:56 2008
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
import org.apache.pluto.om.portlet.UserAttribute;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserDataConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserDataConstraintType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserDataConstraintType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserDataConstraintType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.UserDataConstraint;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.UserDataConstraint;
/**
* The user-data-constraintType is used to indicate how data communicated between the client and portlet should be
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.portlet.CustomPortletMode;
+import org.apache.pluto.om.portlet.Description;
/**
* A custom portlet mode that one or more portlets in this portlet application supports. If the portal does not need to
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.portlet.CustomWindowState;
+import org.apache.pluto.om.portlet.Description;
/**
* A custom window state that one or more portlets in this portlet application supports. Used in: portlet-app <p>Java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DescriptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DescriptionType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DescriptionType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DescriptionType.java Wed Oct 15 10:18:56 2008
@@ -26,7 +26,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
/**
* The description element is used to provide text describing the parent element. The description element should include
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DisplayNameType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DisplayNameType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DisplayNameType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DisplayNameType.java Wed Oct 15 10:18:56 2008
@@ -24,7 +24,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.common.DisplayName;
+import org.apache.pluto.om.portlet.DisplayName;
/**
* The display-name type contains a short name that is intended to be displayed by tools. It is used by display-name
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionType.java Wed Oct 15 10:18:56 2008
@@ -30,7 +30,7 @@
import javax.xml.namespace.QName;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
import org.apache.pluto.om.portlet.EventDefinition;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterType.java Wed Oct 15 10:18:56 2008
@@ -25,10 +25,10 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.Filter;
+import org.apache.pluto.om.portlet.InitParam;
/**
* The filter element specifies a filter that can transform the content of portlet requests and portlet responses.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/InitParamType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/InitParamType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/InitParamType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/InitParamType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.InitParam;
/**
* The init-param element contains a name/value pair as an initialization param of the portlet Used in:portlet <p>Java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerType.java Wed Oct 15 10:18:56 2008
@@ -26,8 +26,8 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.Listener;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java Wed Oct 15 10:18:56 2008
@@ -30,16 +30,16 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.InitParam;
-import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.portlet.ContainerRuntimeOption;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.EventDefinitionReference;
+import org.apache.pluto.om.portlet.InitParam;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.om.portlet.PortletPreferences;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParameterType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParameterType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParameterType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParameterType.java Wed Oct 15 10:18:56 2008
@@ -30,7 +30,7 @@
import javax.xml.namespace.QName;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
import org.apache.pluto.om.portlet.PublicRenderParameter;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintType.java Wed Oct 15 10:18:56 2008
@@ -25,10 +25,10 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.UserDataConstraint;
+import org.apache.pluto.om.portlet.DisplayName;
import org.apache.pluto.om.portlet.PortletCollection;
import org.apache.pluto.om.portlet.SecurityConstraint;
+import org.apache.pluto.om.portlet.UserDataConstraint;
/**
* The security-constraintType is used to associate intended security constraints with one or more portlets. Used in:
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityRoleRefType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityRoleRefType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityRoleRefType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityRoleRefType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.SecurityRoleRef;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
/**
* The security-role-ref element contains the declaration of a security role reference in the code of the web
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeType.java Wed Oct 15 10:18:56 2008
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
import org.apache.pluto.om.portlet.UserAttribute;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserDataConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserDataConstraintType.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserDataConstraintType.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserDataConstraintType.java Wed Oct 15 10:18:56 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.UserDataConstraint;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.UserDataConstraint;
/**
* The user-data-constraintType is used to indicate how data communicated between the client and portlet should be
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java?rev=704963&r1=704962&r2=704963&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java Wed Oct 15 10:18:56 2008
@@ -23,7 +23,7 @@
import javax.portlet.PortletContext;
import javax.portlet.filter.FilterConfig;
-import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.InitParam;
/**
*