Author: nagy
Date: Fri Apr 16 12:31:38 2010
New Revision: 934847
URL: http://svn.apache.org/viewvc?rev=934847&view=rev
Log:
Switched to Geronimo JAX-WS 2.2 API jar and updated annotations to be 2.2
compliant
Modified:
axis/axis2/java/core/trunk/modules/documentation/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/RequestWrapperAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ResponseWrapperAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebFaultAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceRefAnnot.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified: axis/axis2/java/core/trunk/modules/documentation/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/pom.xml?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/documentation/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/pom.xml Fri Apr 16
12:31:38 2010
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Fri Apr 16 12:31:38 2010
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -135,6 +135,28 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -147,7 +169,7 @@
<inherited>true</inherited>
<configuration>
<compilerArgument>
-
-Xbootclasspath/p:${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
+
-Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar
</compilerArgument>
<compilerVersion>1.5</compilerVersion>
<source>1.5</source>
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
Fri Apr 16 12:31:38 2010
@@ -20,12 +20,14 @@
package org.apache.axis2.jaxws.description.builder;
import javax.xml.ws.soap.Addressing;
+import javax.xml.ws.soap.AddressingFeature;
import java.lang.annotation.Annotation;
public class AddressingAnnot implements Addressing {
private boolean enabled = true;
private boolean required;
+ private AddressingFeature.Responses responses =
AddressingFeature.Responses.ALL;
public boolean enabled() {
return enabled;
@@ -43,6 +45,14 @@ public class AddressingAnnot implements
required = r;
}
+ public AddressingFeature.Responses responses() {
+ return responses;
+ }
+
+ public void setResponses(AddressingFeature.Responses r) {
+ responses = r;
+ }
+
public Class<? extends Annotation> annotationType() {
return Addressing.class;
}
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/RequestWrapperAnnot.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/RequestWrapperAnnot.java?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/RequestWrapperAnnot.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/RequestWrapperAnnot.java
Fri Apr 16 12:31:38 2010
@@ -23,9 +23,10 @@ import java.lang.annotation.Annotation;
public class RequestWrapperAnnot implements javax.xml.ws.RequestWrapper {
- private String localName;
- private String targetNamespace;
- private String className;
+ private String localName = "";
+ private String targetNamespace = "";
+ private String className = "";
+ private String partName = "";
/** A RequestWrapperAnnot cannot be instantiated. */
@@ -37,9 +38,18 @@ public class RequestWrapperAnnot impleme
String localName,
String targetNamespace,
String className) {
+ this(localName, targetNamespace, className, "");
+ }
+
+ private RequestWrapperAnnot(
+ String localName,
+ String targetNamespace,
+ String className,
+ String partName) {
this.localName = localName;
this.targetNamespace = targetNamespace;
this.className = className;
+ this.partName = partName;
}
public static RequestWrapperAnnot createRequestWrapperAnnotImpl() {
@@ -56,6 +66,17 @@ public class RequestWrapperAnnot impleme
className);
}
+ public static RequestWrapperAnnot createRequestWrapperAnnotImpl(
+ String localName,
+ String targetNamespace,
+ String className,
+ String partName
+ ) {
+ return new RequestWrapperAnnot(localName,
+ targetNamespace,
+ className,
+ partName);
+ }
/** @return Returns the name. */
public String localName() {
@@ -72,6 +93,11 @@ public class RequestWrapperAnnot impleme
return this.className;
}
+ /** @return Returns the partName. */
+ public String partName() {
+ return this.partName;
+ }
+
/** @param name The name to set. */
public void setLocalName(String localName) {
this.localName = localName;
@@ -87,6 +113,11 @@ public class RequestWrapperAnnot impleme
this.className = className;
}
+ /** @param partName The name of the wsdl:part. */
+ public void setPartName(String partName) {
+ this.partName = partName;
+ }
+
//hmm, should we really do this
public Class<Annotation> annotationType() {
return Annotation.class;
@@ -106,6 +137,8 @@ public class RequestWrapperAnnot impleme
sb.append(newLine);
sb.append("@RequestWrapper.targetNamespace= " + targetNamespace);
sb.append(newLine);
+ sb.append("@RequestWrapper.partName= " + partName);
+ sb.append(newLine);
return sb.toString();
}
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ResponseWrapperAnnot.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ResponseWrapperAnnot.java?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ResponseWrapperAnnot.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ResponseWrapperAnnot.java
Fri Apr 16 12:31:38 2010
@@ -23,9 +23,10 @@ import java.lang.annotation.Annotation;
public class ResponseWrapperAnnot implements javax.xml.ws.ResponseWrapper {
- private String localName;
- private String targetNamespace;
- private String className;
+ private String localName = "";
+ private String targetNamespace = "";
+ private String className = "";
+ private String partName = "";
/** A ResponseWrapperAnnot cannot be instantiated. */
@@ -37,9 +38,18 @@ public class ResponseWrapperAnnot implem
String localName,
String targetNamespace,
String className) {
+ this(localName, targetNamespace, className, "");
+ }
+
+ private ResponseWrapperAnnot(
+ String localName,
+ String targetNamespace,
+ String className,
+ String partName) {
this.localName = localName;
this.targetNamespace = targetNamespace;
this.className = className;
+ this.partName = partName;
}
public static ResponseWrapperAnnot createResponseWrapperAnnotImpl() {
@@ -56,6 +66,17 @@ public class ResponseWrapperAnnot implem
className);
}
+ public static ResponseWrapperAnnot createResponseWrapperAnnotImpl(
+ String localName,
+ String targetNamespace,
+ String className,
+ String partName
+ ) {
+ return new ResponseWrapperAnnot(localName,
+ targetNamespace,
+ className,
+ partName);
+ }
/** @return Returns the name. */
public String localName() {
@@ -72,6 +93,11 @@ public class ResponseWrapperAnnot implem
return this.className;
}
+ /** @return Returns the partName. */
+ public String partName() {
+ return this.partName;
+ }
+
/** @param name The name to set. */
public void setLocalName(String localName) {
this.localName = localName;
@@ -87,6 +113,11 @@ public class ResponseWrapperAnnot implem
this.className = className;
}
+ /** @param partName The name of the wsdl:part. */
+ public void setPartName(String partName) {
+ this.partName = partName;
+ }
+
//hmm, should we really do this
public Class<Annotation> annotationType() {
return Annotation.class;
@@ -106,6 +137,8 @@ public class ResponseWrapperAnnot implem
sb.append(newLine);
sb.append("@ResponseWrapper.targetNamespace= " + targetNamespace);
sb.append(newLine);
+ sb.append("@ResponseWrapper.partName= " + partName);
+ sb.append(newLine);
return sb.toString();
}
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebFaultAnnot.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebFaultAnnot.java?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebFaultAnnot.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebFaultAnnot.java
Fri Apr 16 12:31:38 2010
@@ -26,6 +26,7 @@ public class WebFaultAnnot implements ja
private String name = "return";
private String targetNamespace = "";
private String faultBean = "";
+ private String messageName = "";
/** A WebFaultAnnot cannot be instantiated. */
private WebFaultAnnot() {
@@ -53,6 +54,10 @@ public class WebFaultAnnot implements ja
return this.faultBean;
}
+ public String messageName() {
+ return this.messageName;
+ }
+
/** @param faultBean The faultBean to set. */
public void setFaultBean(String faultBean) {
this.faultBean = faultBean;
@@ -68,6 +73,11 @@ public class WebFaultAnnot implements ja
this.targetNamespace = targetNamespace;
}
+ /** @param messageName The name of the wsdl:message. */
+ public void setMessageName(String messageName) {
+ this.messageName = messageName;
+ }
+
public Class<Annotation> annotationType() {
return Annotation.class;
}
@@ -83,6 +93,8 @@ public class WebFaultAnnot implements ja
sb.append(newLine);
sb.append("@WebFault.targetNamespace= " + targetNamespace);
sb.append(newLine);
+ sb.append("@WebFault.messageName= " + messageName);
+ sb.append(newLine);
return sb.toString();
}
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceRefAnnot.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceRefAnnot.java?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceRefAnnot.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceRefAnnot.java
Fri Apr 16 12:31:38 2010
@@ -28,6 +28,7 @@ public class WebServiceRefAnnot implemen
private Class type;
private Class value;
private String mappedName = "";
+ private String lookup = "";
// TODO: Remove the String versions of the Class attributes when the
associated deprecated
// methods are removed.
@@ -44,12 +45,23 @@ public class WebServiceRefAnnot implemen
String wsdlLocation,
Class type,
Class value,
- String mappedName) {
+ String mappedName,
+ String lookup) {
this.name = name;
this.wsdlLocation = wsdlLocation;
this.type = type;
this.value = value;
this.mappedName = mappedName;
+ this.lookup = lookup;
+ }
+
+ private WebServiceRefAnnot(
+ String name,
+ String wsdlLocation,
+ Class type,
+ Class value,
+ String mappedName) {
+ this(name, wsdlLocation, type, value, mappedName, "");
}
/**
@@ -91,6 +103,7 @@ public class WebServiceRefAnnot implemen
Class type,
Class value,
String mappedName) {
+
return new WebServiceRefAnnot(name,
wsdlLocation,
type,
@@ -98,6 +111,21 @@ public class WebServiceRefAnnot implemen
mappedName);
}
+ public static WebServiceRefAnnot createWebServiceRefAnnotImpl(
+ String name,
+ String wsdlLocation,
+ Class type,
+ Class value,
+ String mappedName,
+ String lookup) {
+ return new WebServiceRefAnnot(name,
+ wsdlLocation,
+ type,
+ value,
+ mappedName,
+ lookup);
+ }
+
/**
*
* @deprecated The String values for type and value should not be used.
Use {...@link #createWebServiceRefAnnotImpl(String, String, Class, Class,
String)}
@@ -158,6 +186,11 @@ public class WebServiceRefAnnot implemen
return wsdlLocation;
}
+ /** @return Returns the lookup. */
+ public String lookup() {
+ return lookup;
+ }
+
/**
* @deprecated Use {...@link #type()}
* @return Returns the typeString.
@@ -203,6 +236,11 @@ public class WebServiceRefAnnot implemen
return wsdlLocation;
}
+ /** @param lookup A portable JNDI lookup name that resolves to the target
web service reference. */
+ public void setLookup(String lookup) {
+ this.lookup = lookup;
+ }
+
/**
* @deprecated Use {...@link #setType(Class)}
* @param typeString The typeString to set. */
@@ -243,6 +281,8 @@ public class WebServiceRefAnnot implemen
sb.append(newLine);
sb.append("@WebServiceRef.value= " + ((value != null) ?
value.toString() : null));
sb.append(newLine);
+ sb.append("@WebServiceRef.lookup= " + lookup);
+ sb.append(newLine);
return sb.toString();
}
}
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=934847&r1=934846&r2=934847&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Fri Apr 16 12:31:38 2010
@@ -110,7 +110,7 @@
<geronimo.spec.stax.version>1.0.1</geronimo.spec.stax.version>
<geronimo.spec.metadata.version>1.1.2</geronimo.spec.metadata.version>
<geronimo.spec.saaj.version>1.0.1</geronimo.spec.saaj.version>
- <geronimo.spec.jaxws.version>1.0</geronimo.spec.jaxws.version>
+ <geronimo.spec.jaxws.version>1.0-SNAPSHOT</geronimo.spec.jaxws.version>
<httpcore.version>4.0</httpcore.version>
<intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
@@ -783,7 +783,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<version>${geronimo.spec.jaxws.version}</version>
</dependency>
