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 ta...@apache.org on 2008/03/27 07:19:38 UTC
svn commit: r641710 - in
/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE:
components/portal/src/java/org/apache/jetspeed/tools/pamanager/
src/webapp/WEB-INF/assembly/alternate/versioned-deployment/
Author: taylor
Date: Wed Mar 26 23:19:19 2008
New Revision: 641710
URL: http://svn.apache.org/viewvc?rev=641710&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-860
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/jetspeed-services.xml
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java?rev=641710&r1=641709&r2=641710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java Wed Mar 26 23:19:19 2008
@@ -86,6 +86,20 @@
started = false;
}
+ protected void startPA(String contextName, FileSystemHelper warStruct,
+ ClassLoader paClassLoader, int paType)
+ throws RegistryException
+ {
+ startPA(contextName, warStruct, paClassLoader, paType, 0);
+ }
+
+ protected void startPA(String contextName, FileSystemHelper warStruct,
+ ClassLoader paClassLoader, int paType, long checksum)
+ throws RegistryException
+ {
+ startPA(contextName, "/" + contextName, warStruct, paClassLoader, paType, 0);
+ }
+
// override to implement versioning logic
protected void startPA(String contextName, String contextPath, FileSystemHelper warStruct,
ClassLoader paClassLoader, int paType, long checksum)
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=641710&r1=641709&r2=641710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/jetspeed-services.xml Wed Mar 26 23:19:19 2008
@@ -122,14 +122,6 @@
<entry key="AuditActivity">
<ref bean="org.apache.jetspeed.audit.AuditActivity"/>
</entry>
- <entry key="JetspeedSerializerFactory">
- <ref bean="org.apache.jetspeed.serializer.JetspeedSerializerFactory"/>
- </entry>
-<!-- first uncomment the below service bean in security-spi-atn.xml
- <entry key="PasswordEncodingService">
- <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />
- </entry>
--->
</map>
</constructor-arg>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org