You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/06/11 00:11:02 UTC
svn commit: r413370 - in /beehive/wsm/trunk/src:
axis/org/apache/beehive/wsm/axis/ axis/org/apache/beehive/wsm/axis/handlers/
axis/org/apache/beehive/wsm/axis/util/ core/META-INF/services/
core/org/apache/beehive/wsm/processor/apt/ core/org/apache/beeh...
Author: ekoneil
Date: Sat Jun 10 15:11:01 2006
New Revision: 413370
URL: http://svn.apache.org/viewvc?rev=413370&view=rev
Log:
Making some WSM names more consistent and adding Javadoc.
Test: WSM pass
Added:
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmServiceFactory.java (contents, props changed)
- copied, changed from r413044, beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmBuilder.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionWsmServiceFactory.java (contents, props changed)
- copied, changed from r413044, beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionFactoryImpl.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WsdlWsmServiceFactory.java (contents, props changed)
- copied, changed from r413044, beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WSDLFactoryImpl.java
Removed:
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmBuilder.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionFactoryImpl.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WSDLFactoryImpl.java
Modified:
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java
beehive/wsm/trunk/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/generator/axis/AxisGenerator.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/TypeResolver.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceFactory.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceStyleFactory.java
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorTypeResolver.java
Modified: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java Sat Jun 10 15:11:01 2006
@@ -349,7 +349,7 @@
Method javaMethod = null;
try {
if(wsmParameters == null || wsmParameters.size() == 0)
- javaMethod = implementationClass.getMethod(methodName, null);
+ javaMethod = implementationClass.getMethod(methodName);
else {
Class parameterTypes[] = new Class[wsmParameters.size()];
for(int i = 0; i < wsmParameters.size(); i++) {
Modified: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java Sat Jun 10 15:11:01 2006
@@ -23,8 +23,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.io.IOException;
-import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.HandlerInfo;
@@ -45,7 +43,6 @@
import org.apache.beehive.wsm.model.WsmSoapMessageHandler;
import org.apache.beehive.wsm.model.WsmService;
import org.apache.beehive.wsm.exception.InvalidTypeMappingException;
-import org.apache.beehive.wsm.util.WsmddUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java Sat Jun 10 15:11:01 2006
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.beehive.wsm.axis.util;
import java.io.InputStream;
Modified: beehive/wsm/trunk/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory (original)
+++ beehive/wsm/trunk/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory Sat Jun 10 15:11:01 2006
@@ -1,5 +1,5 @@
#
-# This configures APT so the WsmAnnotationProcessorFactory can be used to process WSM annotations
+# This registers the WsmAnnotationProcessorFactory with APT to enable annotation processing.
#
org.apache.beehive.wsm.processor.apt.WsmAnnotationProcessorFactory
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java Sat Jun 10 15:11:01 2006
@@ -17,6 +17,9 @@
*/
package org.apache.beehive.wsm.processor.apt;
+/**
+ * Package protected interface that defines constants used for annotation processing.
+ */
interface Jsr181AnnotationConstants {
String JWS_PACKAGE_PREFIX = "javax.jws";
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java Sat Jun 10 15:11:01 2006
@@ -35,6 +35,7 @@
import java.util.Map;
import java.lang.reflect.Method;
+
public class WsmAnnotationProcessor
extends TwoPhaseAnnotationProcessor {
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java Sat Jun 10 15:11:01 2006
@@ -58,7 +58,8 @@
return supportedOptions;
}
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env) {
+ public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
+ AnnotationProcessorEnvironment env) {
return new WsmAnnotationProcessor(atds, env);
}
}
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/generator/axis/AxisGenerator.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/generator/axis/AxisGenerator.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/generator/axis/AxisGenerator.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/generator/axis/AxisGenerator.java Sat Jun 10 15:11:01 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.wsm.processor.generator.axis;
-import java.io.InputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/TypeResolver.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/TypeResolver.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/TypeResolver.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/TypeResolver.java Sat Jun 10 15:11:01 2006
@@ -19,8 +19,10 @@
/**
* <p>
- * Abstraction used to hide the details of type resolution when processing metadata
- * from an metadata-driven web service.
+ * Abstraction used to provide different type resolution strategies for different
+ * metadata processing environments. For example, when using Java 5 annotation processing
+ * to divine the metadata describing a web service, a Mirror type resolver would be appropriate
+ * but when using reflection a Class type representation would be appropriate.
* </p>
*/
public abstract class TypeResolver {
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceFactory.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceFactory.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceFactory.java Sat Jun 10 15:11:01 2006
@@ -29,7 +29,6 @@
*/
public abstract class WsmServiceFactory {
- /* todo: this interface doesn't seem general enough */
public abstract WsmService create(String serviceBeanClassName,
TypeResolver typeResolver,
String baseLocation);
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceStyleFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceStyleFactory.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceStyleFactory.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/WsmServiceStyleFactory.java Sat Jun 10 15:11:01 2006
@@ -45,7 +45,7 @@
String className = null;
if(factoryType == FactoryType.MIRROR)
- className = "org.apache.beehive.wsm.processor.model.factory.mirror.MirrorWsmBuilder";
+ className = "org.apache.beehive.wsm.processor.model.factory.mirror.MirrorWsmServiceFactory";
else throw new IllegalArgumentException("Can not create factory of type " + factoryType);
WsmServiceFactory factory = null;
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorTypeResolver.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorTypeResolver.java?rev=413370&r1=413369&r2=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorTypeResolver.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorTypeResolver.java Sat Jun 10 15:11:01 2006
@@ -21,7 +21,10 @@
import org.apache.beehive.wsm.processor.model.factory.TypeResolver;
/**
- *
+ * A resolver that maps a String to some representation of a type declaration. Depending
+ * on the annotation processing environment, this type declaration might be a {@link Class}
+ * file, a Mirror {@link com.sun.mirror.declaration.TypeDeclaration}, or some other sort
+ * of object representing a type.
*/
public class MirrorTypeResolver
extends TypeResolver {
Copied: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmServiceFactory.java (from r413044, beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmBuilder.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmServiceFactory.java?p2=beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmServiceFactory.java&p1=beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmBuilder.java&r1=413044&r2=413370&rev=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmBuilder.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmServiceFactory.java Sat Jun 10 15:11:01 2006
@@ -63,7 +63,7 @@
*
* The client is responsible for performing code generation, serializing, etc the object model.
*/
-public class MirrorWsmBuilder
+public class MirrorWsmServiceFactory
extends WsmServiceFactory {
private static final String SERVICE_SUFFIX = "Service";
@@ -72,6 +72,7 @@
public WsmService create(String serviceBeanClassName,
TypeResolver typeResolver,
String baseLocation) {
+
WsmService wsMetadata = new WsmService();
TypeDeclaration implDecl = (TypeDeclaration)typeResolver.resolveType(serviceBeanClassName);
Propchange: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/mirror/MirrorWsmServiceFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionWsmServiceFactory.java (from r413044, beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionFactoryImpl.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionWsmServiceFactory.java?p2=beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionWsmServiceFactory.java&p1=beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionFactoryImpl.java&r1=413044&r2=413370&rev=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionFactoryImpl.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionWsmServiceFactory.java Sat Jun 10 15:11:01 2006
@@ -21,13 +21,16 @@
import org.apache.beehive.wsm.processor.model.factory.TypeResolver;
import org.apache.beehive.wsm.model.WsmService;
-class ReflectionFactoryImpl
+/**
+ *
+ */
+class ReflectionWsmServiceFactory
extends WsmServiceFactory {
public WsmService create(String serviceBeanClassName,
TypeResolver typeResolver,
String baseLocation) {
- /* todo: implement */
- throw new UnsupportedOperationException("NYI");
+ throw new UnsupportedOperationException("Support for constructing a WsmService object " +
+ "via reflection is not yet implemented");
}
}
Propchange: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/reflection/ReflectionWsmServiceFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WsdlWsmServiceFactory.java (from r413044, beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WSDLFactoryImpl.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WsdlWsmServiceFactory.java?p2=beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WsdlWsmServiceFactory.java&p1=beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WSDLFactoryImpl.java&r1=413044&r2=413370&rev=413370&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WSDLFactoryImpl.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WsdlWsmServiceFactory.java Sat Jun 10 15:11:01 2006
@@ -21,14 +21,18 @@
import org.apache.beehive.wsm.processor.model.factory.TypeResolver;
import org.apache.beehive.wsm.model.WsmService;
-class WSDLFactoryImpl
+/**
+ * Factory for constructing a {@link WsmService} object from a WSDL.
+ */
+class WsdlWsmServiceFactory
extends WsmServiceFactory {
public WsmService create(String serviceBeanClassName,
- TypeResolver typeResolver,
- String baseLocation) {
- /* todo: implement */
- throw new UnsupportedOperationException("NYI");
+ TypeResolver typeResolver,
+ String baseLocation) {
+
+ throw new UnsupportedOperationException("Support for constructing a WsmService object " +
+ "from a WSDL is not yet implemented");
}
}
Propchange: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/processor/model/factory/wsdl/WsdlWsmServiceFactory.java
------------------------------------------------------------------------------
svn:eol-style = native