geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1150557 - in /geronimo/sandbox/djencks/txmanager: connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ geronimo-connector-builder-1_6/ geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/de...
Date Mon, 25 Jul 2011 06:20:23 GMT
Author: djencks
Date: Mon Jul 25 06:20:22 2011
New Revision: 1150557

URL: http://svn.apache.org/viewvc?rev=1150557&view=rev
Log:
update to build against current osgi-friendly code

Modified:
    geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java

Modified: geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java?rev=1150557&r1=1150556&r2=1150557&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
Mon Jul 25 06:20:22 2011
@@ -73,6 +73,16 @@ public class DeployerTest {
                 mavenBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.2_spec").startLevel(1),
                 mavenBundle("org.apache.geronimo.bundles", "woodstox").startLevel(1),
                 mavenBundle("org.apache.geronimo.bundles", "jaxb-impl").startLevel(2),
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-jexl"),
 //yuck
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cglib"),
 //yuck
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xpp3"),
 //yuck
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xstream"),
  //yuck
+                mavenBundle("org.apache.xbean", "xbean-bundleutils"),                //yuck
+                mavenBundle("org.apache.xbean", "xbean-finder"),                //yuck
+                mavenBundle("org.apache.xbean", "xbean-reflect"),                //yuck
+                mavenBundle("asm", "asm-all"),                //yuck
+                mavenBundle("org.apache.geronimo.framework", "geronimo-crypto"),        
       //yuck
+                mavenBundle("org.apache.geronimo.framework", "geronimo-kernel"),        
       //yuck
                 mavenBundle("org.apache.geronimo.framework", "geronimo-common").startLevel(2),
 //                mavenBundle("org.apache.geronimo.modules", "geronimo-j2ee-builder").startLevel(2),
                 mavenBundle("org.apache.openejb", "openejb-jee").startLevel(2),

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml?rev=1150557&r1=1150556&r2=1150557&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml Mon Jul 25 06:20:22
2011
@@ -57,12 +57,18 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${geronimoVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-kernel</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-management</artifactId>-->
+            <!--<version>${geronimoVersion}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
@@ -73,11 +79,11 @@
         <!--<artifactId>geronimo-service-builder</artifactId>-->
         <!--<version>${project.version}</version>-->
         <!--</dependency>-->
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-system</artifactId>-->
+            <!--<version>${geronimoVersion}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.openejb</groupId>
@@ -100,10 +106,10 @@
         <!--<artifactId>geronimo-j2ee-schema</artifactId>-->
         <!--<version>${project.version}</version>-->
         <!--</dependency>-->
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.components</groupId>-->
+            <!--<artifactId>geronimo-transaction</artifactId>-->
+        <!--</dependency>-->
 
         <!--<dependency>-->
         <!--<groupId>org.apache.geronimo.modules</groupId>-->
@@ -119,12 +125,12 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>test</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jms_1.1_spec</artifactId>-->
+            <!--<version>1.1.1</version>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=1150557&r1=1150556&r2=1150557&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Mon Jul 25 06:20:22 2011
@@ -42,6 +42,7 @@ import org.apache.geronimo.gbean.Abstrac
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.j2ee.annotation.ReferenceType;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
@@ -136,13 +137,13 @@ public class AdminObjectRefBuilder exten
             Set<AbstractNameQuery> query = new HashSet<AbstractNameQuery>();
             query.add(transactionManager);
             GBeanReference transactionManagerRef = new GBeanReference(module.getConfigId(),
query, TransactionManager.class);
-            put("java:comp/TransactionManager", transactionManagerRef, module.getJndiContext(),
Collections.<InjectionTarget>emptyList(), sharedContext);
+            put("java:comp/TransactionManager", transactionManagerRef, ReferenceType.RESOURCE,
module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
             GBeanReference transactionSynchronizationRef = new GBeanReference(module.getConfigId(),
query, TransactionSynchronizationRegistry.class);
-            put("java:comp/TransactionSynchronizationRegistry", transactionSynchronizationRef,
module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+            put("java:comp/TransactionSynchronizationRegistry", transactionSynchronizationRef,
ReferenceType.RESOURCE, module.getJndiContext(), Collections.<InjectionTarget>emptyList(),
sharedContext);
         }
         
-        put("java:comp/Bundle", new BundleReference(), module.getJndiContext(), Collections.<InjectionTarget>emptyList(),
sharedContext);
-        put("java:comp/BundleContext", new BundleContextReference(), module.getJndiContext(),
Collections.<InjectionTarget>emptyList(), sharedContext);
+        put("java:comp/Bundle", new BundleReference(), ReferenceType.RESOURCE, module.getJndiContext(),
Collections.<InjectionTarget>emptyList(), sharedContext);
+        put("java:comp/BundleContext", new BundleContextReference(), ReferenceType.RESOURCE,
module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
         
         XmlObject[] gerResourceEnvRefsUntyped = plan == null ? NO_REFS : plan.selectChildren(GER_ADMIN_OBJECT_REF_QNAME_SET);
         Map<String, GerResourceEnvRefType> refMap = mapResourceEnvRefs(gerResourceEnvRefsUntyped);
@@ -191,7 +192,7 @@ public class AdminObjectRefBuilder exten
             if (value == null) {
                 unresolvedRefs.add(name);
             } else {
-                put(name, value, module.getJndiContext(), resourceEnvRef.getInjectionTarget(),
sharedContext);
+                put(name, value, ReferenceType.RESOURCE_ENV, module.getJndiContext(), resourceEnvRef.getInjectionTarget(),
sharedContext);
             }
         }
 
@@ -234,7 +235,7 @@ public class AdminObjectRefBuilder exten
             }
 
             if (value != null) {
-                put(name, value, module.getJndiContext(), messageDestinationRef.getInjectionTarget(),
sharedContext);
+                put(name, value, ReferenceType.RESOURCE_ENV, module.getJndiContext(), messageDestinationRef.getInjectionTarget(),
sharedContext);
             }
         }
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=1150557&r1=1150556&r2=1150557&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Mon Jul 25 06:20:22 2011
@@ -43,6 +43,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.j2ee.annotation.ReferenceType;
 import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -138,7 +139,7 @@ public class ResourceRefBuilder extends 
                 
                 // Always merge injections. This is for example where data source is defined
as
                 // @DataSource(name='foo') and it is injected via @Resource(name='foo')
-                addInjections(normalize(name), resourceRef.getInjectionTarget(), NamingBuilder.INJECTION_KEY.get(sharedContext));
+                addInjections(normalize(name), ReferenceType.RESOURCE, resourceRef.getInjectionTarget(),
NamingBuilder.INJECTION_KEY.get(sharedContext));
                 
                 continue;
             }            
