You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2008/12/05 20:46:13 UTC
svn commit: r723837 - in /geronimo/plugins/tuscany/trunk:
geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
tuscany-jetty/pom.xml tuscany-tomcat/pom.xml
Author: vamsic007
Date: Fri Dec 5 11:46:13 2008
New Revision: 723837
URL: http://svn.apache.org/viewvc?rev=723837&view=rev
Log:
Dependency injection support for JSF.
Modified:
geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java?rev=723837&r1=723836&r2=723837&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java Fri Dec 5 11:46:13 2008
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarEntry;
@@ -235,6 +236,14 @@
}
}
+ // MyFaces processing
+ if(webModule.getClassFinder() != null) {
+ List<Class> facesClasses = webModule.getClassFinder().findClassesInPackage("", true);
+ for(Class clazz: facesClasses) {
+ processWebArtifactClass(clazz, compContext, holder, thisComponentName);
+ }
+ }
+
// Add dependency so that EmbeddedRuntime starts before the WebAppContext
((GBeanData)earContext.getConfiguration().findGBeanDatas(Collections.singleton(new AbstractNameQuery(module.getModuleName()))).toArray()[0]).addDependency(abstractName);
Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=723837&r1=723836&r2=723837&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Fri Dec 5 11:46:13 2008
@@ -128,11 +128,14 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
</dependency>
+ <!-- Is this dependency needed (may be when using ejb binding)? This is resulting in ClassFinder linkage
+ error since ClassFinder is getting loaded from openejb//car as well.
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-corba-yoko</artifactId>
<type>car</type>
</dependency>
+ -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml?rev=723837&r1=723836&r2=723837&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Fri Dec 5 11:46:13 2008
@@ -128,11 +128,14 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
</dependency>
+ <!-- Is this dependency needed (may be when using ejb binding)? This is resulting in ClassFinder linkage
+ error since ClassFinder is getting loaded from openejb//car as well.
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-corba-yoko</artifactId>
<type>car</type>
</dependency>
+ -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>