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/10/09 12:41:36 UTC
svn commit: r823511 - in /portals/jetspeed-2/portal/trunk: ./
components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/
components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/om/portlet10/impl/
jetspeed-portal-resour...
Author: woonsan
Date: Fri Oct 9 10:41:35 2009
New Revision: 823511
URL: http://svn.apache.org/viewvc?rev=823511&view=rev
Log:
JS2-1061: Reverting temporary changes because pluto-2 has been fixed for the same issue. (See PLUTO-580.)
Removed:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedPortletAppDescriptorServiceImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/om/portlet10/impl/
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/trunk/pom.xml
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=823511&r1=823510&r2=823511&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 Fri Oct 9 10:41:35 2009
@@ -44,17 +44,13 @@
<bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory">
<meta key="j2:cat" value="default" />
</bean>
-
+
<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.jetspeed.descriptor.JetspeedPortletAppDescriptorServiceImpl">
- <constructor-arg><value>true</value></constructor-arg>
- </bean>
- </constructor-arg>
- </bean>
-
+ <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"
destroy-method="stop">
<meta key="j2:cat" value="default" />
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=823511&r1=823510&r2=823511&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri Oct 9 10:41:35 2009
@@ -277,7 +277,7 @@
<myfaces.version>1.1.5</myfaces.version>
<ojb.version>1.0.3</ojb.version>
<org.apache.derby.version>10.3.2.1</org.apache.derby.version>
- <org.apache.pluto.version>2.0.0</org.apache.pluto.version>
+ <org.apache.pluto.version>2.0.1-SNAPSHOT</org.apache.pluto.version>
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org