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 2012/12/04 12:09:16 UTC
svn commit: r1416885 - in /myfaces/extensions/scripting/trunk:
extscript-bundles/ extscript-core-root/
extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/
extscript-examples/cdi-example/
Author: werpu
Date: Tue Dec 4 11:09:14 2012
New Revision: 1416885
URL: http://svn.apache.org/viewvc?rev=1416885&view=rev
Log:
refinement of the CDI throw away classloader
mojarra references again removed for commit
Modified:
myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml?rev=1416885&r1=1416884&r2=1416885&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml Tue Dec 4 11:09:14 2012
@@ -46,7 +46,9 @@
</scm>
<modules>
+ <!--
<module>extscript-myfaces20-bundle</module>
+ -->
<module>extscript-mojarra-bundle</module>
</modules>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java?rev=1416885&r1=1416884&r2=1416885&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java Tue Dec 4 11:09:14 2012
@@ -64,8 +64,7 @@ public class CDIThrowAwayClassloader ext
if(res == null) {
return clazz;
}
- //TODO check if the resource is a cdi resource or a jsf resource
- //and in case of a jsf resource keep it tainted
+
Annotation[] anns = clazz.getAnnotations();
boolean cdiAnnotation = false;
if(anns == null || anns.length == 0) {
@@ -76,6 +75,8 @@ public class CDIThrowAwayClassloader ext
if(cdiAnnotation) break;
}
}
+ //we have to taint so that the extscript
+ // scanner can take over
res.setTainted(!cdiAnnotation);
return clazz;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml?rev=1416885&r1=1416884&r2=1416885&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml Tue Dec 4 11:09:14 2012
@@ -45,8 +45,8 @@
<module>extscript-cdi</module>
<module>extscript-spring</module>
<module>extscript-myfaces</module>
- <module>extscript-mojarra</module>
<!--
+ <module>extscript-mojarra</module>
<module>extscript-weld</module>
-->
</modules>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/pom.xml?rev=1416885&r1=1416884&r2=1416885&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/pom.xml Tue Dec 4 11:09:14 2012
@@ -79,7 +79,6 @@
ext-scripting core+java6 support + myfaces 2 support
-->
-
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-cdi</artifactId>