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 at...@apache.org on 2008/11/01 02:49:32 UTC
svn commit: r709620 - in
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: ./
applications/jetspeed-demo/
applications/jetspeed-layouts/src/main/webapp/WEB-INF/
components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/provide...
Author: ate
Date: Fri Oct 31 18:49:31 2008
New Revision: 709620
URL: http://svn.apache.org/viewvc?rev=709620&view=rev
Log:
JS2-871 - Upgrade Pluto container to version 2.0
See: http://issues.apache.org/jira/browse/JS2-871
Many small fixes, mostly Spring/OJB related which now make Jetspeed-2 starting up!
Still giving an error on page access, but we're getting close now and this finally allows us to use runtime debugging.
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/RequestPropertyProviderImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Fri Oct 31 18:49:31 2008
@@ -251,6 +251,9 @@
<artifact>javax.portlet:portlet-api:jar</artifact>
</deployment>
<deployment>
+ <artifact>javax.ccpp:ccpp:jar</artifact>
+ </deployment>
+ <deployment>
<artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
</deployment>
<deployment>
@@ -319,6 +322,11 @@
<version>${portlet-api.version}</version>
</dependency>
<dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ <version>${ccpp.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-api</artifactId>
<version>${org.apache.portals.jetspeed.version}</version>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml Fri Oct 31 18:49:31 2008
@@ -38,7 +38,6 @@
<js:service name='DecorationFactory'/>
<js:service name='EntityAccessor'/>
<js:service name='WindowAccessor'/>
- <js:service name='WindowAccessor'/>
<js:service name='Desktop'/>
<js:service name='decorationContentCache'/>
<js:service name='portletContentCache'/>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.xml Fri Oct 31 18:49:31 2008
@@ -16,8 +16,11 @@
limitations under the License.
-->
-<portlet-app version="1.0">
-
+<portlet-app version="1.0"
+ xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+
<portlet id="SimpleLayoutPortlet">
<description>The SimpleLayoutPortlet requires a ViewPage layout template set through the portlet preferences
which provides its own layout algorithm</description>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/RequestPropertyProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/RequestPropertyProviderImpl.java?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/RequestPropertyProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/RequestPropertyProviderImpl.java Fri Oct 31 18:49:31 2008
@@ -34,7 +34,7 @@
*/
public class RequestPropertyProviderImpl implements RequestPropertyProvider
{
- public RequestPropertyProviderImpl(HttpServletRequest request, PortletWindow portletWindow)
+ public RequestPropertyProviderImpl()
{}
public Map getProperties(HttpServletRequest request,
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java Fri Oct 31 18:49:31 2008
@@ -100,6 +100,7 @@
this.permissionRoles = permissionRoles;
this.nodeManager = nodeManager;
this.appRoot = appRoot;
+ this.descriptorService = descriptorService;
}
public void start()
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml Fri Oct 31 18:49:31 2008
@@ -31,12 +31,13 @@
primarykey="true"
autoincrement="true"
conversion="org.apache.jetspeed.util.ojb.ObjectIDtoLongFieldConversion"
+ access="anonymous"
/>
<field-descriptor
name="parentId"
column="OBJECT_ID"
jdbc-type="BIGINT"
-
+ access="anonymous"
/>
<field-descriptor
@@ -70,12 +71,13 @@
primarykey="true"
autoincrement="true"
conversion="org.apache.jetspeed.util.ojb.ObjectIDtoLongFieldConversion"
+ access="anonymous"
/>
<field-descriptor
name="parentId"
column="OBJECT_ID"
jdbc-type="BIGINT"
-
+ access="anonymous"
/>
<field-descriptor
@@ -251,7 +253,7 @@
</collection-descriptor>
<collection-descriptor
- name="securityRoles"
+ name="roles"
element-class-ref="org.apache.jetspeed.om.portlet.impl.SecurityRoleImpl"
auto-delete="false"
auto-update = "true"
@@ -283,12 +285,12 @@
/>
<field-descriptor
- name="name"
+ name="portletName"
column="NAME"
jdbc-type="VARCHAR"
/>
<field-descriptor
- name="className"
+ name="portletClass"
column="CLASS_NAME"
jdbc-type="VARCHAR"
/>
@@ -303,7 +305,7 @@
<field-descriptor
name="expirationCache"
column="EXPIRATION_CACHE"
- jdbc-type="VARCHAR"
+ jdbc-type="INTEGER"
/>
<field-descriptor
@@ -352,7 +354,7 @@
auto-retrieve = "true"
proxy="false"
>
- <inverse-foreignkey field-ref="parentId"/>
+ <inverse-foreignkey field-ref="ownerId"/>
</collection-descriptor>
@@ -389,7 +391,7 @@
auto-retrieve = "true"
>
- <inverse-foreignkey field-ref="parentId"/>
+ <inverse-foreignkey field-ref="ownerId"/>
</collection-descriptor>
@@ -413,7 +415,7 @@
auto-update = "true"
auto-retrieve = "true"
>
- <inverse-foreignkey field-ref="parentId"/>
+ <inverse-foreignkey field-ref="ownerId"/>
</collection-descriptor>
@@ -928,7 +930,7 @@
<field-descriptor
name="name"
- column="ROLE_NAME"
+ column="NAME"
jdbc-type="VARCHAR"
/>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java Fri Oct 31 18:49:31 2008
@@ -36,7 +36,7 @@
public class DescriptionImpl implements Description
{
protected String owner;
- protected String value;
+ protected String description;
protected String lang = null;
protected Locale locale = null;
@@ -48,18 +48,18 @@
public DescriptionImpl(Object owner, String lang)
{
this.owner = owner.getClass().getName();
- lang = value;
+ this.lang = lang;
locale = JetspeedLocale.convertStringToLocale(lang);
}
public String getDescription()
{
- return value;
+ return description;
}
public void setDescription(String value)
{
- this.value = value;
+ this.description = value;
}
public String getLang()
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java Fri Oct 31 18:49:31 2008
@@ -31,7 +31,7 @@
public class DisplayNameImpl implements DisplayName
{
protected String owner;
- protected String value;
+ protected String displayName;
protected String lang = null;
protected Locale locale = null;
@@ -42,18 +42,18 @@
public DisplayNameImpl(Object owner, String lang)
{
this.owner = owner.getClass().getName();
- lang = value;
+ this.lang = lang;
locale = JetspeedLocale.convertStringToLocale(lang);
}
public String getDisplayName()
{
- return value;
+ return displayName;
}
public void setDisplayName(String value)
{
- this.value = value;
+ this.displayName = value;
}
public String getLang()
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Fri Oct 31 18:49:31 2008
@@ -46,7 +46,7 @@
</bean>
<bean id="org.apache.jetspeed.descriptor.JetspeedDescriptorService"
- class="org.apache.jetspeed.descriptor.ExtendedDescriptorServiceImpl">
+ 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>
</bean>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml Fri Oct 31 18:49:31 2008
@@ -78,12 +78,6 @@
<constructor-arg>
<value>${portal.name}Desktop</value>
</constructor-arg>
- <constructor-arg>
- <ref bean="ServletConfig" />
- </constructor-arg>
- <constructor-arg>
- <ref bean="Engine" />
- </constructor-arg>
<property name="requestFactory">
<ref bean="ServletRequestFactory" />
</property>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml Fri Oct 31 18:49:31 2008
@@ -41,7 +41,7 @@
<!-- Declare Pluto Service Accessors, Required -->
<!-- ====================================================== -->
- <bean id="org.apache.pluto.services.RequiredContainerServices"
+ <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>
@@ -50,12 +50,12 @@
<constructor-arg><ref bean="PortalContext"/></constructor-arg>
</bean>
- <bean id="CCPPProfileService"
+ <bean id="org.apache.pluto.services.CCPPProfileService"
class="org.apache.pluto.core.DummyCCPPProfileServiceImpl">
<meta key="j2:cat" value="default" />
</bean>
- <bean id='ContainerInvocationService'
+ <bean id='org.apache.pluto.services.ContainerInvocationService'
class='org.apache.pluto.core.ContainerInvocationServiceImpl'>
<meta key="j2:cat" value="default" />
</bean>
@@ -102,7 +102,7 @@
<!-- Declare Pluto Service Accessors, Optional -->
<!-- ====================================================== -->
- <bean id="org.apache.pluto.services.OptionalContainerServices"
+ <bean id="org.apache.pluto.services.OptionalPlutoServices"
class="org.apache.jetspeed.container.services.JetspeedOptionalPlutoServices">
<meta key="j2:cat" value="default" />
<constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>
@@ -138,7 +138,7 @@
</bean>
<bean id="org.apache.pluto.services.RequestAttributeService"
- class="org.apache.pluto.core.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>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml?rev=709620&r1=709619&r2=709620&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml Fri Oct 31 18:49:31 2008
@@ -333,6 +333,7 @@
<xerces.version>2.3.0</xerces.version>
<xml-apis.version>2.0.2</xml-apis.version>
<asm.version>2.2</asm.version>
+ <ccpp.version>1.0</ccpp.version>
<commonj.version>1.1</commonj.version>
</properties>
@@ -582,6 +583,11 @@
<artifactId>jsp-api</artifactId>
<version>${javax.servlet.jsp.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ <version>${ccpp.version}</version>
+ </dependency>
<!-- Pluto Container -->
<dependency>
@@ -1208,6 +1214,11 @@
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org