geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r833047 - in /geronimo/server/trunk: ./ framework/modules/geronimo-service-builder/ plugins/connector-1_6/geronimo-connector-1_6/ plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/ plugins/jaxws/geroni...
Date Thu, 05 Nov 2009 13:39:38 GMT
Author: rickmcguire
Date: Thu Nov  5 13:38:15 2009
New Revision: 833047

URL: http://svn.apache.org/viewvc?rev=833047&view=rev
Log:
more bundle dependency cleanup

Modified:
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Thu Nov  5 13:38:15
2009
@@ -86,10 +86,13 @@
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                         <Import-Package>org.apache.xmlbeans.impl.schema,*</Import-Package>
                         <Export-Package>
-org.apache.geronimo.deployment.xbeans.impl,
-org.apache.geronimo.deployment.javabean.xbeans.impl,
-schemaorg_apache_xmlbeans*,
-org.apache.geronimo.deployment*
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans*,
+                            org.apache.geronimo.deployment.javabean.xbeans*,
+                            schemaorg_apache_xmlbeans*,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service*
                         </Export-Package>
                     </instructions>
                 </configuration>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Thu Nov  5
13:38:15 2009
@@ -27,7 +27,7 @@
         <artifactId>connector-1_6</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-connector-1_6</artifactId>
     <packaging>bundle</packaging>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
Thu Nov  5 13:38:15 2009
@@ -49,7 +49,6 @@
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.osgi.BundleClassLoader;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.openejb.deployment.EjbModule;
 import org.apache.geronimo.security.jaas.ConfigurationFactory;
