geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r781938 - in /geronimo/plugins/tuscany/trunk: ./ geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/runtime/ geronimo-tuscany-implementation-web/src/main/java/org/apache/tuscany/sca/implementation/we...
Date Fri, 05 Jun 2009 08:12:24 GMT
Author: vamsic007
Date: Fri Jun  5 08:12:24 2009
New Revision: 781938

URL: http://svn.apache.org/viewvc?rev=781938&view=rev
Log:
o Switch to v1.5 of Tuscany SCA, v2.1.4 of Geronimo.
o Update TuscanyBuilder to let ModuleBuilderExtension handle Web, EJB and EAR archives
o Change MediatorImpl constructor

Modified:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/runtime/EJBImplementationProviderFactory.java
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
    geronimo/plugins/tuscany/trunk/pom.xml
    geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/runtime/EJBImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/runtime/EJBImplementationProviderFactory.java?rev=781938&r1=781937&r2=781938&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/runtime/EJBImplementationProviderFactory.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/runtime/EJBImplementationProviderFactory.java
Fri Jun  5 08:12:24 2009
@@ -43,7 +43,7 @@
     public EJBImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
         DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
         TransformerExtensionPoint transformers = extensionPoints.getExtensionPoint(TransformerExtensionPoint.class);
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
+        MediatorImpl mediator = new MediatorImpl(extensionPoints);
         propertyValueFactory = new JavaPropertyValueObjectFactory(mediator);
     }
     

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java?rev=781938&r1=781937&r2=781938&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
Fri Jun  5 08:12:24 2009
@@ -45,7 +45,7 @@
     public WebImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
         DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
         TransformerExtensionPoint transformers = extensionPoints.getExtensionPoint(TransformerExtensionPoint.class);
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
+        MediatorImpl mediator = new MediatorImpl(extensionPoints);
         propertyValueFactory = new JavaPropertyValueObjectFactory(mediator);
     }
 

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java?rev=781938&r1=781937&r2=781938&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
Fri Jun  5 08:12:24 2009
@@ -106,6 +106,18 @@
             }
         }
         if(!probables.isEmpty()) {
+            for(String entry: probables) {
+                if(entry.endsWith("ejb-jar.composite")) {
+                    // Found ejb-jar.composite. Let the MBE process the archive.
+                    return null;
+                } else if(entry.endsWith("web.composite")) {
+                    // Found web.composite.  Let the MBE process the archive.
+                    return null;
+                } else if(entry.endsWith("application.composite")) {
+                    // Found application.composite. Let the MBE process the archive.
+                    return null;
+                }
+            }
             return probables; // Return anything non null
         } else {
             return null;

Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=781938&r1=781937&r2=781938&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Fri Jun  5 08:12:24 2009
@@ -56,9 +56,9 @@
         <version>1.0-SNAPSHOT</version>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
-        <geronimoVersion>2.1.3</geronimoVersion>
+        <geronimoVersion>2.1.4</geronimoVersion>
         <geronimoTransactionVersion>2.1.1</geronimoTransactionVersion>
-        <tuscanyVersion>1.5-SNAPSHOT</tuscanyVersion>
+        <tuscanyVersion>1.5</tuscanyVersion>
         <tuscanySdoVersion>1.1.1</tuscanySdoVersion>
         <tuscanyDasVersion>1.0-incubating-beta2</tuscanyDasVersion>
         <axis2Version>1.4.1</axis2Version>
@@ -433,6 +433,16 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-contribution-jee</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-contribution-jee-impl</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-contribution-namespace</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=781938&r1=781937&r2=781938&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Fri Jun  5 08:12:24 2009
@@ -246,6 +246,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
         </dependency>
         <dependency>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml?rev=781938&r1=781937&r2=781938&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Fri Jun  5 08:12:24 2009
@@ -246,6 +246,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-jee-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
         </dependency>
         <dependency>



Mime
View raw message