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/01/15 17:30:43 UTC
svn commit: r899686 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/
core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/
examples/myfaces20-example/src/main/webapp/WEB-INF/gro...
Author: werpu
Date: Fri Jan 15 16:30:42 2010
New Revision: 899686
URL: http://svn.apache.org/viewvc?rev=899686&view=rev
Log:
ongoing works on the compiler integration:
reenabling the dependency scanner on the java side
https://issues.apache.org/jira/browse/EXTSCRIPT-43
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java Fri Jan 15 16:30:42 2010
@@ -21,4 +21,8 @@
return new GroovyRecompiledClassloader(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_GROOVY, ScriptingConst.FILE_EXTENSION_GROOVY);
}
+ @Override
+ protected int getEngineType() {
+ return ScriptingConst.ENGINE_TYPE_GROOVY;
+ }
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java Fri Jan 15 16:30:42 2010
@@ -55,10 +55,10 @@
public synchronized void scanPaths() {
//only one dependency check per refresh makes sense in our case
- if(WeavingContext.getRefreshContext().isDependencyScanned(ScriptingConst.ENGINE_TYPE_JAVA)) {
+ if(WeavingContext.getRefreshContext().isDependencyScanned(getEngineType())) {
return;
} else {
- WeavingContext.getRefreshContext().setDependencyScanned(ScriptingConst.ENGINE_TYPE_JAVA, true);
+ WeavingContext.getRefreshContext().setDependencyScanned(getEngineType(), true);
}
@@ -80,6 +80,9 @@
}
+ protected int getEngineType() {
+ return ScriptingConst.ENGINE_TYPE_JAVA;
+ }
private final void runScan(final Set<String> possibleDynamicClasses, final ClassLoader loader, String dynamicClass) {
@@ -95,7 +98,7 @@
protected ClassLoader getClassLoader() {
- return new RecompiledClassLoader(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JAVA, ".java");
+ return new RecompiledClassLoader(Thread.currentThread().getContextClassLoader(), getEngineType(), ".java");
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy Fri Jan 15 16:30:42 2010
@@ -35,7 +35,7 @@
Log log = LogFactory.getLog(Blog.class)
- String title = "Hello to the myfaces dynamic blogging"
+ String title = "Hello to the myfaces 2.0 - Groovy dynamic blogging"
String title1 = "You can alter the code for this small blogging application on the fly, you even can add new classes on the fly and Grooy will pick it up"
String firstName = ""
@@ -67,7 +67,7 @@
- service.addEntry(entry)
+ service.addEntry2(entry)
//we stay on the same page
return null;
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogEntry.groovy Fri Jan 15 16:30:42 2010
@@ -28,6 +28,8 @@
String topic = ""
String content = ""
+
+
public String getTopic() {
return topic;
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy Fri Jan 15 16:30:42 2010
@@ -35,6 +35,15 @@
return blogEntries
}
+ public void addEntry2(BlogEntry entry) {
+ Log log = LogFactory.getLog(BlogService.class)
+ log.info("Adding entry, topic: " + entry.topic)
+ blogEntries.add (entry)
+
+ log.info("blogentries size"+blogEntries.size())
+ }
+
+
public void addEntry(BlogEntry entry) {
Log log = LogFactory.getLog(BlogService.class)
log.info("Adding entry, topic: " + entry.topic)
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy Fri Jan 15 16:30:42 2010
@@ -27,6 +27,7 @@
*/
public class JSFUtil {
+
public static Object resolveVariable(String beanName) {
Log log = LogFactory.getLog(JSFUtil.class)
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Fri Jan 15 16:30:42 2010
@@ -61,7 +61,7 @@
public String addEntry2 () {
- getLog().info("adding entry");
+ getLog().info("adding entry2");
BlogService service = (BlogService) JSFUtil.resolveVariable("javaBlogService");
Modified: myfaces/extensions/scripting/trunk/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/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java Fri Jan 15 16:30:42 2010
@@ -31,6 +31,7 @@
String content = "";
+
public String getFirstName() {
return firstName;
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=899686&r1=899685&r2=899686&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Fri Jan 15 16:30:42 2010
@@ -45,14 +45,14 @@
List<Object> blogEntries = Collections.synchronizedList(new LinkedList<Object>());
public void addEntry(BlogEntry entry) {
+ System.out.println("dddd2");
+
if (entry != null) {
blogEntries.add(entry);
}
}
-
-
public List<Object> getBlogEntries() {
return blogEntries;
}