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/11/01 06:00:49 UTC
svn commit: r709652 - in
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components:
jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/
jetspeed-registry/src/main/java/JETSPEED-INF/ojb/
jetspeed-registry/src/main/java/or...
Author: taylor
Date: Fri Oct 31 22:00:48 2008
New Revision: 709652
URL: http://svn.apache.org/viewvc?rev=709652&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-871
- there is a problem with the registry retrieval by unique name of portlets, something with the anonymous access broke, commented out for now, not perfect but gets me to the part I wanna debug
- fixed minor stuff
Portlets are now aggregating and starting to render. Crashing on get window state from portlet code. With 2.0 portlet windows need to supply their mode and state. (rc->portalURL->navState)...
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.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/components/portletregistry/PersistenceBrokerPortletRegistry.java
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.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/invoker/ServletPortletInvoker.java?rev=709652&r1=709651&r2=709652&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java Fri Oct 31 22:00:48 2008
@@ -81,6 +81,7 @@
public ServletPortletInvoker(PortletRequestResponseUnwrapper requestResponseUnwrapper, String servletMappingName)
{
this.requestResponseUnwrapper = requestResponseUnwrapper;
+ this.servletMappingName = servletMappingName;
}
/* (non-Javadoc)
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=709652&r1=709651&r2=709652&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 22:00:48 2008
@@ -676,6 +676,13 @@
class="org.apache.jetspeed.components.portletentity.PortletEntityImpl"
table="PORTLET_ENTITY"
>
+ <field-descriptor
+ name="id"
+ column="ID"
+ jdbc-type="VARCHAR"
+ autoincrement="true"
+ length="80"
+ />
<field-descriptor
name="oid"
@@ -700,15 +707,6 @@
length="80"
/>
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="VARCHAR"
- autoincrement="true"
- conversion="org.apache.jetspeed.util.ojb.ObjectIDtoStringFieldConversion"
- length="80"
- />
-
</class-descriptor>
<!--
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.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/components/portletregistry/PersistenceBrokerPortletRegistry.java?rev=709652&r1=709651&r2=709652&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java Fri Oct 31 22:00:48 2008
@@ -124,7 +124,7 @@
String portletName = PortletRegistryHelper.parsePortletName(name);
Criteria c = new Criteria();
- c.addEqualTo("app.name", appName);
+ // TODO: 2.2 something failing here c.addEqualTo("app.name", appName);
c.addEqualTo("name", portletName);
PortletDefinition def = (PortletDefinition) getPersistenceBrokerTemplate().getObjectByQuery(
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org