geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r929872 - in /geronimo/sandbox/shawn/openwebbeans: geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/ openwebbeans-deployer/src/main/history/ openwebbeans/src/main/history/
Date Thu, 01 Apr 2010 07:42:39 GMT
Author: genspring
Date: Thu Apr  1 07:42:38 2010
New Revision: 929872

URL: http://svn.apache.org/viewvc?rev=929872&view=rev
Log:
Fixes the compile problems caused by the OSGI api inclusion.

Modified:
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.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=929872&r1=929871&r2=929872&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
Thu Apr  1 07:42:38 2010
@@ -54,6 +54,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.jar.JarFile;
 
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
 /**
  * @version $Rev $Date
  */
@@ -70,23 +75,40 @@ public class OpenWebBeansModuleBuilderEx
         this.defaultEnvironment = defaultEnvironment;
         this.namingBuilders = namingBuilders;
     }
+    
+    
+    public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder
idBuilder) throws DeploymentException {
+        if (!(module instanceof WebModule)) {
+            //not a web module, nothing to do
+            return;
+        }
+
+        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+    
+    }
 
+    
     public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath,
URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming
naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    
         if (!(module instanceof WebModule)) {
             //not a web module, nothing to do
             return;
         }
 
-        EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+    
     }
 
+    
+    
+
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
     }
 
-    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws
DeploymentException {
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException
{
     }
 
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection
repository) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection
repository) throws DeploymentException {
         if (!(module instanceof WebModule)) {
             //not a web module, nothing to do
             return;
@@ -145,7 +167,7 @@ public class OpenWebBeansModuleBuilderEx
                 (webModule != null ? webModule.getName() : null) + " ): Entry");
 
         // Get the classloader from the module's EARContext
-        ClassLoader classLoader = webModule.getEarContext().getClassLoader();
+        Bundle bundle = webModule.getEarContext().getDeploymentBundle();
 
         List<Class> classes = new ArrayList<Class>();
 

Modified: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml?rev=929872&r1=929871&r2=929872&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
Thu Apr  1 07:42:38 2010
@@ -11,7 +11,7 @@
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openwebbeans</artifactId>
         <type>car</type>

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=929872&r1=929871&r2=929872&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml Thu
Apr  1 07:42:38 2010
@@ -7,34 +7,38 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
+        <groupId>dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-openwebbeans</artifactId>
+        <groupId>javassist</groupId>
+        <artifactId>javassist</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openwebbeans</groupId>
-        <artifactId>openwebbeans-impl</artifactId>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <type>jar</type>
     </dependency>
-
     <dependency>
-        <groupId>dom4j</groupId>
-        <artifactId>dom4j</artifactId>
+        <groupId>net.sf.scannotation</groupId>
+        <artifactId>scannotation</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javassist</groupId>
-        <artifactId>javassist</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-openwebbeans</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>net.sf.scannotation</groupId>
-        <artifactId>scannotation</artifactId>
+        <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>atinject-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -43,6 +47,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
         <type>jar</type>



Mime
View raw message