geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r703354 - in /geronimo/plugins/tuscany/trunk: ./ geronimo-tuscany/ geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ tuscany-jetty/ tuscany-tomcat/
Date Fri, 10 Oct 2008 08:38:07 GMT
Author: vamsic007
Date: Fri Oct 10 01:38:06 2008
New Revision: 703354

URL: http://svn.apache.org/viewvc?rev=703354&view=rev
Log:
GERONIMO-4343 Tuscany Geronimo plugin bring up
 o Applying up-to-tuscany-1.4-snapshot.diff to bring the Tuscany version to 1.4-SNAPSHOT
 o Thanks Ant Elder for providing the patch.

Added:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
  (with props)
Modified:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml
    geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml?rev=703354&r1=703353&r2=703354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml Fri Oct 10 01:38:06 2008
@@ -50,10 +50,6 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java?rev=703354&r1=703353&r2=703354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
Fri Oct 10 01:38:06 2008
@@ -32,9 +32,8 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.core.spring.context.ModelResolverImpl;
+import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
 

Added: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java?rev=703354&view=auto
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
(added)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
Fri Oct 10 01:38:06 2008
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.geronimo.tuscany;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+
+/**
+ * A default implementation of an artifact resolver, based on a map.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ModelResolverImpl implements ModelResolver {
+    private static final long serialVersionUID = -7826976465762296634L;
+    
+    private Map<Object, Object> map = new HashMap<Object, Object>();
+    
+    private WeakReference<ClassLoader> classLoader;
+    
+    public ModelResolverImpl(ClassLoader classLoader) {
+        this.classLoader = new WeakReference<ClassLoader>(classLoader);
+    }
+
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        Object resolved = map.get(unresolved);
+        if (resolved != null) {
+            
+            // Return the resolved object
+            return modelClass.cast(resolved);
+            
+        } else if (unresolved instanceof ClassReference) {
+            
+            // Load a class on demand
+            ClassReference classReference = (ClassReference)unresolved;
+            Class clazz;
+            try {
+                clazz = Class.forName(classReference.getClassName(), true, classLoader.get());
+            } catch (ClassNotFoundException e) {
+                
+                // Return the unresolved object
+                return unresolved;
+            }
+            
+            // Store a new ClassReference wrapping the loaded class
+            resolved = new ClassReference(clazz);
+            map.put(resolved, resolved);
+            
+            // Return the resolved ClassReference
+            return modelClass.cast(resolved);
+                
+        } else {
+            
+            // Return the unresolved object
+            return unresolved;
+        }
+    }
+    
+    public void addModel(Object resolved) {
+        map.put(resolved, resolved);
+    }
+    
+    public Object removeModel(Object resolved) {
+        return map.remove(resolved);
+    }
+    
+}

Propchange: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/ModelResolverImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=703354&r1=703353&r2=703354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Fri Oct 10 01:38:06 2008
@@ -58,10 +58,10 @@
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
         <geronimoVersion>2.1.3</geronimoVersion>
         <geronimoTransactionVersion>2.1.1</geronimoTransactionVersion>
-        <tuscanyVersion>1.3</tuscanyVersion>
+        <tuscanyVersion>1.4-SNAPSHOT</tuscanyVersion>
         <tuscanySdoVersion>1.1.1</tuscanySdoVersion>
         <tuscanyDasVersion>1.0-incubating-beta2</tuscanyDasVersion>
-        <axis2Version>1.3</axis2Version>
+        <axis2Version>1.4.1</axis2Version>
     </properties>
 
     <dependencyManagement>
@@ -79,7 +79,7 @@
             <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
-                <version>2.2</version>
+                <version>3.1</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
@@ -99,32 +99,32 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.3</version>
+                <version>1.2</version>
             </dependency>
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
-                <version>1.1.1</version>
+                <version>1.2</version>
             </dependency>
             <dependency>
                 <groupId>commons-httpclient</groupId>
                 <artifactId>commons-httpclient</artifactId>
-                <version>3.0.1</version>
+                <version>3.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <version>1.1.1</version>
             </dependency>
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
-                <version>1.1-beta-11</version>
+                <version>1.1.1</version>
             </dependency>
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.14</version>
+                <version>1.2.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
@@ -143,27 +143,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws</artifactId>
-                <version>${axis2Version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws-api</artifactId>
-                <version>${axis2Version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-kernel</artifactId>
                 <version>${axis2Version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-metadata</artifactId>
-                <version>${axis2Version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-saaj</artifactId>
+                <artifactId>axis2-mtompolicy</artifactId>
                 <version>${axis2Version}</version>
             </dependency>
 
@@ -291,12 +276,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.0-alpha5</version>
+                <version>4.0-beta1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.neethi</groupId>
                 <artifactId>neethi</artifactId>
-                <version>2.0</version>
+                <version>2.0.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.rampart</groupId>
@@ -316,7 +301,7 @@
             <dependency>
                 <groupId>org.apache.santuario</groupId>
                 <artifactId>xmlsec</artifactId>
-                <version>1.4.0</version>
+                <version>1.4.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
@@ -326,11 +311,6 @@
 
             <!-- Tuscany Dependencies -->
             <dependency>
-                <groupId>org.apache.tuscany.das</groupId>
-                <artifactId>tuscany-das-rdb</artifactId>
-                <version>${tuscanyDasVersion}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-assembly</artifactId>
                 <version>${tuscanyVersion}</version>
@@ -342,67 +322,62 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ejb</artifactId>
+                <artifactId>tuscany-assembly-xsd</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
-            <!--dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-feed</artifactId>
-                <version>${tuscanyVersion}</version>
-            </dependency-->
-            <!--dependency>
+            <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-jms</artifactId>
+                <artifactId>tuscany-binding-sca</artifactId>
                 <version>${tuscanyVersion}</version>
-            </dependency-->
+            </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-jsonrpc</artifactId>
+                <artifactId>tuscany-binding-sca-xml</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-rmi</artifactId>
+                <artifactId>tuscany-binding-ws</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-sca</artifactId>
+                <artifactId>tuscany-binding-ws-axis2</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-sca-xml</artifactId>
+                <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws</artifactId>
+                <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-axis2</artifactId>
+                <artifactId>tuscany-binding-ws-xml</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
+                <artifactId>tuscany-contribution</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-binding-ws-xml</artifactId>
+                <artifactId>tuscany-contribution-impl</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-contribution</artifactId>
+                <artifactId>tuscany-contribution-java</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-contribution-impl</artifactId>
+                <artifactId>tuscany-contribution-namespace</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
@@ -427,22 +402,22 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-core-spring</artifactId>
+                <artifactId>tuscany-databinding</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding</artifactId>
+                <artifactId>tuscany-databinding-axiom</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding-axiom</artifactId>
+                <artifactId>tuscany-databinding-jaxb</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-databinding-jaxb</artifactId>
+                <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
@@ -457,12 +432,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-extensibility</artifactId>
+                <artifactId>tuscany-endpoint</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-extension-helper</artifactId>
+                <artifactId>tuscany-extensibility</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
@@ -477,7 +452,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-host-rmi</artifactId>
+                <artifactId>tuscany-host-webapp</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
@@ -497,6 +472,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-implementation-node</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
@@ -530,11 +510,16 @@
                 <artifactId>tuscany-monitor</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
-            <!--dependency>
+            <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-node</artifactId>
+                <artifactId>tuscany-node-api</artifactId>
                 <version>${tuscanyVersion}</version>
-            </dependency-->
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-node-impl</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-policy</artifactId>
@@ -542,74 +527,63 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-policy-xml</artifactId>
+                <artifactId>tuscany-policy-security</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-sca-api</artifactId>
+                <artifactId>tuscany-policy-xml</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-xsd</artifactId>
+                <artifactId>tuscany-policy-xml-ws</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-xsd-xml</artifactId>
+                <artifactId>tuscany-sca-api</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-api-r2.1</artifactId>
-                <version>${tuscanySdoVersion}</version>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-xsd</artifactId>
+                <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-impl</artifactId>
-                <version>${tuscanySdoVersion}</version>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-xsd-xml</artifactId>
+                <version>${tuscanyVersion}</version>
             </dependency>
-
             <dependency>
-                <groupId>org.apache.ws.commons</groupId>
+                <groupId>org.apache.ws.commons.schema</groupId>
                 <artifactId>XmlSchema</artifactId>
-                <version>1.1</version>
+                <version>1.4.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.7</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-dom</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.7</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-impl</artifactId>
-                <version>1.2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.ws.commons.schema</groupId>
-                <artifactId>XmlSchema</artifactId>
-                <version>1.3.1</version>
+                <version>1.2.7</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.security</groupId>
                 <artifactId>wss4j</artifactId>
-                <version>1.5.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xmlbeans</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.3.0</version>
+                <version>1.5.4</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.4</version>
             </dependency>
             <dependency>
                 <groupId>org.mortbay.jetty</groupId>
@@ -622,19 +596,9 @@
                 <version>1.0.1</version>
             </dependency>
             <dependency>
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.0</version>
-            </dependency>
-            <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
-                <version>1.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>xml-resolver</groupId>
-                <artifactId>xml-resolver</artifactId>
-                <version>1.1</version>
+                <version>1.6.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=703354&r1=703353&r2=703354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Fri Oct 10 01:38:06 2008
@@ -107,24 +107,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-metadata</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-saaj</artifactId>
-        </dependency>
 
         <!-- Geronimo dependencies -->
         <dependency>
@@ -184,10 +168,6 @@
 
         <!-- Tuscany dependencies -->
         <dependency>
-            <groupId>org.apache.tuscany.das</groupId>
-            <artifactId>tuscany-das-rdb</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
         </dependency>
@@ -197,23 +177,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-        </dependency>
-        <!--dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-feed</artifactId>
-        </dependency-->
-        <!--dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
+            <artifactId>tuscany-assembly-xsd</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -233,6 +197,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
         </dependency>
         <dependency>
@@ -249,6 +217,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
         </dependency>
         <dependency>
@@ -265,10 +241,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
         </dependency>
         <dependency>
@@ -281,15 +253,23 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
+            <artifactId>tuscany-definitions-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
+            <artifactId>tuscany-extensibility</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -301,7 +281,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
+            <artifactId>tuscany-host-webapp</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -317,6 +297,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
         </dependency>
         <dependency>
@@ -343,37 +327,41 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
         </dependency>
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node</artifactId>
-        </dependency-->
+            <artifactId>tuscany-node-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
+            <artifactId>tuscany-policy-security</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
+            <artifactId>tuscany-policy-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
+            <artifactId>tuscany-policy-xml-ws</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd-xml</artifactId>
+            <artifactId>tuscany-sca-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r2.1</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd-xml</artifactId>
         </dependency>
 
         <dependency>
@@ -408,10 +396,6 @@
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
-        <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml?rev=703354&r1=703353&r2=703354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Fri Oct 10 01:38:06 2008
@@ -58,10 +58,6 @@
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
         </dependency>
@@ -107,23 +103,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-metadata</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-saaj</artifactId>
+            <artifactId>axis2-mtompolicy</artifactId>
         </dependency>
 
         <!-- Geronimo dependencies -->
@@ -184,10 +168,6 @@
 
         <!-- Tuscany dependencies -->
         <dependency>
-            <groupId>org.apache.tuscany.das</groupId>
-            <artifactId>tuscany-das-rdb</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
         </dependency>
@@ -197,23 +177,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-        </dependency>
-        <!--dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-feed</artifactId>
-        </dependency-->
-        <!--dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
+            <artifactId>tuscany-assembly-xsd</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -233,6 +197,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
         </dependency>
         <dependency>
@@ -249,6 +217,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
         </dependency>
         <dependency>
@@ -265,10 +241,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
         </dependency>
         <dependency>
@@ -281,6 +253,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
         </dependency>
         <dependency>
@@ -289,11 +265,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
+            <artifactId>tuscany-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
+            <artifactId>tuscany-extensibility</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -305,7 +281,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
+            <artifactId>tuscany-host-webapp</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -321,6 +297,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
         </dependency>
         <dependency>
@@ -347,39 +327,42 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
         </dependency>
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node</artifactId>
-        </dependency-->
+            <artifactId>tuscany-node-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
+            <artifactId>tuscany-policy-security</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
+            <artifactId>tuscany-policy-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
+            <artifactId>tuscany-policy-xml-ws</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd-xml</artifactId>
+            <artifactId>tuscany-sca-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r2.1</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd-xml</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
@@ -401,10 +384,6 @@
             <artifactId>wss4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
         </dependency>
@@ -416,10 +395,6 @@
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
-        <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
     </dependencies>
 
     <build>



Mime
View raw message