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 ta...@apache.org on 2008/10/28 00:33:41 UTC
svn commit: r708384 - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/src/main/java/org/apache/pluto/
pluto-container-api/src/main/java/org/apache/pluto/services/
pluto-container-api/src/main/java/org/apache/pluto/spi/optional/ plut...
Author: taylor
Date: Mon Oct 27 16:33:41 2008
New Revision: 708384
URL: http://svn.apache.org/viewvc?rev=708384&view=rev
Log:
https://issues.apache.org/jira/browse/PLUTO-481
make the descriptor service a formal optional service
Added:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletAppDescriptorService.java
- copied, changed from r708231, portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorService.java
Removed:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorService.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-api/src/main/java/org/apache/pluto/services/PlutoServices.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/core/PlutoContainerServices.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
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=708384&r1=708383&r2=708384&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 Mon Oct 27 16:33:41 2008
@@ -17,6 +17,7 @@
package org.apache.pluto;
import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.spi.optional.PortletInvokerService;
@@ -110,4 +111,12 @@
* of PortletWindow parameters in a PortalURL
*/
NamespaceMapper getNamespaceMapper();
+
+ /**
+ * Returns the portlet application descriptor service used to marshall descriptor streams
+ *
+ * @return the descriptor service
+ */
+ PortletAppDescriptorService getDescriptorService();
+
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java Mon Oct 27 16:33:41 2008
@@ -23,6 +23,7 @@
import org.apache.pluto.spi.ContainerInvocationService;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.spi.optional.PortletInvokerService;
@@ -112,4 +113,8 @@
return provider.getUserInfoService();
}
+ public PortletAppDescriptorService getDescriptorService()
+ {
+ return provider.getDescriptorService();
+ }
}
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletAppDescriptorService.java (from r708231, portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletAppDescriptorService.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletAppDescriptorService.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorService.java&r1=708231&r2=708384&rev=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletAppDescriptorService.java Mon Oct 27 16:33:41 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.pluto.descriptors.services.jaxb;
+package org.apache.pluto.spi.optional;
import java.io.IOException;
import java.io.InputStream;
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=708384&r1=708383&r2=708384&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 Mon Oct 27 16:33:41 2008
@@ -18,7 +18,9 @@
import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.OptionalContainerServices;
+import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.spi.optional.PortletInvokerService;
@@ -44,7 +46,7 @@
private UserInfoService userInfoService;
private RequestAttributeService requestAttributeService;
private NamespaceMapper namespaceMapper;
-
+ private PortletAppDescriptorService descriptorService;
/**
* Constructs an instance using the default portlet preferences service
@@ -60,6 +62,7 @@
userInfoService = new DefaultUserInfoService();
namespaceMapper = new DefaultNamespaceMapper();
requestAttributeService = new DefaultRequestAttributeService(namespaceMapper, userInfoService);
+ descriptorService = new PortletAppDescriptorServiceImpl();
}
/**
@@ -109,6 +112,11 @@
if(root.getNamespaceMapper() != null) {
namespaceMapper = root.getNamespaceMapper();
}
+
+ if (descriptorService == null)
+ {
+ descriptorService = new PortletAppDescriptorServiceImpl();
+ }
}
@@ -150,5 +158,11 @@
public NamespaceMapper getNamespaceMapper() {
return namespaceMapper;
}
+
+ public PortletAppDescriptorService getDescriptorService()
+ {
+ return this.descriptorService;
+ }
+
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java Mon Oct 27 16:33:41 2008
@@ -21,11 +21,13 @@
import org.apache.pluto.NamespaceMapper;
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.RequiredContainerServices;
+import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.services.ContainerServices;
import org.apache.pluto.spi.CCPPProfileService;
import org.apache.pluto.spi.ContainerInvocationService;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.spi.optional.PortletInvokerService;
@@ -57,6 +59,7 @@
private UserInfoService userInfoService;
private RequestAttributeService requestAttributeService;
private NamespaceMapper namespaceMapper;
+ private PortletAppDescriptorService descriptorService;
public PlutoContainerServices()
{
@@ -117,7 +120,10 @@
requestAttributeService = new DefaultRequestAttributeService(optionalServices.getNamespaceMapper(), optionalServices.getUserInfoService());
namespaceMapper = optionalServices.getNamespaceMapper();
if (namespaceMapper == null)
- namespaceMapper = new DefaultNamespaceMapper();
+ namespaceMapper = new DefaultNamespaceMapper();
+ descriptorService = optionalServices.getDescriptorService();
+ if (descriptorService == null)
+ descriptorService = new PortletAppDescriptorServiceImpl();
}
protected void createDefaultOptionalServices()
@@ -132,7 +138,7 @@
userInfoService = new DefaultUserInfoService();
namespaceMapper = new DefaultNamespaceMapper();
requestAttributeService = new DefaultRequestAttributeService(namespaceMapper, userInfoService);
-
+ descriptorService = new PortletAppDescriptorServiceImpl();
}
protected void createDefaultRequiredServices()
@@ -222,4 +228,10 @@
{
return this.namespaceMapper;
}
+
+ public PortletAppDescriptorService getDescriptorService()
+ {
+ return this.descriptorService;
+ }
+
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java Mon Oct 27 16:33:41 2008
@@ -25,8 +25,8 @@
import org.apache.pluto.PlutoConfigurationException;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorService;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.util.StringManager;
/**
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java Mon Oct 27 16:33:41 2008
@@ -11,8 +11,8 @@
import javax.xml.bind.Unmarshaller;
import org.apache.pluto.descriptors.portlet.PortletAppType;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorService;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
/**
* JAXB implementation of the xml2java binding
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java Mon Oct 27 16:33:41 2008
@@ -26,10 +26,10 @@
import java.util.jar.JarInputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java Mon Oct 27 16:33:41 2008
@@ -24,10 +24,10 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java?rev=708384&r1=708383&r2=708384&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java Mon Oct 27 16:33:41 2008
@@ -30,10 +30,10 @@
import junit.framework.TestCase;
import org.apache.commons.io.IOUtils;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.spi.optional.PortletAppDescriptorService;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.descriptors.web.PlutoWebXmlRewriter;