Author: rfeng
Date: Wed Nov 15 13:04:51 2006
New Revision: 475419
URL: http://svn.apache.org/viewvc?view=rev&rev=475419
Log:
Merge some changes from the M2 branch back to trunk including axis2, jruby and
spring versions
Modified:
incubator/tuscany/java/samples/sca/echo.databinding/pom.xml
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml
incubator/tuscany/java/sca/services/containers/container.javascript/pom.xml
incubator/tuscany/java/sca/services/containers/container.ruby/pom.xml
incubator/tuscany/java/sca/services/containers/container.spring/pom.xml
incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/webapp/ScaWebApplicationContext.java
incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
incubator/tuscany/java/sca/tools/pom.xml
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
Modified: incubator/tuscany/java/samples/sca/echo.databinding/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.databinding/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/echo.databinding/pom.xml Wed Nov 15
13:04:51 2006
@@ -78,7 +78,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Wed Nov 15 13:04:51 2006
@@ -32,12 +32,24 @@
<properties>
<sca.version>1.0-incubator-SNAPSHOT</sca.version>
<scaKernelVersion>1.0-incubator-SNAPSHOT</scaKernelVersion>
- <axis2Version>SNAPSHOT</axis2Version>
+ <axis2Version>1.1</axis2Version>
</properties>
<!-- definition of repositories where the parent pom can be found -->
<repositories>
<repository>
+ <id>apache.maven.m1</id>
+ <name>Apache Maven1 Repository</name>
+ <url>http://www.apache.org/dist/java-repository</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
@@ -144,21 +156,21 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.2</version>
<scope>compile</scope>
</dependency>
<!-- Woden implementation -->
<dependency>
- <groupId>incubator-woden</groupId>
+ <groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0.0M6</version>
<scope>compile</scope>
</dependency>
@@ -166,14 +178,14 @@
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
</dependency>
<!-- XmlSchema implementation -->
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.2</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml Wed Nov
15 13:04:51 2006
@@ -28,6 +28,15 @@
<name>Apache Tuscany Binding for Axis2</name>
<description>Implementation of the SCA Web Services binding using
Axis2.</description>
+ <repositories>
+ <repository>
+ <id>apache.ws</id>
+ <name>Apache WebServices Repository</name>
+ <url>http://ws.zones.apache.org/repository/</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.services.idl</groupId>
@@ -49,7 +58,7 @@
<artifactId>servlet-api</artifactId>
</dependency>
- <!-- axis 2.0 SNAPSHOT -->
+ <!-- Axis2 1.1 release -->
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -59,19 +68,18 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>incubator-woden</groupId>
<artifactId>woden</artifactId>
<version>1.0.0M6</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -87,9 +95,9 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.neethi</groupId>
+ <groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>SNAPSHOT</version>
+ <version>2.0</version>
<scope>runtime</scope>
</dependency>
@@ -101,7 +109,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
<scope>runtime</scope>
</dependency>
@@ -121,6 +129,21 @@
<!-- end axis 2.0 SNAPSHOT -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ <version>4.0-alpha2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- end Axis2 1.1 release -->
<!-- test dependencies -->
<dependency>
Modified:
incubator/tuscany/java/sca/services/containers/container.javascript/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/pom.xml
Wed Nov 15 13:04:51 2006
@@ -35,6 +35,7 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/pom.xml Wed
Nov 15 13:04:51 2006
@@ -30,14 +30,6 @@
<name>Apache Tuscany Ruby Container</name>
<description>Apache Tuscany Ruby Container</description>
- <repositories>
- <repository>
- <id>codehaus-snapshots-repository</id>
- <name>Codehaus Snapshots Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
@@ -48,7 +40,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
incubator/tuscany/java/sca/services/containers/container.spring/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/pom.xml Wed
Nov 15 13:04:51 2006
@@ -39,13 +39,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${sca.version}</version>
@@ -55,7 +48,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0-rc3</version>
+ <version>2.0</version>
<scope>compile</scope>
</dependency>
Modified:
incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/webapp/ScaWebApplicationContext.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/webapp/ScaWebApplicationContext.java?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
---
incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/webapp/ScaWebApplicationContext.java
(original)
+++
incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/webapp/ScaWebApplicationContext.java
Wed Nov 15 13:04:51 2006
@@ -18,10 +18,18 @@
*/
package org.apache.tuscany.container.spring.webapp;
-import java.net.URL;
import java.io.File;
+import java.net.URL;
+
import javax.servlet.ServletContext;
+import org.apache.tuscany.api.TuscanyRuntimeException;
+import org.apache.tuscany.container.spring.config.SCANamespaceHandlerResolver;
+import org.apache.tuscany.container.spring.impl.SpringScaAdapter;
+import org.apache.tuscany.container.spring.model.SpringComponentType;
+import org.apache.tuscany.runtime.webapp.WebappRuntime;
+import org.apache.tuscany.runtime.webapp.WebappUtil;
+import org.apache.tuscany.runtime.webapp.WebappUtilImpl;
import org.springframework.beans.BeansException;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -31,17 +39,6 @@
import org.springframework.util.Assert;
import org.springframework.web.context.ConfigurableWebApplicationContext;
import org.springframework.web.context.support.XmlWebApplicationContext;
-
-import org.apache.tuscany.api.TuscanyRuntimeException;
-import org.apache.tuscany.container.spring.config.SCANamespaceHandlerResolver;
-import org.apache.tuscany.container.spring.impl.SpringScaAdapter;
-import org.apache.tuscany.container.spring.impl.SpringRuntimeInfo;
-import org.apache.tuscany.container.spring.model.SpringComponentType;
-import org.apache.tuscany.runtime.webapp.TuscanyContextListener;
-import org.apache.tuscany.runtime.webapp.WebappRuntime;
-import org.apache.tuscany.runtime.webapp.WebappUtil;
-import org.apache.tuscany.runtime.webapp.WebappUtilImpl;
-import org.apache.tuscany.core.launcher.LauncherImpl;
/**
* WebApplicationContext implementation that understands SCA extensions.
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
Wed Nov 15 13:04:51 2006
@@ -56,7 +56,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Wed Nov 15 13:04:51 2006
@@ -57,9 +57,9 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.neethi</groupId>
+ <groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>SNAPSHOT</version>
+ <version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -78,19 +78,18 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1</version>
<scope>compile</scope>
</dependency>
@@ -118,7 +117,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
<scope>compile</scope>
</dependency>
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
Wed Nov 15 13:04:51 2006
@@ -24,10 +24,10 @@
import java.util.Map;
import java.util.Vector;
-import org.apache.axis2.wsdl.util.CommandLineOption;
-import org.apache.axis2.wsdl.util.CommandLineOptionParser;
-import org.apache.axis2.wsdl.util.Java2WSDLOptionsValidator;
import org.apache.ws.java2wsdl.Java2WSDL;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
+import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
/**
* This is an implementation of the Java2WSDLGenerator facade. This
@@ -52,7 +52,7 @@
{
private List<WSDLGenListener> genPhaseListeners = new
Vector<WSDLGenListener>();
private GenerationParameters genParams = null;
- private Map<String, CommandLineOption> commandLineOptions = null;
+ private Map<String, Java2WSDLCommandLineOption> commandLineOptions =
null;
private TuscanyJava2WSDLBuilder java2WsdlBuilder;
private OutputStream outputStream = null;
@@ -78,7 +78,7 @@
protected boolean validateInputArgs(String[] args)
{
boolean isValid = true;
- CommandLineOptionParser parser = new
CommandLineOptionParser(args);
+ Java2WSDLCommandLineOptionParser parser = new
Java2WSDLCommandLineOptionParser(args);
if (parser.getAllOptions().size() == 0) {
Java2WSDL.printUsage();
isValid = false;
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
Wed Nov 15 13:04:51 2006
@@ -20,8 +20,6 @@
import java.io.StringReader;
import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -33,32 +31,21 @@
import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaAny;
-import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
-import org.apache.ws.commons.schema.XmlSchemaChoice;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexContent;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaContentProcessing;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaForm;
import org.apache.ws.commons.schema.XmlSchemaGroupBase;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
import org.apache.ws.commons.schema.XmlSchemaType;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.apache.ws.commons.schema.utils.NamespacePrefixList;
import org.apache.ws.java2wsdl.Java2WSDLUtils;
import org.codehaus.jam.JClass;
import org.codehaus.jam.JProperty;
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.XSDHelper;
@@ -159,13 +146,14 @@
}
protected QName buildSchema_JavaType(JClass javaType) throws Exception {
- QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType);
+ QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType,
this.classLoader);
if (schemaTypeName == null) {
- String simpleName = javaType.getSimpleName();
+ String simpleName = javaType.getSimpleName();
String packageName =
javaType.getContainingPackage().getQualifiedName();
- String targetNameSpace =
Java2WSDLUtils.schemaNamespaceFromPackageName(packageName)
+ String targetNameSpace =
+
Java2WSDLUtils.schemaNamespaceFromClassName(javaType.getQualifiedName(),
this.classLoader)
.toString();
XmlSchema xmlSchema = getXmlSchema(targetNameSpace);
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java?view=diff&rev=475419&r1=475418&r2=475419
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
Wed Nov 15 13:04:51 2006
@@ -30,7 +30,6 @@
import org.apache.ws.java2wsdl.Java2WSDLUtils;
import org.codehaus.jam.JClass;
-
public class TuscanyTypeTable
{
public static final String XML_SCHEMA_URI =
"http://www.w3.org/2001/XMLSchema";;
@@ -175,10 +174,10 @@
return (QName) complexXSDTypes.get(asQualifiedName(sdoURI,
sdoTypeName));
}
- public QName getComplexSchemaTypeName(JClass javaClass) throws Exception
+ public QName getComplexSchemaTypeName(JClass javaClass, ClassLoader cl)
throws Exception
{
- String namespace =
-
Java2WSDLUtils.schemaNamespaceFromPackageName(javaClass.getContainingPackage().getQualifiedName()).toString();
+ String namespace = Java2WSDLUtils.schemaNamespaceFromClassName(
+ javaClass.getQualifiedName(), cl).toString();
return (QName) complexXSDTypes.get(asQualifiedName(namespace,
javaClass.getSimpleName()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
