shuber 2005/03/15 17:38:28 CET
Modified files:
core/src/conf/metadata/jbproject/jahia Jahia Non Distributable
Libs.library
core/src/java/org/jahia/engines/shared Application_Field.java
core/src/java/org/jahia/services/applications
JahiaJ2SessionPortalURL.java
Log:
Repaired some of the functionality of the Application field engine, it should
now work on JSR-168 portlets, at least partially.
Revision Changes Path
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
1.8 +7 -0
jahia/core/src/java/org/jahia/engines/shared/Application_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java.diff?r1=1.7&r2=1.8&f=h
1.11 +2 -2
jahia/core/src/java/org/jahia/services/applications/JahiaJ2SessionPortalURL.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/applications/JahiaJ2SessionPortalURL.java.diff?r1=1.10&r2=1.11&f=h
Index: Application_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Application_Field.java 23 Dec 2004 16:19:41 -0000 1.7
+++ Application_Field.java 15 Mar 2005 16:38:27 -0000 1.8
@@ -407,6 +407,13 @@
selectedEntryPointDefName = epDef.getName();
} else {
selectedEntryPointDefName = epInstance.getDefName();
+ int separatorPos = selectedEntryPointDefName.indexOf("###");
+ if (separatorPos != -1) {
+ String portletDefName =
selectedEntryPointDefName.substring(0, separatorPos);
+ String portletEntityID =
selectedEntryPointDefName.substring(separatorPos +
+ "###".length());
+ selectedEntryPointDefName = portletDefName;
+ }
appID = epInstance.getApplicationID();
appBean = ServicesRegistry.getInstance().
getApplicationsManagerService().getApplication(appID);
Index: JahiaJ2SessionPortalURL.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/applications/JahiaJ2SessionPortalURL.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JahiaJ2SessionPortalURL.java 10 Mar 2005 14:16:36 -0000 1.10
+++ JahiaJ2SessionPortalURL.java 15 Mar 2005 16:38:28 -0000 1.11
@@ -25,8 +25,8 @@
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger
(JahiaJ2SessionPortalURL.class);
- static public final String PARAMBEAN_REQUEST_ATTRIBUTEKEY =
"org.jahia.params.ParamBean";
- static public final String APPUNIQUEID_REQUEST_ATTRIBUTEKEY =
"org.jahia.params.AppID";
+ static public final String PARAMBEAN_REQUEST_ATTRIBUTEKEY =
"org.jahia.services.applications.ParamBean";
+ static public final String APPUNIQUEID_REQUEST_ATTRIBUTEKEY =
"org.jahia.services.applications.AppID";
public JahiaJ2SessionPortalURL(HttpServletRequest request, String
characterEncoding, NavigationalState navState) {
super(request, characterEncoding, navState);
