You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/26 15:51:22 UTC
svn commit: r927886 - in /myfaces/extensions/scripting/trunk: ./
extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/
extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/
Author: werpu
Date: Fri Mar 26 14:51:22 2010
New Revision: 927886
URL: http://svn.apache.org/viewvc?rev=927886&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-101
ok we had a small bug in the digester it now works
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
myfaces/extensions/scripting/trunk/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java?rev=927886&r1=927885&r2=927886&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java Fri Mar 26 14:51:22 2010
@@ -29,6 +29,7 @@ import org.apache.myfaces.scripting.load
import org.apache.myfaces.scripting.loaders.java.JavaScriptingWeaver;
import org.apache.myfaces.scripting.refresh.RefreshContext;
import org.apache.myfaces.scripting.servlet.ScriptingServletFilter;
+
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -53,10 +54,8 @@ class WeavingContextInitializer {
static final Logger _logger = Logger.getLogger(WeavingContextInitializer.class.getName());
-
-
public static void initWeavingContext(ServletContext servletContext) {
-
+
validateWebXml(servletContext);
initConfiguration(servletContext);
initWeavers(servletContext);
@@ -108,7 +107,6 @@ class WeavingContextInitializer {
}
}
-
private static void validateWebXml(ServletContext context) {
try {
URL webXml = context.getResource("/WEB-INF/web.xml");
@@ -123,7 +121,10 @@ class WeavingContextInitializer {
digester.push(parser);
//We only check for the servlet filter
//the rest is already delivered by our context
- digester.addCallMethod("web-app/servlet-filter", "addServletFilter", 2);
+ digester.addCallMethod("web-app/filter", "addFilter", 2);
+ digester.addCallParam("web-app/filter/filter-name", 0);
+ digester.addCallParam("web-app/filter/filter-class", 1);
+
//digester.addCallMethod("web-app/filter-mapping/filter-name", "addFilterName", 2);
digester.parse(in);
//we can handle the rest of the configuration in a more secure manner
@@ -139,12 +140,26 @@ class WeavingContextInitializer {
} catch (IOException e) {
_logger.severe("[EXT-SCRIPTING] Web.xml could not be parsed disabling scripting");
WeavingContext.setScriptingEnabled(false);
+ }
+ if (!WeavingContext.isScriptingEnabled()) {
+ String warnMsg = "[EXT-SCRIPTING] The servlet filter has not been set, please check your web.xml for following entries:" +
+ "\n <filter>\n" +
+ " <filter-name>scriptingFilter</filter-name>\n" +
+ " <filter-class>org.apache.myfaces.scripting.servlet.ScriptingServletFilter</filter-class>\n" +
+ " </filter>\n" +
+ " <filter-mapping>\n" +
+ " <filter-name>scriptingFilter</filter-name>\n" +
+ " <url-pattern>/*</url-pattern>\n" +
+ " <dispatcher>REQUEST</dispatcher>\n" +
+ " <dispatcher>FORWARD</dispatcher>\n" +
+ " <dispatcher>INCLUDE</dispatcher>\n" +
+ " <dispatcher>ERROR</dispatcher>\n" +
+ " </filter-mapping>";
+ _logger.severe(warnMsg);
}
}
-
-
private static boolean initWeavers(ServletContext servletContext) {
_logger.fine("[EXT-SCRIPTING] initializing the weaving contexts");
@@ -250,14 +265,14 @@ class WeavingContextInitializer {
static private DisconnectedEntityResolver _INSTANCE = new DisconnectedEntityResolver();
}
- private static class WebXmlParserImpl {
+ public static class WebXmlParserImpl {
- private void addServletFilter(String filterName, String filterClass) {
- if (filterName.equals("scriptingFilter") && filterClass.equals(ScriptingServletFilter.class.getName())) {
+ public void addFilter(String filterName, String filterClass) {
+ _logger.info("adding filter");
+ if (filterClass.equals(ScriptingServletFilter.class.getName())) {
WeavingContext.setScriptingEnabled(true);
}
}
-
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java?rev=927886&r1=927885&r2=927886&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java Fri Mar 26 14:51:22 2010
@@ -23,14 +23,12 @@ package org.apache.myfaces.javaloader.bl
* Holds the entered blogging data
*/
public class BlogEntry {
-
+
String firstName = "";
String lastName = "";
String topic = "";
String content = "";
-
-
public String getFirstName() {
return firstName;
}
@@ -62,5 +60,5 @@ public class BlogEntry {
public void setContent(String content) {
this.content = content;
}
-
+
}
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=927886&r1=927885&r2=927886&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Fri Mar 26 14:51:22 2010
@@ -28,7 +28,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk</developerConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk
+ </developerConnection>
<url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk</url>
</scm>
@@ -39,6 +40,7 @@
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
+
<repository>
<releases>
<enabled>false</enabled>
@@ -132,6 +134,7 @@
</plugins>
+
</build>
@@ -197,7 +200,7 @@
</reporting>
- <profiles>
+ <profiles>
<!-- This profile is invoked by -DprepareRelease=true. This allows mvn release:prepare to
run successfully on the assembly projects. -->
<profile>
@@ -223,6 +226,6 @@
</plugins>
</build>
</profile>
- </profiles>
+ </profiles>
</project>