@@ -165,7 +166,7 @@ public class ResourceRefBuilder extends 
             if (value == null) {
                 unresolvedRefs.add(name);
             } else {
-                put(name, value, module.getJndiContext(), resourceRef.getInjectionTarget(),
sharedContext);
+                put(name, value, ReferenceType.RESOURCE, module.getJndiContext(), resourceRef.getInjectionTarget(),
sharedContext);
             }
 
         }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java?rev=1150557&r1=1150556&r2=1150557&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
Mon Jul 25 06:20:22 2011
@@ -38,6 +38,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.j2ee.annotation.ReferenceType;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -172,7 +173,7 @@ public class DataSourceBuilder extends A
         resourceAdapterModuleInfo.managedConnectionFactoryInfos.add(dsDescription);
 
         Object ref = new JndiReference("aries:services/" + osgiJndiName);
-        put(jndiName, ref, module.getJndiContext(), Collections.<InjectionTarget>emptyList(),
sharedContext);
+        put(jndiName, ref, ReferenceType.DATA_SOURCE, module.getJndiContext(), Collections.<InjectionTarget>emptyList(),
sharedContext);
     }
     
     private DataSource processDefinition(DataSourceDefinition dsDefinition, JndiConsumer
annotatedApp) {

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java?rev=1150557&r1=1150556&r2=1150557&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/InfoBuilderTest.java
Mon Jul 25 06:20:22 2011
@@ -91,6 +91,16 @@ public class InfoBuilderTest {
                 mavenBundle("org.apache.geronimo.bundles", "jaxb-impl"),
                 mavenBundle("org.apache.openejb", "openejb-jee"),
                 mavenBundle("org.apache.geronimo.components", "geronimo-mock-ra"),
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-jexl"),
 //yuck
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cglib"),
 //yuck
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xpp3"),
 //yuck
+                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xstream"),
  //yuck
+                mavenBundle("org.apache.xbean", "xbean-bundleutils"),                //yuck
+                mavenBundle("org.apache.xbean", "xbean-finder"),                //yuck
+                mavenBundle("org.apache.xbean", "xbean-reflect"),                //yuck
+                mavenBundle("asm", "asm-all"),                //yuck
+                mavenBundle("org.apache.geronimo.framework", "geronimo-crypto"),        
       //yuck
+                mavenBundle("org.apache.geronimo.framework", "geronimo-kernel"),        
       //yuck
                 mavenBundle("org.apache.geronimo.framework", "geronimo-common"),
 
 



Mime
View raw message