Author: dkulp
Date: Tue Feb 19 09:04:59 2008
New Revision: 629163
URL: http://svn.apache.org/viewvc?rev=629163&view=rev
Log:
[CXF-6] Remove some unused code so ws-metadata can be put in test scope
Modified:
incubator/cxf/trunk/common/common/pom.xml
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
Modified: incubator/cxf/trunk/common/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?rev=629163&r1=629162&r2=629163&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Tue Feb 19 09:04:59 2008
@@ -67,11 +67,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
@@ -140,6 +135,11 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=629163&r1=629162&r2=629163&view=diff
==============================================================================
---
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
(original)
+++
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
Tue Feb 19 09:04:59 2008
@@ -20,15 +20,12 @@
package org.apache.cxf.helpers;
import java.io.File;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.jws.WebParam;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
import javax.wsdl.Definition;
@@ -40,7 +37,6 @@
import javax.wsdl.PortType;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import javax.xml.ws.RequestWrapper;
public class WSDLHelper {
@@ -86,48 +82,6 @@
message = input.getMessage();
}
return message.getParts() == null ? new HashMap() : message.getParts();
- }
-
- public javax.jws.soap.SOAPBinding
getBindingAnnotationFromClass(List<Class<?>> classList) {
- javax.jws.soap.SOAPBinding sb = null;
- for (Class<?> c : classList) {
- sb = c.getAnnotation(javax.jws.soap.SOAPBinding.class);
- if (null != sb) {
- break;
- }
- }
- return sb;
- }
-
- public javax.jws.soap.SOAPBinding getBindingAnnotationFromMethod(Method m)
{
- javax.jws.soap.SOAPBinding sb = null;
- if (null != m) {
- sb = m.getAnnotation(javax.jws.soap.SOAPBinding.class);
- }
- return sb;
- }
-
- public WebParam getWebParamAnnotation(Annotation[] pa) {
- WebParam wp = null;
-
- if (null != pa) {
- for (Annotation annotation : pa) {
- if (WebParam.class.equals(annotation.annotationType())) {
- wp = (WebParam)annotation;
- break;
- }
- }
- }
- return wp;
- }
-
- public RequestWrapper getRequestWrapperAnnotation(Method m) {
- RequestWrapper rw = null;
-
- if (null != m) {
- rw = m.getAnnotation(RequestWrapper.class);
- }
- return rw;
}
public List<PortType> getPortTypes(Definition def) {
