https://issues.apache.org/jira/browse/EXTSCRIPT-158 fixing the issue itself
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1302415 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/BaseScanner.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/BaseScanner.java
index a380b69..a11fba1 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/BaseScanner.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/BaseScanner.java
@@ -60,7 +60,7 @@
} else {
WeavingContext.getRefreshContext().setDependencyScanned(getEngineType(), true);
}*/
- ScriptingEngine engine = WeavingContext.getInstance().getEngine(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
+ ScriptingEngine engine = WeavingContext.getInstance().getEngine(getEngineType());
if (_log.isLoggable(Level.INFO))
{
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java
index 9a6546d..5f56a37 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java
@@ -61,9 +61,6 @@
*/
public Class<?> loadClass(String className) throws ClassNotFoundException
{
- if(className.contains("TestResourceHandler")) {
- System.out.println("Debugppint found");
- }
ClassResource res = (ClassResource) WeavingContext.getInstance().getResource(className);
if (res == null) return super.loadClass(className);
if (!res.isTainted() && res.getAClass() != null) return res.getAClass();
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/ClassScanVisitor.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/ClassScanVisitor.java
index d3048b5..4cfc041 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/ClassScanVisitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/ClassScanVisitor.java
@@ -52,6 +52,7 @@
_dependencyRegistry = registry;
_engineType = engineType;
_rootClass = rootClass;
+
}
public void visit(int version, int access, String name,
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/MethodScanVisitor.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/MethodScanVisitor.java
index a172509..d087dc1 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/MethodScanVisitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/core/MethodScanVisitor.java
@@ -106,8 +106,10 @@
}
private void registerDependency(Type dependency) {
-
+
String className = dependency.getClassName();
+
+
if (className.endsWith("[]")) {
className = className.substring(0, className.indexOf("["));
}
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/servlet/ScriptingServletFilter.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/servlet/ScriptingServletFilter.java
index 1c5ccbb..6cc2ec7 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/servlet/ScriptingServletFilter.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/servlet/ScriptingServletFilter.java
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
import java.io.IOException;
import java.util.logging.Logger;
@@ -31,12 +32,17 @@
*
* @author Werner Punz
*/
+@WebFilter(urlPatterns = {"/*"},
+ dispatcherTypes = {DispatcherType.REQUEST,
+ DispatcherType.FORWARD,
+ DispatcherType.INCLUDE,
+ DispatcherType.ERROR})
public class ScriptingServletFilter implements Filter
{
ServletContext _context;
Logger logger = Logger.getLogger(this.getClass().getName());
-
+
public void init(FilterConfig filterConfig) throws ServletException
{
_context = filterConfig.getServletContext();
@@ -44,10 +50,11 @@
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException, IOException
{
- synchronized (WeavingContext.getInstance().recompileLock) {
- logger.fine("request");
- }
- filterChain.doFilter(servletRequest, servletResponse);
+ synchronized (WeavingContext.getInstance().recompileLock)
+ {
+ logger.fine("request");
+ }
+ filterChain.doFilter(servletRequest, servletResponse);
}
@Override
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy
index a929562..0ac183c 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy
@@ -26,7 +26,7 @@
String firstName = ""
String lastName = ""
String topic = ""
- String content = "ddddddd"
+ String content = ""
public String getTopic() {
return topic;
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
index 64f5408..c1b34a6 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
@@ -35,7 +35,7 @@
String content = "";
public String getFirstName() {
- return firstName+"aaa";
+ return firstName;
}
public void setFirstName(String firstName) {
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
index 928b8f1..1442dbb 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
@@ -34,6 +34,7 @@
List<Object> blogEntries = Collections.synchronizedList(new LinkedList<Object>());
+
/**
* Add an entry to our blogging list
* Note: we have a testing annotation,
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
index f8081bc..cc3db08 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
@@ -18,9 +18,10 @@
* specific language governing permissions and limitations
* under the License.
-->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
<description>MyProject web.xml</description>
@@ -132,19 +133,6 @@
</context-param>
-->
- <filter>
- <filter-name>scriptingFilter</filter-name>
- <filter-class>org.apache.myfaces.extensions.scripting.core.servlet.ScriptingServletFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>scriptingFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
-
<!-- Listener, to allow Jetty serving MyFaces apps -->
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
diff --git a/pom.xml b/pom.xml
index 1bea158..1794309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,8 +71,8 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