@@ -233,7 +232,7 @@
             }
 
             if (jaxwsBuilder.configureEJB(ejbWebServiceGBean, bean.ejbName, ejbModule,
-                                          ejbModule.getSharedContext(), new BundleClassLoader(bundle)))
{
+                                          ejbModule.getSharedContext(), bundle)) {
 
                 try {
                     earContext.addGBean(ejbWebServiceGBean);

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Thu Nov  5 13:38:15 2009
@@ -82,10 +82,13 @@
             <!--<version>${version}</version>-->
         <!--</dependency>-->
 
+<!--    part of java 6 now.  Can cause bundle contstraint violations if
+        loaded because the framework has same classes.
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
+            <scope>provided</scope>
+        </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -106,7 +109,7 @@
           <groupId>org.apache.geronimo.schema</groupId>
           <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Thu
Nov  5 13:38:15 2009
@@ -18,22 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jaxws-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml
Thu Nov  5 13:38:15 2009
@@ -18,17 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jaxws-ejb-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-openejb-builder</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
Thu Nov  5 13:38:15 2009
@@ -70,6 +70,8 @@
 import org.apache.xbean.finder.ClassFinder;
 import org.apache.xmlbeans.XmlObject;
 
+import org.osgi.framework.Bundle;
+
 /**
  * Handles building ejb deployment gbeans.
  */
@@ -88,7 +90,7 @@
         this.ejbModule = ejbModule;
         this.namingBuilder = namingBuilder;
         this.resourceEnvironmentSetter = resourceEnvironmentSetter;
-        
+
         beanNameBuilder = new BasicEjbDeploymentGBeanNameBuilder();
     }
 
@@ -422,7 +424,7 @@
 
         try {
             // Get the classloader from the module's EARContext
-            ClassLoader classLoader = ejbModule.getEarContext().getClassLoader();
+            Bundle bundle = ejbModule.getEarContext().getBundle();
 
             //----------------------------------------------------------------------------------------
             // Find the list of classes from the ejb-jar.xml we want to search for annotations
in
@@ -430,7 +432,7 @@
             List<Class> classes = new ArrayList<Class>();
 
             for (EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {
-                classes.add(classLoader.loadClass(bean.getEjbClass()));
+                classes.add(bundle.loadClass(bean.getEjbClass()));
             }
 
             return new ClassFinder(classes);

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Thu Nov  5 13:38:15 2009
@@ -20,17 +20,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.jar.JarFile;
 
 import javax.ejb.EntityContext;
@@ -40,10 +30,8 @@
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceContext;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.connector.ResourceAdapterWrapperGBean;
+import org.apache.geronimo.connector.wrapper.ResourceAdapterWrapperGBean;
 import org.apache.geronimo.deployment.ClassPathList;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.ModuleList;
@@ -58,8 +46,8 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
@@ -73,6 +61,7 @@
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.osgi.BundleClassLoader;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
@@ -81,32 +70,15 @@
 import org.apache.geronimo.openejb.EjbModuleImplGBean;
 import org.apache.geronimo.openejb.OpenEjbSystem;
 import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
+import org.apache.geronimo.persistence.PersistenceUnitGBean;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
 import org.apache.geronimo.xbeans.javaee.EjbJarType;
-import org.apache.geronimo.persistence.PersistenceUnitGBean;
 import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.util.LinkResolver;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.CmpJarBuilder;
-import org.apache.openejb.assembler.classic.ContainerInfo;
-import org.apache.openejb.assembler.classic.ContainerSystemInfo;
-import org.apache.openejb.assembler.classic.EjbJarInfo;
-import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
-import org.apache.openejb.assembler.classic.FacilitiesInfo;
-import org.apache.openejb.assembler.classic.MdbContainerInfo;
-import org.apache.openejb.assembler.classic.MessageDrivenBeanInfo;
-import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
-import org.apache.openejb.assembler.classic.StatefulBeanInfo;
-import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo;
-import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
-import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
-import org.apache.openejb.assembler.classic.SingletonSessionContainerInfo;
-import org.apache.openejb.assembler.classic.BmpEntityContainerInfo;
-import org.apache.openejb.assembler.classic.CmpEntityContainerInfo;
-import org.apache.openejb.util.UniqueDefaultLinkResolver;
+import org.apache.openejb.assembler.classic.*;
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.ConfigurationFactory.Chain;
 import org.apache.openejb.config.DeploymentLoader;
 import org.apache.openejb.config.ReadDescriptors;
 import org.apache.openejb.config.UnknownModuleTypeException;
@@ -114,7 +86,6 @@
 import org.apache.openejb.config.ValidationError;
 import org.apache.openejb.config.ValidationFailedException;
 import org.apache.openejb.config.ValidationFailure;
-import org.apache.openejb.config.ConfigurationFactory.Chain;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.EjbRef;
 import org.apache.openejb.jee.EnterpriseBean;
@@ -134,8 +105,13 @@
 import org.apache.openejb.jee.oejb2.PatternType;
 import org.apache.openejb.jee.oejb2.ResourceLocatorType;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.LinkResolver;
+import org.apache.openejb.util.UniqueDefaultLinkResolver;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Master builder for processing EJB JAR deployments and creating the
@@ -403,7 +379,7 @@
                 } else if (ref.getType().equals(MessageDrivenContext.class.getName())) {
                     iterator.remove();
                 } else if (ref.getType().equals(TimerService.class.getName())) {
-                    iterator.remove();   
+                    iterator.remove();
                 } else if (ref.getType().equals(WebServiceContext.class.getName())) {
                     iterator.remove();
                 } else {
@@ -496,10 +472,10 @@
         return true;
     }
 
-    public void initContext(EARContext earContext, Module module, ClassLoader classLoader)
throws DeploymentException {
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException
{
         EjbModule ejbModule = (EjbModule) module;
 
-        EjbJarInfo ejbJarInfo = getEjbJarInfo(earContext, ejbModule, classLoader);
+        EjbJarInfo ejbJarInfo = getEjbJarInfo(earContext, ejbModule, bundle);
 
         ejbModule.setEjbJarInfo(ejbJarInfo);
 
@@ -547,7 +523,7 @@
 
         for (ModuleBuilderExtension builder : moduleBuilderExtensions) {
             try {
-                builder.initContext(earContext, module, classLoader);
+                builder.initContext(earContext, module, bundle);
             } catch (Throwable t) {
                 String builderName = builder.getClass().getSimpleName();
                 log.error(builderName + ".initContext() failed: " + t.getMessage(), t);
@@ -555,15 +531,17 @@
         }
     }
 
-    private EjbJarInfo getEjbJarInfo(EARContext earContext, EjbModule ejbModule, ClassLoader
classLoader) throws DeploymentException {
+    private EjbJarInfo getEjbJarInfo(EARContext earContext, EjbModule ejbModule, Bundle bundle)
throws DeploymentException {
         EarData earData = (EarData) earContext.getGeneralData().get(EarData.class);
         if (earData.getEjbJars().isEmpty()) {
 
+            ClassLoader bundleLoader = new BundleClassLoader(bundle);
+
             // temporary classloader is used for processing ejb annotations and byte code
manipulation during ejb load
-            TemporaryClassLoader temporaryClassLoader = new TemporaryClassLoader(new URL[0],
classLoader);
+            TemporaryClassLoader temporaryClassLoader = new TemporaryClassLoader(new URL[0],
bundleLoader);
 
             // create an openejb app module for the ear containing all ejb modules
-            AppModule appModule = new AppModule(classLoader, earContext.getConfigID().toString());
+            AppModule appModule = new AppModule(bundleLoader, earContext.getConfigID().toString());
             for (EjbModule module : earData.getEjbModuels()) {
                 module.setClassLoader(temporaryClassLoader);
                 appModule.getEjbModules().add(module.getEjbModule());
@@ -598,7 +576,7 @@
             }
 
             // add the cmp jar
-            CmpJarBuilder cmp2Builder = new CmpJarBuilder(appInfo, classLoader);
+            CmpJarBuilder cmp2Builder = new CmpJarBuilder(appInfo, bundleLoader);
             try {
                 File generatedJar = cmp2Builder.getJarFile();
                 if (generatedJar != null) {
@@ -630,7 +608,7 @@
         openEjbConfiguration.containerSystem = new ContainerSystemInfo();
         openEjbConfiguration.facilities = new FacilitiesInfo();
         boolean offline = true;
-        
+
         ConfigurationFactory configurationFactory = new ConfigurationFactory(offline,
             ejbModule.getPreAutoConfigDeployer(),
             openEjbConfiguration);
@@ -687,15 +665,15 @@
 
                 try {
                     containerInfo.properties.put("MessageListenerInterface",
-                        configuration.getConfigurationClassLoader().loadClass(messageListenerInterface));
+                        configuration.getBundle().loadClass(messageListenerInterface));
                 } catch (ClassNotFoundException e) {
-                    throw new OpenEJBException("Could not load MessageListenerInterface "
+ messageListenerInterface + " in classloader: " + configuration.getConfigurationClassLoader(),
e);
+                    throw new OpenEJBException("Could not load MessageListenerInterface "
+ messageListenerInterface + " in bundle: " + configuration.getBundle(), e);
                 }
                 try {
                     containerInfo.properties.put("ActivationSpecClass",
-                        configuration.getConfigurationClassLoader().loadClass(activationSpecClass));
+                        configuration.getBundle().loadClass(activationSpecClass));
                 } catch (ClassNotFoundException e) {
-                    throw new OpenEJBException("Could not load ActivationSpecClass " + activationSpecClass
+ " in classloader: " + configuration.getConfigurationClassLoader(), e);
+                    throw new OpenEJBException("Could not load ActivationSpecClass " + activationSpecClass
+ " in bundle: " + configuration.getBundle(), e);
                 }
                 containerInfo.properties.put("TxRecovery", true);
                 //TODO is this necessary????
@@ -760,7 +738,7 @@
      * Does the meaty work of processing the deployment information and
      * creating GBeans for all the EJBs in the JAR, etc.
      */
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection
repositories) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection
repositories) throws DeploymentException {
         EjbModule ejbModule = (EjbModule) module;
         EjbDeploymentBuilder ejbDeploymentBuilder = ejbModule.getEjbBuilder();
 
@@ -822,7 +800,7 @@
 
         for (ModuleBuilderExtension builder : moduleBuilderExtensions) {
             try {
-                builder.addGBeans(earContext, module, cl, repositories);
+                builder.addGBeans(earContext, module, bundle, repositories);
             } catch (Throwable t) {
                 String builderName = builder.getClass().getSimpleName();
                 log.error(builderName + ".addGBeans() failed: " + t.getMessage(), t);

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Thu Nov  5 13:38:15 2009
@@ -40,6 +40,10 @@
             <artifactId>geronimo-interceptor_3.0_spec</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <exclusions>
@@ -120,11 +124,6 @@
 
         <dependency>
             <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-ejbd</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-javaagent</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
Thu Nov  5 13:38:15 2009
@@ -16,7 +16,7 @@
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
         <type>car</type>
@@ -31,4 +31,9 @@
         <artifactId>geronimo-webservices-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Thu Nov
 5 13:38:15 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
@@ -63,11 +63,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>javaee-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-api</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Thu Nov  5 13:38:15
2009
@@ -63,11 +63,14 @@
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
+
+<!--    part of java 6 now.  Can cause bundle contstraint violations if
+        loaded because the framework has same classes.
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jaxws</artifactId>
-            <version>${version}</version>
-        </dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>-->
 
          <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
Thu Nov  5 13:38:15 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
@@ -38,35 +38,10 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-webservices</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxr_1.0_spec</artifactId>
         <type>jar</type>
@@ -78,25 +53,10 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-saaj_1.3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
         <type>jar</type>
@@ -106,9 +66,4 @@
         <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=833047&r1=833046&r2=833047&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Nov  5 13:38:15 2009
@@ -1183,6 +1183,10 @@
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>javaee-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message