geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r725388 - in /geronimo/plugins/tuscany/trunk/geronimo-tuscany: pom.xml src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
Date Wed, 10 Dec 2008 19:15:03 GMT
Author: vamsic007
Date: Wed Dec 10 11:15:03 2008
New Revision: 725388

URL: http://svn.apache.org/viewvc?rev=725388&view=rev
Log:
For web component name, look for component with implementation.web in web.composite.

Modified:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml?rev=725388&r1=725387&r2=725388&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml Wed Dec 10 11:15:03 2008
@@ -62,6 +62,10 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java?rev=725388&r1=725387&r2=725388&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyModuleBuilderExtension.java
Wed Dec 10 11:15:03 2008
@@ -77,6 +77,7 @@
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
 import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
+import org.apache.tuscany.sca.implementation.web.WebImplementation;
 import org.apache.xmlbeans.XmlObject;
 import org.osoa.sca.annotations.ComponentName;
 import org.osoa.sca.annotations.Context;
@@ -207,11 +208,15 @@
         try {
             Contribution contribution = getEmbeddedSCADomain().getContributionService().contribute(appCompositeJarFile.toURL().toString(),
appCompositeJarFile.toURL(), modelResolver, false);
             for(Artifact artifact : contribution.getArtifacts()) {
-                if (artifact.getModel() instanceof Composite) {
+                if (artifact.getModel() instanceof Composite && artifact.getURI().endsWith("web.composite"))
{
                     for(Component component : ((Composite)artifact.getModel()).getComponents())
{
-                        thisComponentName = component.getName();
-                        break;
+                        if(component.getImplementation() instanceof WebImplementation) {
+                            // TODO: Check if the web-uri matches the module jar file
+                            thisComponentName = component.getName();
+                            break;
+                        }
                     }
+                    break;
                 }
             }
         } catch (Exception e1) {



Mime
View raw message