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 2005/10/08 06:25:14 UTC
svn commit: r307256 - in /beehive/trunk:
system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/
wsm/src/axis/org/apache/beehive/wsm/axis/
wsm/src/axis/org/apache/beehive/wsm/axis/databinding/
wsm/src/core/META-INF/servi...
Author: ekoneil
Date: Fri Oct 7 21:25:05 2005
New Revision: 307256
URL: http://svn.apache.org/viewcvs?rev=307256&view=rev
Log:
Bit of cleanup:
- remove some errant System.outs
- rename the "processor2" package to "processor"
BB: self
Test: WSM + web service control pass
Added:
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/InvalidTypeMappingException.java (contents, props changed)
- copied, changed from r307249, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/InvalidTypeMappingException.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/
- copied from r307252, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/HackUtils.java
- copied, changed from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/HackUtils.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/ProcessorException.java
- copied, changed from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/ProcessorException.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/TwoPhaseAnnotationProcessor.java
- copied, changed from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/TwoPhaseAnnotationProcessor.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/
- copied from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/apt/
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/
- copied from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/checker/
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/
- copied from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/generator/
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/
- copied from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/model/
Removed:
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/
Modified:
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/MethodInfo.java
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/AxisHook.java
beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
beehive/trunk/wsm/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/AxisGenerator.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/WsmResourceGenerator.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsMetadataFactory.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsTypeMetadataFactory.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/MirrorFactoryImpl.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/ReflectionFactoryImpl.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/WSDLFactoryImpl.java
Modified: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/MethodInfo.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/MethodInfo.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/MethodInfo.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/MethodInfo.java Fri Oct 7 21:25:05 2005
@@ -73,8 +73,6 @@
}
void setReturnTypeName(String returnType) {
- System.out.println("***** returnType: " + returnType);
-
_returnTypeName = returnType;
if (_returnTypeName.startsWith("java.lang.")) {
_returnTypeName = _returnTypeName.substring(_returnTypeName.lastIndexOf('.')+1);
Modified: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java Fri Oct 7 21:25:05 2005
@@ -33,7 +33,7 @@
import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
import org.apache.beehive.wsm.wsdl.Utilities;
import org.apache.beehive.wsm.wsdl.WSDLParser;
-import org.apache.beehive.wsm.processor2.HackUtils;
+import org.apache.beehive.wsm.processor.HackUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
@@ -213,8 +213,6 @@
for(BeehiveWsParameterMetadata param : method.getParams()) {
String javaType = HackUtils.convertToReadableName(param.getJavaType());
-
- System.out.println("%%%%%%% param.getJavaType: " + javaType);
if (param.getWpMode() == WebParam.Mode.IN)
m.addParameter(param.getWpName(), javaType);
Modified: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/AxisHook.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/AxisHook.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/AxisHook.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/AxisHook.java Fri Oct 7 21:25:05 2005
@@ -18,13 +18,11 @@
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import java.lang.reflect.Array;
import java.rmi.Remote;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Arrays;
import javax.jws.WebParam;
import javax.jws.soap.SOAPBinding;
import javax.wsdl.OperationType;
@@ -50,7 +48,6 @@
import org.apache.axis.encoding.ser.*;
import org.apache.axis.utils.BeanPropertyDescriptor;
import org.apache.axis.utils.BeanUtils;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.Constants;
import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
@@ -62,8 +59,8 @@
import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
import org.apache.beehive.wsm.registration.TypeRegistrar;
-import org.apache.beehive.wsm.util.InvalidTypeMappingException;
-import org.apache.beehive.wsm.processor2.HackUtils;
+import org.apache.beehive.wsm.exception.InvalidTypeMappingException;
+import org.apache.beehive.wsm.processor.HackUtils;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.xmlbeans.XmlBeans;
@@ -118,8 +115,6 @@
// Walk the methods
for(BeehiveWsMethodMetadata meth : wsm.getMethods()) {
- System.out.println("method: " + meth);
-
String operationName = meth.getWmOperationName();
if(null != operationName && 0 < operationName.length()) {
// set the Operations properties
Modified: beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java (original)
+++ beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java Fri Oct 7 21:25:05 2005
@@ -101,8 +101,7 @@
}
catch(ClassNotFoundException e) {
System.out.println("Failed to find the class: " + className
- + " No Axis generated classes was found for qname: "
- + qType);
+ + " No Axis generated classes was found for qname: " + qType);
}
if(null != javaType)
Modified: beehive/trunk/wsm/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory (original)
+++ beehive/trunk/wsm/src/core/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory Fri Oct 7 21:25:05 2005
@@ -1,5 +1,5 @@
#
# This configures APT so the WsmAnnotationProcessorFactory can be used to process WSM annotations
#
-org.apache.beehive.wsm.processor2.apt.WsmAnnotationProcessorFactory
+org.apache.beehive.wsm.processor.apt.WsmAnnotationProcessorFactory
Copied: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/InvalidTypeMappingException.java (from r307249, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/InvalidTypeMappingException.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/InvalidTypeMappingException.java?p2=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/InvalidTypeMappingException.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/InvalidTypeMappingException.java&r1=307249&r2=307256&rev=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/InvalidTypeMappingException.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/InvalidTypeMappingException.java Fri Oct 7 21:25:05 2005
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beehive.wsm.util;
+package org.apache.beehive.wsm.exception;
/**
* ****************************************************************************
Propchange: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/exception/InvalidTypeMappingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java Fri Oct 7 21:25:05 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.processor2.HackUtils;
+import org.apache.beehive.wsm.processor.HackUtils;
public class DefaultMethodMetadataImpl
extends BeehiveWsMethodMetadata
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java Fri Oct 7 21:25:05 2005
@@ -21,7 +21,7 @@
import javax.xml.namespace.QName;
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.processor2.HackUtils;
+import org.apache.beehive.wsm.processor.HackUtils;
public class DefaultParameterMetadataImpl
extends BeehiveWsParameterMetadata
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java?rev=307256&r1=307255&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java Fri Oct 7 21:25:05 2005
@@ -33,7 +33,7 @@
import org.apache.beehive.wsm.model.impl.DefaultParameterMetadataImpl;
import org.apache.beehive.wsm.model.impl.DefaultSOAPBindingInfoImpl;
import org.apache.beehive.wsm.model.impl.DefaultTypeMetadataImpl;
-import org.apache.beehive.wsm.processor2.HackUtils;
+import org.apache.beehive.wsm.processor.HackUtils;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlObject;
@@ -203,9 +203,6 @@
BeehiveWsMethodMetadata wmm = new DefaultMethodMetadataImpl();
wmm.setJavaMethodName(opName);
-
- System.out.println("========= returnType: " + returnType);
-
wmm.setReturnType(returnType);
wmm.setXmlReturnType(returnXMLType);
wmm.setWmOperationName(opName);
Copied: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/HackUtils.java (from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/HackUtils.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/HackUtils.java?p2=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/HackUtils.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/HackUtils.java&r1=307254&r2=307256&rev=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/HackUtils.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/HackUtils.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$Factory
*/
-package org.apache.beehive.wsm.processor2;
+package org.apache.beehive.wsm.processor;
import java.lang.reflect.Array;
/**
Copied: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/ProcessorException.java (from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/ProcessorException.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/ProcessorException.java?p2=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/ProcessorException.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/ProcessorException.java&r1=307254&r2=307256&rev=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/ProcessorException.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/ProcessorException.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2;
+package org.apache.beehive.wsm.processor;
/**
* A simple exception wrapper class used for processor failures.
Copied: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/TwoPhaseAnnotationProcessor.java (from r307254, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/TwoPhaseAnnotationProcessor.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/TwoPhaseAnnotationProcessor.java?p2=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/TwoPhaseAnnotationProcessor.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/TwoPhaseAnnotationProcessor.java&r1=307254&r2=307256&rev=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor2/TwoPhaseAnnotationProcessor.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/TwoPhaseAnnotationProcessor.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2;
+package org.apache.beehive.wsm.processor;
import java.util.Collection;
import java.util.Set;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/Jsr181AnnotationConstants.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.apt;
+package org.apache.beehive.wsm.processor.apt;
interface Jsr181AnnotationConstants {
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java Fri Oct 7 21:25:05 2005
@@ -15,18 +15,17 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.apt;
+package org.apache.beehive.wsm.processor.apt;
-import org.apache.beehive.wsm.processor2.TwoPhaseAnnotationProcessor;
-import org.apache.beehive.wsm.processor2.generator.AxisGenerator;
-import org.apache.beehive.wsm.processor2.generator.WsmResourceGenerator;
-import org.apache.beehive.wsm.processor2.checker.Jsr181AnnotationChecker;
+import org.apache.beehive.wsm.processor.TwoPhaseAnnotationProcessor;
+import org.apache.beehive.wsm.processor.generator.AxisGenerator;
+import org.apache.beehive.wsm.processor.generator.WsmResourceGenerator;
+import org.apache.beehive.wsm.processor.checker.Jsr181AnnotationChecker;
import com.sun.mirror.declaration.Declaration;
import com.sun.mirror.declaration.AnnotationTypeDeclaration;
import com.sun.mirror.declaration.TypeDeclaration;
import com.sun.mirror.declaration.EnumDeclaration;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Messager;
import java.util.Set;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.apt;
+package org.apache.beehive.wsm.processor.apt;
import java.util.Collection;
import java.util.Collections;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.checker;
+package org.apache.beehive.wsm.processor.checker;
import java.util.Collection;
import javax.jws.WebService;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/AxisGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/AxisGenerator.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/AxisGenerator.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/AxisGenerator.java Fri Oct 7 21:25:05 2005
@@ -15,12 +15,12 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.generator;
+package org.apache.beehive.wsm.processor.generator;
import com.sun.mirror.declaration.TypeDeclaration;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import org.apache.beehive.wsm.processor2.model.factory.BeehiveWsMetadataFactory;
-import org.apache.beehive.wsm.processor2.model.factory.BeehiveWsTypeMetadataFactory;
+import org.apache.beehive.wsm.processor.model.factory.BeehiveWsMetadataFactory;
+import org.apache.beehive.wsm.processor.model.factory.BeehiveWsTypeMetadataFactory;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/WsmResourceGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/WsmResourceGenerator.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/WsmResourceGenerator.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/generator/WsmResourceGenerator.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.generator;
+package org.apache.beehive.wsm.processor.generator;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
import com.sun.mirror.declaration.TypeDeclaration;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsMetadataFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsMetadataFactory.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsMetadataFactory.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsMetadataFactory.java Fri Oct 7 21:25:05 2005
@@ -15,9 +15,9 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.model.factory;
+package org.apache.beehive.wsm.processor.model.factory;
-import org.apache.beehive.wsm.processor2.ProcessorException;
+import org.apache.beehive.wsm.processor.ProcessorException;
public class BeehiveWsMetadataFactory {
@@ -32,7 +32,7 @@
String className = null;
if(factoryType == FactoryType.MIRROR)
- className = "org.apache.beehive.wsm.processor2.model.factory.impl.MirrorFactoryImpl";
+ className = "org.apache.beehive.wsm.processor.model.factory.impl.MirrorFactoryImpl";
else throw new IllegalArgumentException("Can not create factory of type " + factoryType);
BeehiveWsTypeMetadataFactory factory = null;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsTypeMetadataFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsTypeMetadataFactory.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsTypeMetadataFactory.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/BeehiveWsTypeMetadataFactory.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.model.factory;
+package org.apache.beehive.wsm.processor.model.factory;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/MirrorFactoryImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/MirrorFactoryImpl.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/MirrorFactoryImpl.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/MirrorFactoryImpl.java Fri Oct 7 21:25:05 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.model.factory.impl;
+package org.apache.beehive.wsm.processor.model.factory.impl;
import java.io.IOException;
import java.io.File;
@@ -39,8 +39,7 @@
import com.sun.mirror.declaration.MethodDeclaration;
import com.sun.mirror.declaration.ParameterDeclaration;
-import org.apache.beehive.wsm.processor2.model.factory.BeehiveWsTypeMetadataFactory;
-import org.apache.beehive.wsm.processor2.HackUtils;
+import org.apache.beehive.wsm.processor.model.factory.BeehiveWsTypeMetadataFactory;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/ReflectionFactoryImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/ReflectionFactoryImpl.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/ReflectionFactoryImpl.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/ReflectionFactoryImpl.java Fri Oct 7 21:25:05 2005
@@ -15,9 +15,9 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.model.factory.impl;
+package org.apache.beehive.wsm.processor.model.factory.impl;
-import org.apache.beehive.wsm.processor2.model.factory.BeehiveWsTypeMetadataFactory;
+import org.apache.beehive.wsm.processor.model.factory.BeehiveWsTypeMetadataFactory;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
class ReflectionFactoryImpl
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/WSDLFactoryImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/WSDLFactoryImpl.java?rev=307256&r1=307254&r2=307256&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/WSDLFactoryImpl.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/model/factory/impl/WSDLFactoryImpl.java Fri Oct 7 21:25:05 2005
@@ -15,9 +15,9 @@
*
* $Header:$
*/
-package org.apache.beehive.wsm.processor2.model.factory.impl;
+package org.apache.beehive.wsm.processor.model.factory.impl;
-import org.apache.beehive.wsm.processor2.model.factory.BeehiveWsTypeMetadataFactory;
+import org.apache.beehive.wsm.processor.model.factory.BeehiveWsTypeMetadataFactory;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
class WSDLFactoryImpl