Author: tdraier
Date: Tue Sep 18 17:41:50 2007
New Revision: 18555
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18555&repname=
=3Djahia
Log:
fixed authorizeRender for AddcontainerEngine and WorkflowEngine - Addcontai=
ner only in edit, workflowengine in edit,preview,compare ( JAHIA-2281 )
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/EngineTool=
Box.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/resourcebu=
ndle/ResourceBundleTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/Engi=
neToolBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/EngineToolBox.java&rev=3D18555&repn=
ame=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/engines/EngineTool=
Box.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/EngineTool=
Box.java Tue Sep 18 17:41:50 2007
@@ -73,7 +73,7 @@
* authoriseRender
*/
public boolean authoriseRender (final ProcessingContext jParams) {
- return (jParams.getOperationMode ().equals(ProcessingContext.EDIT)=
|| jParams.getOperationMode ().equals(ProcessingContext.PREVIEW) || jParam=
s.getOperationMode ().equals(ProcessingContext.COMPARE));
+ return jParams.getOperationMode ().equals(ProcessingContext.EDIT);
} // end authoriseRender
=
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/work=
flow/AdvancedWorkflowEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.jav=
a&rev=3D18555&repname=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/engines/workflow/A=
dvancedWorkflowEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java Tue Sep 18 17:41:50 2007
@@ -112,7 +112,7 @@
* @return Always true
*/
public boolean authoriseRender(ProcessingContext jParams) {
- return toolBox.authoriseRender(jParams);
+ return (jParams.getOperationMode().equals(ProcessingContext.EDIT) =
|| jParams.getOperationMode ().equals(ProcessingContext.PREVIEW) || jParams=
.getOperationMode ().equals(ProcessingContext.COMPARE));
}
=
/**
@@ -170,7 +170,7 @@
final String obj =3D jParams.getParameter("obj");
final HttpSession session =3D ((ParamBean) jParams).getRequest().g=
etSession();
=
- if (!toolBox.authoriseRender(jParams)) {
+ if (!authoriseRender(jParams)) {
throw new JahiaForbiddenAccessException();
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/reso=
urcebundle/ResourceBundleTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/resourcebundle/ResourceBundleTag.ja=
va&rev=3D18555&repname=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/taglibs/resourcebu=
ndle/ResourceBundleTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/resourcebu=
ndle/ResourceBundleTag.java Tue Sep 18 17:41:50 2007
@@ -16,19 +16,21 @@
* limitations under the License.
*/package org.jahia.taglibs.resourcebundle;
=
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.jahia.data.JahiaData;
+import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
=
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
-
-import org.jahia.data.JahiaData;
-import org.jahia.resourcebundle.JahiaResourceBundle;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.MalformedURLException;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
=
/**
* Support for ResourceBundle within Jahia
@@ -215,7 +217,12 @@
locale =3D new Locale(localeLanguage, localeCountry, localeVar=
iant);
}
=
+// String path =3D ServicesRegistry.getInstance().getJahiaTemplates=
DeployerService().getTemplateRootPath() + "/";
+// path +=3D jData.getProcessingContext().getSiteKey();
+// path +=3D "/WEB-INF/classes/";
+//
try {
+// res =3D ResourceBundle.getBundle(resourceBundle, locale, new=
URLClassLoader(new URL[] {new URL("file","",path)}));
res =3D ResourceBundle.getBundle(resourceBundle, locale);
//resValue =3D res.getString(resourceName);
if (name !=3D null) {
@@ -239,6 +246,8 @@
logger.warn("Error accessing resource " + resourceName +
" in bundle " + resourceBundle + " for locale " +
locale + ":" + mre.getMessage());
+// } catch (MalformedURLException e) {
+// e.printStackTrace(); //To change body of catch statement us=
e File | Settings | File Templates.
}
if (resValue =3D=3D null) {
resValue =3D this.defaultValue;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
