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/05/04 01:26:38 UTC
svn commit: r653160 - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/pluto/core/
pluto-container/src/main/java/org/apache/pluto/internal/impl/
pluto-container...
Author: ate
Date: Sat May 3 16:26:38 2008
New Revision: 653160
URL: http://svn.apache.org/viewvc?rev=653160&view=rev
Log:
Promoting NamespaceMapper as a OptionalContainerService and thus moving its interface to the container-api
Added:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java (contents, props changed)
- copied, changed from r653159, portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java
Removed:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.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-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java (from r653159, portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java&r1=653159&r2=653160&rev=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java Sat May 3 16:26:38 2008
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util;
+package org.apache.pluto;
-import org.apache.pluto.PortletWindowID;
/**
**/
Propchange: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java?rev=653160&r1=653159&r2=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java Sat May 3 16:26:38 2008
@@ -95,4 +95,10 @@
*/
UserInfoService getUserInfoService();
+ /**
+ * Returns the NamespaceMapper used to retrieve the Portal
+ * specific PortletWindow namespace and encoding/decoding
+ * of PortletWindow parameters in a PortalURL
+ */
+ NamespaceMapper getNamespaceMapper();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java?rev=653160&r1=653159&r2=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java Sat May 3 16:26:38 2008
@@ -16,6 +16,7 @@
*/
package org.apache.pluto.core;
+import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.spi.optional.PortalAdministrationService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
@@ -24,6 +25,7 @@
import org.apache.pluto.spi.optional.PortletPreferencesService;
import org.apache.pluto.spi.optional.PortletRegistryService;
import org.apache.pluto.spi.optional.UserInfoService;
+import org.apache.pluto.util.impl.NamespaceMapperImpl;
/**
* Default Optional Container Services implementation.
@@ -40,6 +42,7 @@
private PortletInfoService portletInfoService;
private PortalAdministrationService portalAdministrationService;
private UserInfoService userInfoService;
+ private NamespaceMapper namespaceMapper;
/**
@@ -54,6 +57,7 @@
portletInfoService = new DefaultPortletInfoService();
portalAdministrationService = new DefaultPortalAdministrationService();
userInfoService = new DefaultUserInfoService();
+ namespaceMapper = new NamespaceMapperImpl();
}
/**
@@ -92,10 +96,13 @@
portalAdministrationService = root.getPortalAdministrationService();
}
- if(root.getUserInfoService() != null) {
- userInfoService = root.getUserInfoService();
- }
-
+ if(root.getUserInfoService() != null) {
+ userInfoService = root.getUserInfoService();
+ }
+
+ if(root.getNamespaceMapper() != null) {
+ namespaceMapper = root.getNamespaceMapper();
+ }
}
@@ -130,5 +137,8 @@
return userInfoService;
}
+ public NamespaceMapper getNamespaceMapper() {
+ return namespaceMapper;
+ }
}
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=653160&r1=653159&r2=653160&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 Sat May 3 16:26:38 2008
@@ -54,6 +54,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.Constants;
+import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
@@ -70,7 +71,6 @@
import org.apache.pluto.spi.optional.UserInfoService;
import org.apache.pluto.util.ArgumentUtility;
import org.apache.pluto.util.Enumerator;
-import org.apache.pluto.util.NamespaceMapper;
import org.apache.pluto.util.StringManager;
import org.apache.pluto.util.StringUtils;
import org.apache.pluto.util.impl.NamespaceMapperImpl;
@@ -116,7 +116,7 @@
private Vector contentTypes;
/** TODO: javadoc */
- private NamespaceMapper mapper = new NamespaceMapperImpl();
+ private NamespaceMapper mapper;
/** FIXME: do we really need this?
* Flag indicating if the HTTP-Body has been accessed. */
@@ -163,6 +163,7 @@
this.portletWindow = portletWindow;
this.portalContext = container.getRequiredContainerServices().getPortalContext();
this.servletRequest = servletRequest;
+ this.mapper = container.getOptionalContainerServices().getNamespaceMapper();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java?rev=653160&r1=653159&r2=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java Sat May 3 16:26:38 2008
@@ -33,13 +33,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletResponse;
import org.apache.pluto.spi.ResourceURLProvider;
import org.apache.pluto.util.ArgumentUtility;
import org.apache.pluto.util.DummyPrintWriter;
-import org.apache.pluto.util.NamespaceMapper;
import org.apache.pluto.util.PrintWriterServletOutputStream;
import org.apache.pluto.util.impl.NamespaceMapperImpl;
import org.w3c.dom.DOMException;
@@ -72,7 +72,7 @@
private ServletOutputStream wrappedWriter;
- private NamespaceMapper mapper = new NamespaceMapperImpl();
+ private NamespaceMapper mapper;
/** True if we are in an include call. */
private boolean included = false;
@@ -92,6 +92,7 @@
this.container = container;
this.httpServletRequest = servletRequest;
this.portletWindow = portletWindow;
+ this.mapper = container.getOptionalContainerServices().getNamespaceMapper();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java?rev=653160&r1=653159&r2=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java Sat May 3 16:26:38 2008
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.util.impl;
+import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.PortletWindowID;
-import org.apache.pluto.util.NamespaceMapper;
/**
* Default implementation of <code>NamespaceMapper</code> interface.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java?rev=653160&r1=653159&r2=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java Sat May 3 16:26:38 2008
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.util.impl;
+import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.PortletWindowID;
-import org.apache.pluto.util.NamespaceMapper;
import org.apache.pluto.util.PlutoTestCase;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.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/ContainerServicesImpl.java?rev=653160&r1=653159&r2=653160&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Sat May 3 16:26:38 2008
@@ -18,6 +18,7 @@
import javax.portlet.PortalContext;
+import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.driver.config.DriverConfiguration;
@@ -117,5 +118,8 @@
return null;
}
+ public NamespaceMapper getNamespaceMapper() {
+ return null;
+ }
}