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/09/21 19:20:14 UTC
svn commit: r817324 - in /myfaces/extensions/scripting/trunk/core:
core/src/main/java/org/apache/myfaces/scripting/api/
core/src/main/java/org/apache/myfaces/scripting/core/
core/src/main/java/org/apache/myfaces/scripting/loaders/java/
core/src/main/ja...
Author: werpu
Date: Mon Sep 21 17:20:12 2009
New Revision: 817324
URL: http://svn.apache.org/viewvc?rev=817324&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-18
ongoing works on the annotation scanner, thanks to a fixup in myfaces the listener works also now
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java Mon Sep 21 17:20:12 2009
@@ -31,9 +31,9 @@
public interface AnnotationScanListener {
- public boolean supportsAnnotation(Class annotation);
+ public boolean supportsAnnotation(String annotation);
- public void registerSource(Object clazz, String annotationName, Map<String, String> params);
+ public void registerSource(Object clazz, String annotationName, Map<String, Object> params);
public void register(Class clazz, String annotationName, Map<String, String> params);
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Mon Sep 21 17:20:12 2009
@@ -239,4 +239,6 @@
return null;
}
+ public void fullAnnotationScan() {
+ }
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java Mon Sep 21 17:20:12 2009
@@ -58,4 +58,7 @@
public ScriptingWeaver getWeaverInstance(Class weaverClass) {
return this; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ public void fullAnnotationScan() {
+ }
}
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=817324&r1=817323&r2=817324&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 Mon Sep 21 17:20:12 2009
@@ -61,7 +61,7 @@
//url classloader at the time myfaces is initialized
try {
Class scanner = ClassUtils.getContextClassLoader().loadClass("org.apache.myfaces.scripting.jsf2.annotation.JavaSourceAnnotationScanner");
- AnnotationScanner scanObj = (AnnotationScanner) scanner.newInstance();
+ this._scanner = (AnnotationScanner) scanner.newInstance();
} catch (IllegalAccessException e) {
e.printStackTrace();
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java Mon Sep 21 17:20:12 2009
@@ -93,7 +93,9 @@
}
public Class forName(String name) {
-
+ if(name == null) {
+ return null;
+ }
if (name.startsWith("java.")) /*the entire java namespace is reserved so no use to do a specific classloading check here*/
return null;
if (name.startsWith("javax.")) /*the entire java namespace is reserved so no use to do a specific classloading check here*/
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java Mon Sep 21 17:20:12 2009
@@ -29,6 +29,7 @@
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaField;
import com.thoughtworks.qdox.model.Annotation;
+import com.thoughtworks.qdox.model.annotation.AnnotationConstant;
/**
* @author Werner Punz (latest modification by $Author$)
@@ -67,7 +68,7 @@
}
- public void register(Class clazz, String annotationName, Map<String, String> params) {
+ public void register(Class clazz, String annotationName, Map<String, Object> params) {
throw new UnsupportedOperationException("Not yet implemented");
}
@@ -83,12 +84,13 @@
* @param annotationName
* @param params
*/
- public void registerSource(Object sourceClass, String annotationName, Map<String, String> params) {
+ public void registerSource(Object sourceClass, String annotationName, Map<String, Object> params) {
JavaClass clazz = (JavaClass) sourceClass;
RuntimeConfig config = getRuntimeConfig();
- String beanName = params.get("name");
+ AnnotationConstant propVal = (AnnotationConstant) params.get("name");
+ String beanName = (String) propVal.getParameterValue();
if (!hasToReregister(beanName, clazz)) {
return;
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java Mon Sep 21 17:20:12 2009
@@ -34,7 +34,7 @@
return false; //To change body of implemented methods use File | Settings | File Templates.
}
- public void registerSource(Object clazz, String annotationName, Map<String, String> params) {
+ public void registerSource(Object clazz, String annotationName, Map<String, Object> params) {
//To change body of implemented methods use File | Settings | File Templates.
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java Mon Sep 21 17:20:12 2009
@@ -19,11 +19,10 @@
package org.apache.myfaces.scripting.jsf2.annotation;
import com.thoughtworks.qdox.model.JavaClass;
+import org.apache.myfaces.scripting.api.AnnotationScanListener;
import java.util.Map;
-import org.apache.myfaces.scripting.api.AnnotationScanListener;
-
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -34,7 +33,7 @@
return false; //To change body of implemented methods use File | Settings | File Templates.
}
- public void registerSource(Object sourceClass, String annotationName, Map<String, String> params) {
+ public void registerSource(Object sourceClass, String annotationName, Map<String, Object> params) {
JavaClass clazz = (JavaClass) sourceClass;
//To change body of implemented methods use File | Settings | File Templates.
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java Mon Sep 21 17:20:12 2009
@@ -35,7 +35,7 @@
return false; //To change body of implemented methods use File | Settings | File Templates.
}
- public void registerSource(Object sourceClass, String annotationName, Map<String, String> params) {
+ public void registerSource(Object sourceClass, String annotationName, Map<String, Object> params) {
JavaClass clazz = (JavaClass) sourceClass;
//To change body of implemented methods use File | Settings | File Templates.
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java Mon Sep 21 17:20:12 2009
@@ -34,7 +34,7 @@
return false; //To change body of implemented methods use File | Settings | File Templates.
}
- public void registerSource(Object sourceClass, String annotationName, Map<String, String> params) {
+ public void registerSource(Object sourceClass, String annotationName, Map<String, Object> params) {
JavaClass clazz = (JavaClass) sourceClass;
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java?rev=817324&r1=817323&r2=817324&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java Mon Sep 21 17:20:12 2009
@@ -34,7 +34,7 @@
return false; //To change body of implemented methods use File | Settings | File Templates.
}
- public void registerSource(Object sourceClass, String annotationName, Map<String, String> params) {
+ public void registerSource(Object sourceClass, String annotationName, Map<String, Object> params) {
JavaClass clazz = (JavaClass) sourceClass;
//To change body of implemented methods use File | Settings | File Templates.
}