You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/04/20 11:54:19 UTC
svn commit: r935849 - in /geronimo/sandbox/shawn/openwebbeans:
geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/
geronimo-openwebbeans/ openwebbeans/src/main/history/
Author: genspring
Date: Tue Apr 20 09:54:18 2010
New Revision: 935849
URL: http://svn.apache.org/viewvc?rev=935849&view=rev
Log:
Enable the running of openwebbeans deployer.
Modified:
geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml
geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml
Modified: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=935849&r1=935848&r2=935849&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java (original)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java Tue Apr 20 09:54:18 2010
@@ -134,7 +134,7 @@ public class OpenWebBeansModuleBuilderEx
}
AbstractName moduleName = moduleContext.getModuleName();
- Map<NamingBuilder.Key, Object> buildingContext = new HashMap<NamingBuilder.Key, Object>();
+ Map<EARContext.Key, Object> buildingContext = new HashMap<EARContext.Key, Object>();
buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
// use the same jndi context as the web app
Modified: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java?rev=935849&r1=935848&r2=935849&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java (original)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java Tue Apr 20 09:54:18 2010
@@ -26,7 +26,6 @@ import org.apache.webbeans.spi.ContextsS
import org.apache.webbeans.spi.JNDIService;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.spi.ServiceLoader;
-import org.apache.webbeans.spi.deployer.MetaDataDiscoveryService;
import org.apache.webbeans.xml.WebBeansXMLConfigurator;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
@@ -47,9 +46,6 @@ public final class WebBeansScanner {
// XML discovery is removed from the specification. It is here for next revisions of spec.
private final WebBeansXMLConfigurator xmlDeployer;
- /** Discover bean classes */
- private MetaDataDiscoveryService discovery = null;
-
/** Deploy discovered beans */
private final BeansDeployer deployer;
@@ -71,10 +67,10 @@ public final class WebBeansScanner {
BundleClassLoader bundleClassloader = new BundleClassLoader(bundle);
Thread.currentThread().setContextClassLoader(bundleClassloader);
-
this.rootManager = (BeanManagerImpl) WebBeansFinder.getSingletonInstance(WebBeansFinder.SINGLETON_MANAGER);
this.xmlDeployer = new WebBeansXMLConfigurator();
this.deployer = new BeansDeployer(this.xmlDeployer);
+ ServiceLoader.class.getClassLoader();
this.jndiService = ServiceLoader.getService(JNDIService.class);
this.rootManager.setXMLConfigurator(this.xmlDeployer);
this.scannerService = ServiceLoader.getService(ScannerService.class);
@@ -89,8 +85,8 @@ public final class WebBeansScanner {
long begin = System.currentTimeMillis();
- this.discovery = ServiceLoader.getService(MetaDataDiscoveryService.class);
- this.discovery.init(null);
+ /*this.discovery = ServiceLoader.getService(MetaDataDiscoveryService.class);
+ this.discovery.init(null);*/
// load all optional plugins
PluginLoader.getInstance().startUp();
@@ -100,7 +96,7 @@ public final class WebBeansScanner {
BundleClassLoader bundleClassloader = new BundleClassLoader(bundle);
Thread.currentThread().setContextClassLoader(bundleClassloader);
- this.discovery.scan();
+ /* this.discovery.scan();*/
Thread.currentThread().setContextClassLoader(oldCL);
@@ -108,7 +104,7 @@ public final class WebBeansScanner {
logger.info("Deploying the scanned beans artifacts");
- deployer.deploy(this.discovery);
+/* deployer.deploy(this.discovery);*/
logger.info("Deploying is ended");
Modified: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml?rev=935849&r1=935848&r2=935849&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml Tue Apr 20 09:54:18 2010
@@ -68,55 +68,81 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- </dependency>
-
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<optional>true</optional>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
<version>1.6.1_3-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.javassist</artifactId>
<version>3.7.ga_1-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<version>1.0.2_1-SNAPSHOT</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>1.0.0-incubating-SNAPSHOT_1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
</dependency>
+
+
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>1.0.0-incubating-SNAPSHOT_1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=935849&r1=935848&r2=935849&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml Tue Apr 20 09:54:18 2010
@@ -18,6 +18,16 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -58,7 +68,12 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
<type>jar</type>
</dependency>
<dependency>