You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2008/10/06 12:13:41 UTC
svn commit: r702077 - in /geronimo/plugins/tuscany/trunk: ./
geronimo-tuscany-http-jetty/
geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/
geronimo-tuscany-http-tomcat/
geronimo-tuscany-http-tomcat/src/main/java/org/apa...
Author: vamsic007
Date: Mon Oct 6 03:13:40 2008
New Revision: 702077
URL: http://svn.apache.org/viewvc?rev=702077&view=rev
Log:
Update to Geronimo 2.1.3 and Tuscany 1.3. More changes may be required before the plugin can run successfully on G2.1.3!
Added:
geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/plan/ (props changed)
- copied from r686969, geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/
geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/ (props changed)
- copied from r686969, geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/
Removed:
geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/
geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/
Modified:
geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml
geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml
geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
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-jetty/src/main/plan/plan.xml
geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/plan.xml
geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml Mon Oct 6 03:13:40 2008
@@ -37,7 +37,7 @@
<artifactId>geronimo-transaction</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-j2ee</artifactId>
</dependency>
<dependency>
@@ -45,11 +45,11 @@
<artifactId>geronimo-jetty6</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-naming</artifactId>
</dependency>
<dependency>
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java Mon Oct 6 03:13:40 2008
@@ -19,6 +19,7 @@
package org.apache.geronimo.tuscany.http.jetty;
import java.net.URI;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -220,8 +221,9 @@
this.componentContext);
} else {
contextHandler = contextHandlers.get(contextPath);
- servletHandler = (ServletHandler) contextHandler
- .getChildHandlerByClass(ServletHandler.class);
+ // FIXME: GERONIMO-4338
+ // servletHandler = (ServletHandler) contextHandler
+ // .getChildHandlerByClass(ServletHandler.class);
}
// FIXME - Need to Assign JSR 77 Names to Context but How?
@@ -257,7 +259,8 @@
servletMapping.setPathSpec(mapping);
servletHandler.addServletMapping(servletMapping);
if (contextHandlers.get(contextPath) == null) {
- container.addContext(contextHandler);
+ // FIXME: GERONIMO-4338
+ // container.addContext(contextHandler);
try {
contextHandler.start();
} catch (Exception e) {
@@ -293,8 +296,10 @@
mapping = contextPath;
contextPath = SEPARATOR;
}
- ServletHandler servletHandler = (ServletHandler) contextHandler
- .getChildHandlerByClass(ServletHandler.class);
+ // FIXME: GERONIMO-4338
+ ServletHandler servletHandler = null;
+ //ServletHandler servletHandler = (ServletHandler) contextHandler
+ // .getChildHandlerByClass(ServletHandler.class);
Servlet removedServlet = null;
List<ServletMapping> mappings = new ArrayList<ServletMapping>(Arrays
.asList(servletHandler.getServletMappings()));
@@ -323,7 +328,8 @@
if (mappings.size() < 3) {
contextHandler.stop();
contextHandler.destroy();
- container.removeContext(contextHandler);
+ // FIXME: GERONIMO-4338
+ //container.removeContext(contextHandler);
contextHandlers.remove(contextPath);
} else {
@@ -346,4 +352,24 @@
public String getContextPath() {
return CONTEXT_PATH;
}
+
+ public int getDefaultPort() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public URL getURLMapping(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setContextPath(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setDefaultPort(int arg0) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml Mon Oct 6 03:13:40 2008
@@ -33,7 +33,7 @@
<dependencies>
<!-- Geronimo dependencies -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
<dependency>
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java Mon Oct 6 03:13:40 2008
@@ -20,6 +20,7 @@
import java.io.File;
import java.net.URI;
+import java.net.URL;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
@@ -225,4 +226,24 @@
public String getContextPath() {
return CONTEXT_PATH;
}
+
+ public int getDefaultPort() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public URL getURLMapping(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setContextPath(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setDefaultPort(int arg0) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml Mon Oct 6 03:13:40 2008
@@ -33,15 +33,15 @@
<dependencies>
<!-- Geronimo dependencies -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-j2ee</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
</dependency>
@@ -50,6 +50,10 @@
<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=702077&r1=702076&r2=702077&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 Mon Oct 6 03:13:40 2008
@@ -33,8 +33,8 @@
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.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.core.spring.context.ModelResolverImpl;
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
@@ -89,7 +89,7 @@
// Collect the composites
List<Composite> composites = new ArrayList<Composite>();
- for(DeployedArtifact artifact : contribution.getArtifacts()) {
+ for(Artifact artifact : contribution.getArtifacts()) {
if (artifact.getModel() instanceof Composite) {
composites.add((Composite)artifact.getModel());
}
@@ -121,7 +121,7 @@
// Collect the composites
List<Composite> composites = new ArrayList<Composite>();
- for(DeployedArtifact artifact : contribution.getArtifacts()) {
+ for(Artifact artifact : contribution.getArtifacts()) {
if (artifact.getModel() instanceof Composite) {
composites.add((Composite)artifact.getModel());
}
Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Mon Oct 6 03:13:40 2008
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tuscany-parent</artifactId>
- <name>Geronimo Tuscany Integration</name>
+ <name>Geronimo Tuscany Integration parent</name>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
@@ -56,9 +56,10 @@
<version>1.0-SNAPSHOT</version>
<geronimoSchemaVersion>1.2</geronimoSchemaVersion>
- <geronimoVersion>2.0.2</geronimoVersion>
- <tuscanyVersion>1.0-incubating</tuscanyVersion>
- <tuscanySdoVersion>1.0-incubating</tuscanySdoVersion>
+ <geronimoVersion>2.1.3</geronimoVersion>
+ <geronimoTransactionVersion>2.1.1</geronimoTransactionVersion>
+ <tuscanyVersion>1.3</tuscanyVersion>
+ <tuscanySdoVersion>1.1.1</tuscanySdoVersion>
<tuscanyDasVersion>1.0-incubating-beta2</tuscanyDasVersion>
<axis2Version>1.3</axis2Version>
</properties>
@@ -165,10 +166,10 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${geronimoTransactionVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
@@ -204,7 +205,7 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
@@ -222,17 +223,17 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimoVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${geronimoVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimoVersion}</version>
</dependency>
@@ -242,22 +243,22 @@
<version>${geronimoVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${geronimoVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimoVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${geronimoVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${geronimoVersion}</version>
</dependency>
@@ -339,11 +340,11 @@
<artifactId>tuscany-binding-ejb</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
- <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>
@@ -411,6 +412,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-spring</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
@@ -426,6 +432,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-extensibility</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extension-helper</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
@@ -486,9 +497,14 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node</artifactId>
+ <artifactId>tuscany-monitor</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
+ <!--dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy</artifactId>
@@ -546,6 +562,11 @@
<version>1.5.3</version>
</dependency>
<dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
@@ -553,7 +574,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.5</version>
+ <version>6.1.7</version>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -582,11 +603,13 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
<extensions>true</extensions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Mon Oct 6 03:13:40 2008
@@ -124,7 +124,7 @@
<!-- Geronimo dependencies -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
</dependency>
@@ -144,7 +144,7 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
<type>car</type>
</dependency>
@@ -195,10 +195,10 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ejb</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-feed</artifactId>
- </dependency>
+ </dependency-->
<!--dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jms</artifactId>
@@ -253,6 +253,10 @@
</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>
@@ -265,6 +269,10 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-extensibility</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extension-helper</artifactId>
</dependency>
<dependency>
@@ -313,8 +321,12 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node</artifactId>
+ <artifactId>tuscany-monitor</artifactId>
</dependency>
+ <!--dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node</artifactId>
+ </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy</artifactId>
@@ -377,23 +389,37 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<!-- Install as extention to allow 'car' packaging to be used. -->
<extensions>true</extensions>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</deploymentConfig>
- <deploymentConfig>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</deploymentConfig>
- </deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
- <planFileName>plan.xml</planFileName>
<archive>
<!-- Do not include META-INF/maven to avoid long file problems on windows -->
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
+ <category>SCA</category>
+ <osiApproved>true</osiApproved>
+
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+
+ <instance>
+ <plugin-artifact>
+ <config-xml-content>
+ <gbean name="TuscanyBuilder">
+ <attribute name="tuscanyGroupId">tuscany-artifacts</attribute>
+ </gbean>
+ <gbean name="GeronimoSCADomain">
+ <attribute name="domainUri">http://localhost</attribute>
+ </gbean>
+ </config-xml-content>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Propchange: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/plan/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/plan/plan.xml?rev=702077&r1=686969&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/plan/plan.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/plan/plan.xml Mon Oct 6 03:13:40 2008
@@ -51,6 +51,6 @@
</xml-attribute>
</gbean>
<gbean name="GeronimoSCADomain" class="org.apache.geronimo.tuscany.EmbeddedSCADomainGBean">
- <attribute name="domainUri">http://localhost:8080/</attribute>
+ <attribute name="domainUri">http://localhost/</attribute>
</gbean>
</module>
Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 6 03:13:40 2008
@@ -68,7 +68,7 @@
<dependency>org.apache.axis2/axis2-metadata/${axis2Version}/jar</dependency>
<dependency>org.apache.axis2/axis2-saaj/${axis2Version}/jar</dependency>
- <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>
+ <dependency>org.apache.geronimo.framework/geronimo-gbean-deployer//car</dependency>
<dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
<dependency>org.apache.geronimo.configs/jasper//car</dependency>
<dependency>org.apache.geronimo.configs/rmi-naming//car</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=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Mon Oct 6 03:13:40 2008
@@ -124,7 +124,7 @@
<!-- Geronimo dependencies -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
</dependency>
@@ -139,7 +139,7 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
<type>car</type>
</dependency>
@@ -195,10 +195,10 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ejb</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-feed</artifactId>
- </dependency>
+ </dependency-->
<!--dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jms</artifactId>
@@ -253,6 +253,10 @@
</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>
@@ -265,6 +269,10 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-extensibility</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extension-helper</artifactId>
</dependency>
<dependency>
@@ -313,8 +321,12 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node</artifactId>
+ <artifactId>tuscany-monitor</artifactId>
</dependency>
+ <!--dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node</artifactId>
+ </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy</artifactId>
@@ -357,6 +369,10 @@
<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>
@@ -377,23 +393,40 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<!-- Install as extention to allow 'car' packaging to be used. -->
<extensions>true</extensions>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</deploymentConfig>
- <deploymentConfig>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</deploymentConfig>
- </deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
- <planFileName>plan.xml</planFileName>
<archive>
<!-- Do not include META-INF/maven to avoid long file problems on windows -->
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
+ <category>SCA</category>
+ <osiApproved>true</osiApproved>
+
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+
+ <instance>
+ <plugin-artifact>
+ <config-xml-content>
+ <gbean name="TuscanyBuilder">
+ <attribute name="tuscanyGroupId">tuscany-artifacts</attribute>
+ </gbean>
+ <gbean name="GeronimoSCADomain">
+ <attribute name="domainUri">http://localhost</attribute>
+ </gbean>
+ </config-xml-content>
+ <source-repository>http://repo1.maven.org/maven2/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Propchange: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/plan.xml?rev=702077&r1=686969&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/plan/plan.xml Mon Oct 6 03:13:40 2008
@@ -51,6 +51,6 @@
</xml-attribute>
</gbean>
<gbean name="GeronimoSCADomain" class="org.apache.geronimo.tuscany.EmbeddedSCADomainGBean">
- <attribute name="domainUri">http://localhost:8080/</attribute>
+ <attribute name="domainUri">http://localhost/</attribute>
</gbean>
</module>
Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=702077&r1=702076&r2=702077&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 6 03:13:40 2008
@@ -39,7 +39,7 @@
<version>2.0.1</version>
</geronimo-versions>
<prerequisite>
- <id>org.apache.geronimo.configs/rmi-naming//car</id>
+ <id>org.apache.geronimo.framework/rmi-naming//car</id>
<description>
This deployer will work for tomcat binaries
</description>
@@ -68,10 +68,10 @@
<dependency>org.apache.axis2/axis2-metadata/${axis2Version}/jar</dependency>
<dependency>org.apache.axis2/axis2-saaj/${axis2Version}/jar</dependency>
- <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>
+ <dependency>org.apache.geronimo.framework/geronimo-gbean-deployer//car</dependency>
<dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
<dependency>org.apache.geronimo.configs/jasper//car</dependency>
- <dependency>org.apache.geronimo.configs/rmi-naming//car</dependency>
+ <dependency>org.apache.geronimo.framework/rmi-naming//car</dependency>
<dependency>org.apache.geronimo.configs/tomcat6//car</dependency>
<dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>
@@ -86,7 +86,7 @@
<dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
- <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
+ <!--dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency-->
<!--dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency-->
<dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
@@ -100,6 +100,7 @@
<dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
+ <dependency>org.apache.tuscany.sca/tuscany-core-spring/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-definitions/${tuscanyVersion}/jar</dependency>
@@ -115,7 +116,7 @@
<dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
- <dependency>org.apache.tuscany.sca/tuscany-node/${tuscanyVersion}</dependency>
+ <!--dependency>org.apache.tuscany.sca/tuscany-node/${tuscanyVersion}</dependency-->
<dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-sca-api/${tuscanyVersion}/jar</dependency>