tdraier 2004/09/23 10:36:25 CEST
Modified files:
core/src/java/org/jahia/services/applications
ServletIncludeResponseWrapper.java
Log:
fixed issue with non-portlets webapps : replaced application id to entry point id
Revision Changes Path
1.2 +7 -2
jahia/core/src/java/org/jahia/services/applications/ServletIncludeResponseWrapper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/applications/ServletIncludeResponseWrapper.java.diff?r1=1.1&r2=1.2&f=h
Index: ServletIncludeResponseWrapper.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/applications/ServletIncludeResponseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletIncludeResponseWrapper.java 30 Mar 2004 14:11:52 -0000 1.1
+++ ServletIncludeResponseWrapper.java 23 Sep 2004 08:36:25 -0000 1.2
@@ -15,6 +15,7 @@
import org.apache.regexp.RE;
import org.jahia.bin.Jahia;
import org.jahia.data.applications.ApplicationBean;
+import org.jahia.data.applications.EntryPointInstance;
import org.jahia.engines.applications.FullScreenDispatcherEngine;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ParamBean;
@@ -240,13 +241,17 @@
try {
// Check if we should add Jahia extra URL encoding or not.
// We don't if the resource is not a servlet ( or jsp )
- ApplicationBean appBean = ServicesRegistry.getInstance ()
+ EntryPointInstance entryPoint = ServicesRegistry.getInstance ()
.getApplicationsManagerService ()
- .getApplication (
+ .getEntryPointInstance (
Integer.parseInt (
appUniqueIDStr.substring (
appUniqueIDStr.indexOf
(APP_ID_SEPARATOR) + 1)));
+ ApplicationBean appBean = ServicesRegistry.getInstance ()
+ .getApplicationsManagerService ()
+ .getApplication (entryPoint.getApplicationID());
+
if (appBean == null) {
logger.debug (
"The requested application [" + appUniqueIDStr + "]
is not available");
