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 2009/12/09 01:01:23 UTC
svn commit: r888645 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/
core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/
core/core/src/main/java/org/apache/myfaces/scripting/load...
Author: werpu
Date: Wed Dec 9 00:01:22 2009
New Revision: 888645
URL: http://svn.apache.org/viewvc?rev=888645&view=rev
Log:
annotations broken due to the latest changes unfortunately, has to be fixed before the commit
Removed:
myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyReloadingStrategy.groovy
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/BaseResourceHandler.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy Wed Dec 9 00:01:22 2009
@@ -25,6 +25,7 @@
import org.apache.myfaces.scripting.api.BaseWeaver
import org.apache.myfaces.scripting.loaders.groovy.DynamicClassIdentifier
import org.apache.myfaces.scripting.api.BaseWeaver
+import org.apache.myfaces.scripting.refresh.FileChangedDaemon
/**
* Weaver which does dynamic class reloading
@@ -134,7 +135,6 @@
//TODO probably not needed because the groovy classloader takes care of everything itself
//the tainting does the rest but we have to check it for the annotations
-
FileChangedDaemon.getInstance().getSystemRecompileMap().put(getScriptingEngine(), Boolean.FALSE);
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java Wed Dec 9 00:01:22 2009
@@ -42,7 +42,7 @@
public GlobalReloadingStrategy(BaseWeaver weaver) {
_weaver = weaver;
_beanStrategy = new ManagedBeanReloadingStrategy(weaver);
- _noMappingStrategy = new NoMappingReloadingStrategy();
+ _noMappingStrategy = new NoMappingReloadingStrategy(weaver);
_allOthers = new SimpleReloadingStrategy(weaver);
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java Wed Dec 9 00:01:22 2009
@@ -19,6 +19,7 @@
package org.apache.myfaces.scripting.core.reloading;
import org.apache.myfaces.scripting.api.ReloadingStrategy;
+import org.apache.myfaces.scripting.api.BaseWeaver;
/**
* @author Werner Punz (latest modification by $Author$)
@@ -42,6 +43,11 @@
* which keep delegates, like the NavHandler
*/
public class NoMappingReloadingStrategy extends SimpleReloadingStrategy {
+
+ public NoMappingReloadingStrategy(BaseWeaver weaver) {
+ super(weaver);
+ }
+
@Override
protected void mapProperties(Object target, Object src) {
return;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java Wed Dec 9 00:01:22 2009
@@ -64,6 +64,9 @@
public Object reload(Object scriptingInstance, int artefactType) {
//reload the class to get new static content if needed
+ if(scriptingInstance == null || _weaver == null) {
+ getLog().debug("debugpoint found");
+ }
Class aclass = _weaver.reloadScriptingClass(scriptingInstance.getClass());
if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
//class of this object has not changed although
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java Wed Dec 9 00:01:22 2009
@@ -134,6 +134,9 @@
Class retVal = null;
try {
+ if(file.contains("JavaTestRenderer1")) {
+ getLog().debug("debugpoint found");
+ }
//we initialize the compiler lazy
//because the facade itself is lazy
if(compiler == null) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java Wed Dec 9 00:01:22 2009
@@ -68,8 +68,8 @@
Renderer rendr = _delegate.getRenderer(componentFamily, rendererType);
Renderer rendr2 = (Renderer) reloadInstance(rendr, ScriptingConst.ARTEFACT_TYPE_RENDERER);
if (rendr != rendr2) {
- rendr2 = _delegate.getRenderer(componentFamily, rendererType);
- if (rendr2 instanceof PurgedRenderer) {
+ Renderer tempRenderer = _delegate.getRenderer(componentFamily, rendererType);
+ if (tempRenderer instanceof PurgedRenderer) {
return handleAnnotationChange(componentFamily, rendererType);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java Wed Dec 9 00:01:22 2009
@@ -48,6 +48,7 @@
//startup context listener, so the initial weaver still is activated
ScriptingWeaver weaver = WeavingContext.getWeaver();
+ weaver.fullRecompile();
//we now do a full source or precompiled annotation scan
//the entire scripting subsystem should be initialized by now
weaver.fullAnnotationScan();
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-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/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Wed Dec 9 00:01:22 2009
@@ -50,9 +50,7 @@
public void addEntry(Object entry) {
if (entry != null) {
blogEntries.add(entry);
- System.out.println("add entry");
}
-
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/BaseResourceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/BaseResourceHandler.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/BaseResourceHandler.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/BaseResourceHandler.java Wed Dec 9 00:01:22 2009
@@ -51,7 +51,7 @@
return _delegate.getRendererTypeForResourceName(resourceName);
}
- public void handleResourceRequest(FacesContext context) {
+ public void handleResourceRequest(FacesContext context) throws java.io.IOException {
_delegate.handleResourceRequest(context);
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java Wed Dec 9 00:01:22 2009
@@ -48,7 +48,7 @@
static Log log = LogFactory.getLog(JavaTestRenderer1.class);
- private static final String MSG2 = "Hello world from Renderer 1 <br /> line 2fgdklsnflkdfhglksgdfh";
+ private static final String MSG2 = "Hello world from Renderer 1 <br /> ";
@Override
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Wed Dec 9 00:01:22 2009
@@ -36,7 +36,7 @@
}
- public String getResource() {
+ public String getResource() throws java.io.IOException {
ResourceHandler handler = FacesContext.getCurrentInstance().getApplication().getResourceHandler();
Resource resource = handler.createResource("testResource");
InputStream istr = resource.getInputStream();
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java?rev=888645&r1=888644&r2=888645&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java Wed Dec 9 00:01:22 2009
@@ -23,7 +23,7 @@
String hello3 = "hello from added attribute 2";
public String getSayHello() {
- return "Java dynamic bean Testbean3 bla bla bla - " + TestClass2.hello2 + hello3;
+ return "Java dynamic bean Testbean3 - " + TestClass2.hello2 + hello3;
}
public String getSayHello2() {