Author: ktlili
Date: Wed Oct 3 16:26:52 2007
New Revision: 18737
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18737&repname=
=3Djahia
Log:
- PORTAL-55: clipbuilder is in admin menu --> add in JahiaAdministration co=
de in order to deal eith clibuilder: =
service()...
else if ("clipbuilder".equals(operation)&&
hasSitePermission("admin.permissions.MenuBuilde=
rAction", jParams)){
// clipbuilder is a struts servlet
process(request,response);
}
...
Warning: this need to update clipbuilder.jar (automatically done by maven)
TO DO: port in jahia head
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdm=
inistration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/JahiaAdministration.java&rev=3D18737&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java Wed Oct 3 16:26:52 2007
@@ -191,6 +191,7 @@
public void service (HttpServletRequest request,
HttpServletResponse response) throws IOException,
ServletExcep=
tion {
+ logger.debug("-- service --");
if (logger.isDebugEnabled()) {
logger.debug("--[ " + request.getMethod() + " Request Start UR=
I=3D'" +
request.getRequestURI() + "' query=3D'" +
@@ -491,6 +492,10 @@
hasSitePermission("admin.permissions.ManageSit=
ePermissions", jParams)) {
session.setAttribute(CLASS_NAME + "configJahia", B=
oolean.FALSE);
new ManageSitePermissions(request, response, sessi=
on);
+ } else if ("clipbuilder".equals(operation)&&
+ hasSitePermission("admin.permissions.MenuBuild=
erAction", jParams)){
+ // clipbuilder is a struts servlet
+ process(request,response);
} else {
displayMenu(request, response, session);
}
@@ -499,6 +504,7 @@
} else if (isValidLoginSession(session)) {
displayMenu(request, response, session);
} else {
+ logger.debug("session login not valid.");
displayLogin(request, response, session);
}
}
@@ -1072,6 +1078,7 @@
throws JahiaException, IOException, ServletException {
=
String pathInfo =3D request.getPathInfo();
+ logger.debug("Path Info: "+pathInfo);
if ( pathInfo =3D=3D null )
return false;
if ( pathInfo.indexOf("engineName") =3D=3D -1 )
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
