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/14 04:20:22 UTC
svn commit: r753593 [2/2] - in /portals/pluto/trunk:
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/
pluto-portal-driver/src/main/java/org/apach...
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?rev=753593&r1=753592&r2=753593&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Sat Mar 14 03:20:18 2009
@@ -45,14 +45,14 @@
<beans>
<bean id="PlutoServices"
- class="org.apache.pluto.driver.PlutoServices"
+ class="org.apache.pluto.container.driver.PlutoServices"
singleton="true">
<constructor-arg><ref bean="RequiredContainerServices"/></constructor-arg>
</bean>
<bean id="RequiredContainerServices"
name="OptionalContainerServices"
- class="org.apache.pluto.container.driver.impl.PlutoDriverServicesImpl"
+ class="org.apache.pluto.container.driver.impl.PortalDriverServicesImpl"
singleton="true">
<constructor-arg><ref bean="PortalContext"/></constructor-arg>
<constructor-arg><ref bean="PortletRequestContextService"/></constructor-arg>
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java?rev=753593&r1=753592&r2=753593&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java Sat Mar 14 03:20:18 2009
@@ -66,7 +66,7 @@
}
throw new IOException(e.getMessage());
}
- PortletApplicationDefinition portletAppDD = new PortletAppDescriptorServiceImpl().read(portletXmlIn);
+ PortletApplicationDefinition portletAppDD = new PortletAppDescriptorServiceImpl().read("test", "/test", portletXmlIn);
portletXmlIn.close();
for (PortletDefinition portlet : portletAppDD.getPortlets())
{
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java?rev=753593&r1=753592&r2=753593&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java Sat Mar 14 03:20:18 2009
@@ -121,7 +121,7 @@
while ( ( warEntry = warIn.getNextJarEntry() ) != null ) {
if ( Assembler.PORTLET_XML.equals( warEntry.getName() ) ) {
- portletApp = portletSvc.read(
+ portletApp = portletSvc.read( "test", "/test",
new ByteArrayInputStream( IOUtils.toByteArray( warIn ) ) );
}
if ( Assembler.SERVLET_XML.equals( warEntry.getName() ) ) {
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java?rev=753593&r1=753592&r2=753593&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java Sat Mar 14 03:20:18 2009
@@ -104,7 +104,7 @@
JarInputStream warIn = new JarInputStream( earIn );
while ( ( warEntry = warIn.getNextJarEntry() ) != null ) {
if ( Assembler.PORTLET_XML.equals( warEntry.getName() ) ) {
- portletApp = portletSvc.read(
+ portletApp = portletSvc.read( "test", "/test",
new ByteArrayInputStream( IOUtils.toByteArray( warIn ) ) );
}
if ( Assembler.SERVLET_XML.equals( warEntry.getName() ) ) {
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java?rev=753593&r1=753592&r2=753593&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java Sat Mar 14 03:20:18 2009
@@ -85,7 +85,7 @@
protected void verifyAssembly( InputStream webXml, InputStream portletXml ) throws Exception {
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
PlutoWebXmlRewriter webXmlRewriter = new PlutoWebXmlRewriter( webXml );
- PortletApplicationDefinition portletApp = portletSvc.read( portletXml );
+ PortletApplicationDefinition portletApp = portletSvc.read( "test", "/test", portletXml );
assertNotNull( "Web Application Descripter was null.", webXmlRewriter );
assertNotNull( "Portlet Application Descriptor was null.", portletApp );
@@ -117,7 +117,7 @@
if ( Assembler.PORTLET_XML.equals( tempEntry.getName() ) ) {
IOUtils.copy( assembledWarIn, portletXmlBytes );
- portletApp = portletSvc.read( new ByteArrayInputStream( portletXmlBytes.toByteArray() ) );
+ portletApp = portletSvc.read( "test", "/test", new ByteArrayInputStream( portletXmlBytes.toByteArray() ) );
}
if ( Assembler.SERVLET_XML.equals( tempEntry.getName() ) ) {
IOUtils.copy( assembledWarIn, webXmlBytes );