You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2007/09/04 19:11:34 UTC
svn commit: r572740 [5/5] - in /webservices/axis2/branches/java/jaxws21: ./
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/writer/
modules/adb/src/org/apache/axis2/databinding/typemapping/ modu...
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java Tue Sep 4 10:11:13 2007
@@ -22,7 +22,6 @@
public class NamespaceFinder {
private static String NS_PREFIX = "http://";
- private static String SCHEMA_NS_SUFFIX = "/xsd";
private static String SCHEMA_NS_DEFAULT_PREFIX = "xsd";
private static String NS_DEFAULT_PREFIX = "ns";
@@ -36,13 +35,12 @@
nsUri = nsUri + classNameParts[i] + (i==0?"":".");
}
- return NS_PREFIX + nsUri;
-
+ return NS_PREFIX + nsUri;
}
public static String getSchemaTargetNamespaceFromClass(String fullyQualifiedClassName){
- return getTargetNamespaceFromClass(fullyQualifiedClassName) +SCHEMA_NS_SUFFIX;
+ return getTargetNamespaceFromClass(fullyQualifiedClassName);
}
public static String getDefaultSchemaNamespacePrefix(){
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml Tue Sep 4 10:11:13 2007
@@ -29,14 +29,33 @@
</fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.axis2:axis2:jar</include>
- <include>log4j:log4j:jar</include>
- <include>org.apache.ant:ant:jar</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifactId}-${commons.logging.version}.${extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>commons-logging:commons-logging:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.axis2:axis2:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifactId}-${log4j.version}.${extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>log4j:log4j:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifactId}-${ant.version}.${extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.ant:ant:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml Tue Sep 4 10:11:13 2007
@@ -186,6 +186,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties Tue Sep 4 10:11:13 2007
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-source.Axis2CodegenWizard.jar = src/
+source.Axis2CodegenWizard.jar = src/main/java/
output.Axis2CodegenWizard.jar = bin/
bin.includes = plugin.xml,\
Axis2CodegenWizard.jar,\
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/conf/service/build.properties Tue Sep 4 10:11:13 2007
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-source.Axis_Service_Archiver.jar = src/
+source.Axis_Service_Archiver.jar = src/main/java/
output.Axis_Service_Archiver.jar = bin/
bin.includes = plugin.xml,\
icons/,\
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/readme.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/readme.txt?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/readme.txt (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/readme.txt Tue Sep 4 10:11:13 2007
@@ -13,9 +13,9 @@
* To build the eclipse plugin type "mvn clean install -Dmaven.test.skip=true" command in the
tools/axis2-eclipse-<name>-plugin directory
* If you have already downloaded the maven artifacts you can invoke a local build by
- same directory"mvn clean install -Dmaven.test.skip=true -o"
- * After the successful build the zip version of the plugin will be available at
- tools/axis2-eclipse-<name>-plugin/target/dist directory
+ same directory"mvn clean install -Dmaven.test.skip=true -o"
+ * After the successful build the zip version of the plugin will be available at
+ tools/axis2-eclipse-<name>-plugin/target/dist directory
* To run the plugin you need please refer to,
- Tools Page On Apache Axis 2 Documentation http://ws.apache.org/axis2/tools/
@@ -77,4 +77,4 @@
* After the successful build the zip version of the plugin will be available at
tools/axis2-idea-plugin/target directory
* To run the plugin you need please refer to,
- - Tools Page On Apache Axis 2 Documentation http://ws.apache.org/axis2/tools/
\ No newline at end of file
+ - Tools Page On Apache Axis 2 Documentation http://ws.apache.org/axis2/tools/
Modified: webservices/axis2/branches/java/jaxws21/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/webapp/pom.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/webapp/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/webapp/pom.xml Tue Sep 4 10:11:13 2007
@@ -395,6 +395,30 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-corba</artifactId>
+ <version>${version}</version>
+ <exclusions>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant</artifactId></exclusion>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant-launcher</artifactId></exclusion>
+ <exclusion><groupId>aopalliance</groupId><artifactId>aopalliance</artifactId></exclusion>
+ <exclusion><groupId>org.apache.bcel</groupId><artifactId>bcel</artifactId></exclusion>
+ <exclusion><groupId>com.sun.xml.fastinfoset</groupId><artifactId>FastInfoset</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-activation_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-javamail_1.4_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>jakarta-regexp</groupId><artifactId>jakarta-regexp</artifactId></exclusion>
+ <exclusion><groupId>javax.xml.bind</groupId><artifactId>jsr173_api</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-beans</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-context</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
+ <exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
<artifactId>version</artifactId>
<version>${version}</version>
<type>aar</type>
Modified: webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl Tue Sep 4 10:11:13 2007
@@ -40,18 +40,80 @@
private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent)
throws org.apache.axis2.AxisFault{
- org.apache.axiom.om.impl.builder.StAXOMBuilder builder = new org.apache.axiom.om.impl.builder.StAXOMBuilder
- (org.apache.axiom.om.OMAbstractFactory.getOMFactory(),new org.apache.axis2.util.StreamWrapper(param.newXMLStreamReader())) ;
- org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement();
-
- <xsl:if test="$base64">
- if (optimizeContent) {
- optimizeContent(documentElement,qNameArray);
+
+ <xsl:choose>
+ <xsl:when test="$base64">
+ if (optimizeContent) {
+ org.apache.axiom.om.impl.builder.StAXOMBuilder builder = new org.apache.axiom.om.impl.builder.StAXOMBuilder
+ (org.apache.axiom.om.OMAbstractFactory.getOMFactory(),new org.apache.axis2.util.StreamWrapper(param.newXMLStreamReader())) ;
+ org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement();
+ optimizeContent(documentElement,qNameArray);
+ ((org.apache.axiom.om.impl.OMNodeEx)documentElement).setParent(null);
+ return documentElement;
+ } else {
+ return toOM(param);
+ }
+ </xsl:when>
+ <xsl:otherwise>
+ return toOM(param);
+ </xsl:otherwise>
+ </xsl:choose>
+
+ }
+
+ private org.apache.axiom.om.OMElement toOM(final <xsl:value-of select="@type"/> param)
+ throws org.apache.axis2.AxisFault {
+
+ final javax.xml.stream.XMLStreamReader xmlReader = param.newXMLStreamReader();
+ while (!xmlReader.isEndElement()) {
+ try {
+ xmlReader.next();
+ } catch (javax.xml.stream.XMLStreamException e) {
+ throw org.apache.axis2.AxisFault.makeFault(e);
+ }
}
- </xsl:if>
- ((org.apache.axiom.om.impl.OMNodeEx)documentElement).setParent(null);
- return documentElement;
+ org.apache.axiom.om.OMDataSource omDataSource = new org.apache.axiom.om.OMDataSource() {
+
+ public void serialize(java.io.OutputStream outputStream, org.apache.axiom.om.OMOutputFormat omOutputFormat)
+ throws javax.xml.stream.XMLStreamException {
+ try {
+ param.save(outputStream);
+ } catch (java.io.IOException e) {
+ throw new javax.xml.stream.XMLStreamException("Problem with saving document",e);
+ }
+ }
+
+ public void serialize(java.io.Writer writer, org.apache.axiom.om.OMOutputFormat omOutputFormat)
+ throws javax.xml.stream.XMLStreamException {
+ try {
+ param.save(writer);
+ } catch (java.io.IOException e) {
+ throw new javax.xml.stream.XMLStreamException("Problem with saving document",e);
+ }
+ }
+
+ public void serialize(javax.xml.stream.XMLStreamWriter xmlStreamWriter)
+ throws javax.xml.stream.XMLStreamException {
+ org.apache.axiom.om.impl.MTOMXMLStreamWriter mtomxmlStreamWriter =
+ (org.apache.axiom.om.impl.MTOMXMLStreamWriter) xmlStreamWriter;
+ try {
+ param.save(mtomxmlStreamWriter.getOutputStream());
+ mtomxmlStreamWriter.getOutputStream().flush();
+ } catch (java.io.IOException e) {
+ throw new javax.xml.stream.XMLStreamException("Problem with saving document", e);
+ }
+ }
+
+ public javax.xml.stream.XMLStreamReader getReader()
+ throws javax.xml.stream.XMLStreamException {
+ return param.newXMLStreamReader();
+ }
+ };
+
+ return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(xmlReader.getName(),
+ org.apache.axiom.om.OMAbstractFactory.getOMFactory(),
+ omDataSource);
}
</xsl:for-each>
Modified: webservices/axis2/branches/java/jaxws21/modules/xmlbeans/test-resources/wsat.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/xmlbeans/test-resources/wsat.wsdl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/xmlbeans/test-resources/wsat.wsdl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/xmlbeans/test-resources/wsat.wsdl Tue Sep 4 10:11:13 2007
@@ -52,10 +52,13 @@
Copyright 2001, 2002 BEA Systems and IBM Corporation and Microsoft Corporation. All rights reserved.
-->
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsat="http://schemas.xmlsoap.org/ws/2003/09/wsat" targetNamespace="http://schemas.xmlsoap.org/ws/2003/09/wsat">
- <wsdl:import namespace="http://schemas.xmlsoap.org/ws/2003/09/wsat" location="wsat.xsd"/>
- <!-- location="http://schemas.xmlsoap.org/ws/2003/09/wsat" -->
<!-- Messages -->
- <wsdl:message name="Prepare">
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://schemas.xmlsoap.org/ws/2003/09/wsat">
+ <xsd:include schemaLocation="wsat.xsd"/>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="Prepare">
<wsdl:part name="parameters" element="wsat:Prepare"/>
</wsdl:message>
<wsdl:message name="Prepared">
Modified: webservices/axis2/branches/java/jaxws21/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/pom.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/pom.xml Tue Sep 4 10:11:13 2007
@@ -59,7 +59,9 @@
<module>modules/webapp</module>
<module>modules/xmlbeans</module>
<module>modules/samples</module>
- <module>modules/scripting</module>
+ <module>modules/scripting</module>
+ <module>modules/rmi</module>
+ <module>modules/corba</module>
</modules>
<profiles>
<profile>
@@ -168,7 +170,7 @@
<module>modules/metadata</module>
<module>modules/saaj-api</module>
<module>modules/saaj</module>
- <module>modules/jws-api</module>
+ <module>modules/jws-api</module>
<module>modules/jaxws-api</module>
<module>modules/jaxws</module>
<module>modules/clustering</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org