You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/03/18 14:59:24 UTC
svn commit: r755599 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/
jetspeed-portal-resources/src/main/resources/assembly/
Author: woonsan
Date: Wed Mar 18 13:59:21 2009
New Revision: 755599
URL: http://svn.apache.org/viewvc?rev=755599&view=rev
Log:
JS2-871: Upgrade Pluto container
- removes unused pluto components in assembly xmls.
- changes the property name in registry ojb configuration.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml?rev=755599&r1=755598&r2=755599&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml Wed Mar 18 13:59:21 2009
@@ -145,7 +145,7 @@
jdbc-type="VARCHAR"
/>
<field-descriptor
- name="contextRoot"
+ name="contextPath"
column="CONTEXT_ROOT"
jdbc-type="VARCHAR"
/>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=755599&r1=755598&r2=755599&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Wed Mar 18 13:59:21 2009
@@ -48,7 +48,7 @@
<bean id="org.apache.jetspeed.descriptor.JetspeedDescriptorService"
class="org.apache.jetspeed.descriptor.JetspeedDescriptorServiceImpl">
<meta key="j2:cat" value="default"/>
- <constructor-arg><bean class="org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl"/></constructor-arg>
+ <constructor-arg><bean class="org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl"/></constructor-arg>
</bean>
<bean id="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start"
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=755599&r1=755598&r2=755599&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml Wed Mar 18 13:59:21 2009
@@ -106,11 +106,11 @@
</bean>
<!-- Pluto Portlet Container -->
- <bean id="Pluto" class="org.apache.pluto.core.PortletContainerImpl">
+ <bean id="Pluto" class="org.apache.pluto.container.impl.PortletContainerImpl">
<meta key="j2:cat" value="default" />
<constructor-arg><value>${portal.name}</value></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.RequiredPlutoServices"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.OptionalPlutoServices"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.pluto.services.OptionalPlutoServices"/></constructor-arg>
</bean>
<!-- Jetspeed 2's wrapper around Pluto -->
@@ -156,4 +156,4 @@
<meta key="j2:cat" value="default" />
</bean>
-</beans>
+</beans>
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=755599&r1=755598&r2=755599&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml Wed Mar 18 13:59:21 2009
@@ -20,23 +20,6 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <!-- ========================================== -->
- <!-- Declare Pluto Service Accessors, top level -->
- <!-- ========================================== -->
-
- <bean id="org.apache.pluto.services.PlutoContainerServices"
- class="org.apache.pluto.core.PlutoContainerServices">
- <meta key="j2:cat" value="default" />
- <constructor-arg><ref bean="org.apache.pluto.services.RequiredPlutoServices"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.OptionalPlutoServices"/></constructor-arg>
- </bean>
-
- <bean id="org.apache.pluto.services.PlutoServices"
- class="org.apache.pluto.services.PlutoServices">
- <meta key="j2:cat" value="default" />
- <constructor-arg><ref bean="org.apache.pluto.services.PlutoContainerServices"/></constructor-arg>
- </bean>
-
<!-- ====================================================== -->
<!-- Declare Pluto Service Accessors, Required -->
<!-- ====================================================== -->
@@ -44,74 +27,38 @@
<bean id="org.apache.pluto.services.RequiredPlutoServices"
class="org.apache.jetspeed.container.services.JetspeedRequiredPlutoServices">
<meta key="j2:cat" value="default" />
- <constructor-arg><ref bean="org.apache.pluto.services.CCPPProfileService"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.ContainerInvocationService"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.ContainerCallbackProviders"/></constructor-arg>
<constructor-arg><ref bean="PortalContext"/></constructor-arg>
</bean>
<bean id="org.apache.pluto.services.CCPPProfileService"
- class="org.apache.pluto.core.DummyCCPPProfileServiceImpl">
- <meta key="j2:cat" value="default" />
+ class="org.apache.pluto.container.driver.impl.DummyCCPPProfileServiceImpl">
+ <meta key="j2:cat" value="default" />
</bean>
- <bean id='org.apache.pluto.services.ContainerInvocationService'
- class='org.apache.pluto.core.ContainerInvocationServiceImpl'>
- <meta key="j2:cat" value="default" />
- </bean>
-
- <!-- ====================================================== -->
- <!-- Pluto Container Callbacks -->
- <!-- ====================================================== -->
-
-
- <bean id="org.apache.pluto.services.ContainerCallbackProviders"
- class="org.apache.jetspeed.container.services.JetspeedPortalCallbackServices">
+ <bean id='org.apache.jetspeed.events.PortletEventQueue'
+ class='org.apache.jetspeed.events.PortletEventQueueImpl'>
<meta key="j2:cat" value="default" />
-<!-- <constructor-arg><ref bean="org.apache.pluto.services.PortletURLProviderImpl"/></constructor-arg> (currently doing a 'new')
- <constructor-arg><ref bean="org.apache.pluto.services.ResourceURLProviderImpl"/></constructor-arg> (currently doing a 'new')
--->
- <constructor-arg><ref bean="org.apache.pluto.services.PropertyManager"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.FilterManager"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.PortletURLListener"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.EventCoordinationService"/></constructor-arg>
+ </bean>
+
+ <bean id='org.apache.pluto.services.EventCoordinationService'
+ class='org.apache.jetspeed.events.EventCoordinationServiceImpl'>
+ <meta key="j2:cat" value="default" />
+ <constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.events.PortletEventQueue"/></constructor-arg>
+ <constructor-arg><ref bean="PortalStatistics"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.security.SecurityAccessController" /></constructor-arg>
+ <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
+ before rendering a portlet. If security check fails, do not fire events
+ -->
+ <constructor-arg type="boolean"><value>true</value></constructor-arg>
+ </bean>
+
+ <bean id='org.apache.pluto.services.FilterManager'
+ class='org.apache.jetspeed.container.providers.FilterManagerImpl'>
+ <meta key="j2:cat" value="default" />
</bean>
-
- <bean id='org.apache.pluto.services.PropertyManager'
- class="org.apache.pluto.core.DefaultPropertyManager">
- <meta key="j2:cat" value="default" />
- </bean>
-
- <bean id='org.apache.jetspeed.events.PortletEventQueue'
- class='org.apache.jetspeed.events.PortletEventQueueImpl'>
- <meta key="j2:cat" value="default" />
- </bean>
-
- <bean id='org.apache.pluto.services.EventCoordinationService'
- class='org.apache.jetspeed.events.EventCoordinationServiceImpl'>
- <meta key="j2:cat" value="default" />
- <constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.jetspeed.events.PortletEventQueue"/></constructor-arg>
- <constructor-arg><ref bean="PortalStatistics"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.jetspeed.security.SecurityAccessController" /></constructor-arg>
- <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
- before rendering a portlet. If security check fails, do not fire events
- -->
- <constructor-arg type="boolean"><value>true</value></constructor-arg>
- </bean>
-
- <bean id='org.apache.pluto.services.FilterManager'
- class='org.apache.jetspeed.container.providers.FilterManagerImpl'>
- <meta key="j2:cat" value="default" />
- </bean>
-
- <bean id='org.apache.pluto.services.PortletURLListener'
- class='org.apache.jetspeed.container.providers.PortletURLListenerImpl'>
- <meta key="j2:cat" value="default" />
- </bean>
-
<!-- ====================================================== -->
<!-- Declare Pluto Service Accessors, Optional -->
<!-- ====================================================== -->
@@ -120,25 +67,16 @@
class="org.apache.jetspeed.container.services.JetspeedOptionalPlutoServices">
<meta key="j2:cat" value="default" />
<constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.PortalAdministrationService"/></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.PortletEnvironmentService"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.PortletInfoService"/></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.UserInfoService"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.RequestAttributeService"/></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.PortletInvokerService"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.PlutoRegistryServiceAdaptor"/></constructor-arg>
<constructor-arg><ref bean="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider"/></constructor-arg>
</bean>
<bean id="org.apache.pluto.services.NamespaceMapper"
class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
<meta key="j2:cat" value="default" />
- <constructor-arg index="0"><value>js_</value></constructor-arg>
- </bean>
-
- <bean id="org.apache.pluto.services.PortalAdministrationService"
- class="org.apache.pluto.core.DefaultPortalAdministrationService">
- <meta key="j2:cat" value="default" />
+ <constructor-arg index="0"><value>js_</value></constructor-arg>
</bean>
<bean id="org.apache.pluto.services.PortletEnvironmentService"
@@ -146,31 +84,13 @@
<meta key="j2:cat" value="default" />
</bean>
- <bean id="org.apache.pluto.services.PortletInfoService"
- class="org.apache.pluto.core.DefaultPortletInfoService">
- <meta key="j2:cat" value="default" />
- </bean>
-
- <bean id="org.apache.pluto.services.RequestAttributeService"
- class="org.apache.pluto.core.DefaultRequestAttributeService">
- <meta key="j2:cat" value="default" />
- <constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.UserInfoService"/></constructor-arg>
- </bean>
-
<bean id="org.apache.pluto.services.PortletInvokerService"
class="org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService">
- <meta key="j2:cat" value="default" />
- <constructor-arg index="0"><ref bean="javax.servlet.ServletConfig" /></constructor-arg>
- <constructor-arg index="1"><ref bean="PortalContext" /></constructor-arg>
- <constructor-arg index="2"><ref bean="portletFactory" /></constructor-arg>
+ <meta key="j2:cat" value="default" />
+ <constructor-arg index="0"><ref bean="javax.servlet.ServletConfig" /></constructor-arg>
+ <constructor-arg index="1"><ref bean="PortalContext" /></constructor-arg>
+ <constructor-arg index="2"><ref bean="portletFactory" /></constructor-arg>
<constructor-arg index="3"><ref bean="PortletRequestResponseUnwrapper"/></constructor-arg>
</bean>
- <bean id="org.apache.pluto.services.PlutoRegistryServiceAdaptor"
- class="org.apache.jetspeed.components.portletregistry.PlutoRegistryAdaptor">
- <meta key="j2:cat" value="default" />
- <constructor-arg><ref bean="portletRegistry"/></constructor-arg>
- </bean>
-
</beans>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org