You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/02/24 04:30:23 UTC
svn commit: r1074031 - in /geronimo/server/trunk/plugins/webservices: ./
geronimo-webservices/
geronimo-webservices/src/main/java/org/apache/geronimo/webservices/
webservices-common/ webservices-common/src/main/history/
Author: xuhaihong
Date: Thu Feb 24 03:30:22 2011
New Revision: 1074031
URL: http://svn.apache.org/viewvc?rev=1074031&view=rev
Log:
a. Use Geronimo's saaj bundle
b. Update some codes to be gentler, no function change.
Modified:
geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/POJOWebServiceServlet.java
geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/WebServiceContainerInvoker.java
geronimo/server/trunk/plugins/webservices/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=1074031&r1=1074030&r2=1074031&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Thu Feb 24 03:30:22 2011
@@ -98,7 +98,7 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>saaj-impl</artifactId>
<scope>test</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/POJOWebServiceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/POJOWebServiceServlet.java?rev=1074031&r1=1074030&r2=1074031&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/POJOWebServiceServlet.java (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/POJOWebServiceServlet.java Thu Feb 24 03:30:22 2011
@@ -53,7 +53,7 @@ public class POJOWebServiceServlet imple
ServletContext context = config.getServletContext();
String pojoClassID = config.getInitParameter(POJO_CLASS);
- Class pojoClass = (Class) context.getAttribute(pojoClassID);
+ Class<?> pojoClass = (Class<?>) context.getAttribute(pojoClassID);
Object pojo;
try {
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/WebServiceContainerInvoker.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/WebServiceContainerInvoker.java?rev=1074031&r1=1074030&r2=1074031&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/WebServiceContainerInvoker.java (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/WebServiceContainerInvoker.java Thu Feb 24 03:30:22 2011
@@ -65,8 +65,8 @@ public class WebServiceContainerInvoker
// This is the guy the WebServiceContainer should invoke
req.setAttribute(WebServiceContainer.POJO_INSTANCE, pojo);
- req.setAttribute(WebServiceContainer.SERVLET_REQUEST, (HttpServletRequest) req);
- req.setAttribute(WebServiceContainer.SERVLET_RESPONSE, (HttpServletResponse) res);
+ req.setAttribute(WebServiceContainer.SERVLET_REQUEST, req);
+ req.setAttribute(WebServiceContainer.SERVLET_RESPONSE, res);
req.setAttribute(WebServiceContainer.SERVLET_CONTEXT, config.getServletContext());
if (req.getParameter("wsdl") != null || req.getParameter("WSDL") != null) {
@@ -136,7 +136,7 @@ public class WebServiceContainerInvoker
}
public int getMethod() {
- Integer method = (Integer) methods.get(request.getMethod());
+ Integer method = methods.get(request.getMethod());
return method == null ? UNSUPPORTED : method.intValue();
}
@@ -144,21 +144,21 @@ public class WebServiceContainerInvoker
return request.getParameter(name);
}
- public Map getParameters() {
+ public Map<String, String[]> getParameters() {
return request.getParameterMap();
}
- private static final Map methods = new HashMap();
+ private static final Map<String, Integer> methods = new HashMap<String, Integer>();
static {
- methods.put("OPTIONS", new Integer(OPTIONS));
- methods.put("GET", new Integer(GET));
- methods.put("HEAD", new Integer(HEAD));
- methods.put("POST", new Integer(POST));
- methods.put("PUT", new Integer(PUT));
- methods.put("DELETE", new Integer(DELETE));
- methods.put("TRACE", new Integer(TRACE));
- methods.put("CONNECT", new Integer(CONNECT));
+ methods.put("OPTIONS", OPTIONS);
+ methods.put("GET", GET);
+ methods.put("HEAD", HEAD);
+ methods.put("POST", POST);
+ methods.put("PUT", PUT);
+ methods.put("DELETE", DELETE);
+ methods.put("TRACE", TRACE);
+ methods.put("CONNECT", CONNECT);
}
public Object getAttribute(String s) {
@@ -181,7 +181,7 @@ public class WebServiceContainerInvoker
public ResponseAdapter(HttpServletResponse response) {
this.response = response;
}
-
+
public void setHeader(String name, String value) {
response.setHeader(name, value);
}
@@ -217,7 +217,7 @@ public class WebServiceContainerInvoker
public void setStatusMessage(String responseString) {
response.setStatus(getStatusCode(), responseString);
}
-
+
public void flushBuffer() throws java.io.IOException{
response.flushBuffer();
}
Modified: geronimo/server/trunk/plugins/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/pom.xml?rev=1074031&r1=1074030&r2=1074031&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/pom.xml Thu Feb 24 03:30:22 2011
@@ -45,19 +45,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.3.6</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.3.8_1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=1074031&r1=1074030&r2=1074031&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Thu Feb 24 03:30:22 2011
@@ -96,7 +96,7 @@
<!-- default SAAJ 1.3 implementation -->
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>saaj-impl</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=1074031&r1=1074030&r2=1074031&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml Thu Feb 24 03:30:22 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webservices-common</artifactId>
@@ -7,13 +7,13 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>castor</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>castor</artifactId>
+ <artifactId>saaj-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>