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/04/26 19:03:28 UTC
svn commit: r164832 - in /incubator/beehive/trunk/wsm: drt/tests/org/apache/beehive/wsm/axis/ drt/tests/org/apache/beehive/wsm/axis/handlers/ drt/tests/org/apache/beehive/wsm/jsr181/model/ drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/ drt/tests/org/apache/beehive/wsm/jsr181/wsdl/ src/runtime/META-INF/services/ src/runtime/org/apache/beehive/wsm/axis/ src/runtime/org/apache/beehive/wsm/axis/ant/ src/runtime/org/apache/beehive/wsm/axis/handlers/ src/runtime/org/apache/beehive/wsm/axis/registration/ src/runtime/org/apache/beehive/wsm/axis/util/ src/runtime/org/apache/beehive/wsm/jsr181/model/ src/runtime/org/apache/beehive/wsm/jsr181/processor/ src/runtime/org/apache/beehive/wsm/jsr181/util/ src/runtime/org/apache/beehive/wsm/jsr181/wsdl/ src/runtime/org/apache/beehive/wsm/model/ src/runtime/org/apache/beehive/wsm/model/java/ src/runtime/org/apache/beehive/wsm/model/jsr181/ src/runtime/org/apache/beehive/wsm/model/wsdl/ src/runtime/org/apache/beehive/wsm/processor/ src/runtime/org/apache/beehive/wsm/processor/apt/ src/runtime/org/apache/beehive/wsm/util/ src/runtime/org/apache/beehive/wsm/wsdl/

Author: ekoneil
Date: Tue Apr 26 10:03:25 2005
New Revision: 164832

URL: http://svn.apache.org/viewcvs?rev=164832&view=rev
Log:
bug fix for jira beehive-495, renamed packages under org.apache.beehive.jsr181 to reside in org.apache.beehive package of wsm.
Contribution by Chad Schoettger.

BB: self
DRT: beehive pass



Added:
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/
      - copied from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/
      - copied from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/java/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/
      - copied from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/
      - copied from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/
      - copied from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/
      - copied from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/
      - copied from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java
      - copied, changed from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java
      - copied, changed from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java
      - copied, changed from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/wsdl2ajava.vm
      - copied unchanged from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/wsdl2ajava.vm
Removed:
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/wsdl2ajava.vm
Modified:
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandlerTest.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.javax
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
    incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
    incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AuthenticationHandler.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SecurityRolesInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java Tue Apr 26 10:03:25 2005
@@ -31,13 +31,13 @@
 import org.apache.axis.description.OperationDesc;
 import org.apache.axis.description.ParameterDesc;
 import org.apache.axis.description.ServiceDesc;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ParameterMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.SOAPBindingInfo;
 
 /**
  * ****************************************************************************

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandlerTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandlerTest.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandlerTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandlerTest.java Tue Apr 26 10:03:25 2005
@@ -23,7 +23,7 @@
 import org.apache.axis.message.RPCElement;
 import org.apache.axis.message.SOAPEnvelope;
 import org.apache.axis.server.AxisServer;
-import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
+import org.apache.beehive.wsm.wsdl.WSDLProcessor;
 import org.w3c.dom.Node;
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 import org.xmlsoap.schemas.wsdl.TBinding;

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java Tue Apr 26 10:03:25 2005
@@ -21,6 +21,9 @@
 import java.util.Collection;
 
 import junit.framework.TestCase;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
 
 /**
  * This class serves as the base class for all TestCases based on Bar.java. It

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java Tue Apr 26 10:03:25 2005
@@ -21,6 +21,9 @@
 import java.util.Collection;
 
 import junit.framework.TestCase;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
 
 /**
  * This class serves as the base class for all TestCases based on Bar.java. It

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java Tue Apr 26 10:03:25 2005
@@ -21,6 +21,9 @@
 import java.util.Collection;
 
 import junit.framework.TestCase;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
 
 /**
  * This class serves as the base class for all TestCases based on Bar.java. It

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java Tue Apr 26 10:03:25 2005
@@ -19,6 +19,9 @@
  */
 
 import junit.framework.TestCase;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
 
 /**
  * This class serves as the base class for all TestCases based on Foo.java. It

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.javax
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.javax?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.javax (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.javax Tue Apr 26 10:03:25 2005
@@ -32,18 +32,18 @@
 import javax.jws.soap.SOAPMessageHandler;
 
 import junit.framework.TestCase;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeHandlerChainAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeInitParamAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeOneWayAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSOAPBindingAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSOAPMessageHandlerAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSOAPMessageHandlersAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSecurityIdentityAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSecurityRoleAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebMethodAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebParamAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebResultAnnotation;
-import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebServiceAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeHandlerChainAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeInitParamAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeOneWayAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeSOAPBindingAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeSOAPMessageHandlerAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeSOAPMessageHandlersAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeSecurityIdentityAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeSecurityRoleAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeWebMethodAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeWebParamAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeWebResultAnnotation;
+import org.apache.beehive.wsm.model.fakeAnnotations.FakeWebServiceAnnotation;
 
 //
 // TODO: test combination of type, method, annotation

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java Tue Apr 26 10:03:25 2005
@@ -21,8 +21,8 @@
 import com.sun.tools.apt.Main;
 
 import org.apache.beehive.wsm.jsr181.model.BarTestCase;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ObjectModelStore;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
 
 /**
  * Test case verifies that a source file can be read and its annotations can be

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java Tue Apr 26 10:03:25 2005
@@ -20,8 +20,8 @@
 
 import com.sun.tools.apt.Main;
 import org.apache.beehive.wsm.jsr181.model.FooTestCase;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ObjectModelStore;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
 
 /**
  * Test case verifies that a source file can be read and its annotations can be

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java Tue Apr 26 10:03:25 2005
@@ -43,13 +43,15 @@
 import org.apache.axis.description.OperationDesc;
 import org.apache.axis.description.ParameterDesc;
 import org.apache.axis.description.ServiceDesc;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ParameterMetadataImpl;
 //import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.wsdl.XmlBeanWSDLProcessor;
+import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
+import org.apache.beehive.wsm.wsdl.WSDLProcessor;
+import org.apache.beehive.wsm.wsdl.Wsdl2AJava;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java Tue Apr 26 10:03:25 2005
@@ -36,11 +36,11 @@
 import org.apache.axis.description.OperationDesc;
 import org.apache.axis.description.ParameterDesc;
 import org.apache.axis.description.ServiceDesc;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ObjectModelStore;
-import org.apache.beehive.wsm.jsr181.model.wsdl.XmlBeanWSDLProcessor;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
+import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory (original)
+++ incubator/beehive/trunk/wsm/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory Tue Apr 26 10:03:25 2005
@@ -1,5 +1,5 @@
 #
 # This configures APT so the WsmAnnotationProcessorFactory can be used to process WSM annotations
 #
-org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessorFactory
+org.apache.beehive.wsm.processor.apt.WsmAnnotationProcessorFactory
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java Tue Apr 26 10:03:25 2005
@@ -33,11 +33,11 @@
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
 import org.apache.beehive.wsm.databinding.BindingLookupService;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.util.InvalidTypeMappingException;
 import org.apache.beehive.wsm.registration.TypeRegistrar;
 import org.apache.log4j.Logger;
 import org.apache.xmlbeans.XmlBeans;

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java Tue Apr 26 10:03:25 2005
@@ -23,7 +23,7 @@
 import java.io.File;
 
 
-import org.apache.beehive.wsm.jsr181.wsdl.Wsdl2AJava;
+import org.apache.beehive.wsm.wsdl.Wsdl2AJava;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Java;

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java Tue Apr 26 10:03:25 2005
@@ -49,9 +49,9 @@
 
 import org.apache.beehive.wsm.axis.AxisHook;
 import org.apache.beehive.wsm.axis.ControlProvider;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ObjectModelStore;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
 import org.w3c.dom.Element;
 
 import org.apache.log4j.Logger;

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AuthenticationHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AuthenticationHandler.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AuthenticationHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AuthenticationHandler.java Tue Apr 26 10:03:25 2005
@@ -18,13 +18,13 @@
  *
  */
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ObjectModelStore;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SecurityRolesInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
+import org.apache.beehive.wsm.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.SecurityRolesInfo;
 
 import org.apache.beehive.wsm.axis.security.SecurityModel;
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java Tue Apr 26 10:03:25 2005
@@ -20,9 +20,9 @@
 package org.apache.beehive.wsm.axis.handlers;
 
 import org.apache.axis.handlers.JAXRPCHandler;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.SOAPMessageHandlerInfo;
 
 /**
  * ****************************************************************************

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java Tue Apr 26 10:03:25 2005
@@ -47,7 +47,7 @@
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
 import org.apache.beehive.wsm.databinding.BindingLookupService;
-import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
+import org.apache.beehive.wsm.util.InvalidTypeMappingException;
 import org.apache.beehive.wsm.registration.TypeRegistrar;
 import org.apache.log4j.Logger;
 import org.apache.xmlbeans.XmlObject;

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java?rev=164832&r1=164831&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java Tue Apr 26 10:03:25 2005
@@ -64,8 +64,8 @@
 
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
-import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
-import org.apache.beehive.wsm.jsr181.util.XmlBeanTypeMappingUtil;
+import org.apache.beehive.wsm.util.InvalidTypeMappingException;
+import org.apache.beehive.wsm.util.XmlBeanTypeMappingUtil;
 
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.SchemaTypeLoader;

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$Factory
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
 
 import java.util.List;

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$Factory
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
 import javax.jws.WebParam;
 import javax.xml.namespace.QName;

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
 import javax.jws.soap.SOAPBinding;
 

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$Factory
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
 import java.util.Collection;
 import java.util.Map;

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsSecurityRolesInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
 import java.util.Collection;
 

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java Tue Apr 26 10:03:25 2005
@@ -15,9 +15,9 @@
  *
  * $Header:$Factory
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
-import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
+import org.apache.beehive.wsm.model.java.JavaTypeInfo;
 
 import java.net.URL;
 import java.util.Collection;

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.wsm.jsr181.model;
+package org.apache.beehive.wsm.model;
 
 public class ValidationException extends Exception {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.java;
+package org.apache.beehive.wsm.model.java;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.java;
+package org.apache.beehive.wsm.model.java;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.java;
+package org.apache.beehive.wsm.model.java;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 import javax.jws.soap.InitParam;
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -32,12 +32,12 @@
 
 import javax.xml.namespace.QName; // todo (mmerz@apache.org, 01/25/05): this needs to go...
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
-import org.apache.beehive.wsm.jsr181.model.ValidationException;
-import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
-import org.apache.beehive.wsm.jsr181.model.java.JavaParameterInfo;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.model.ValidationException;
+import org.apache.beehive.wsm.model.java.JavaMethodInfo;
+import org.apache.beehive.wsm.model.java.JavaParameterInfo;
 
 public class Jsr181MethodMetadataImpl implements BeehiveWsMethodMetadata, java.io.Serializable {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 /*
  * Copyright 2005 The Apache Software Foundation
@@ -28,11 +28,10 @@
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.apt.Filer;
-import com.sun.mirror.apt.Messager;
 
 import java.net.URL;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
 
 /**
  * Encapsulates all knowledge about where and how object models are persisted.

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -25,9 +25,9 @@
 
 import javax.xml.namespace.QName; // todo (mmerz@apache.org, 01/25/05): this needs to go...
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.ValidationException;
-import org.apache.beehive.wsm.jsr181.model.java.JavaParameterInfo;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.ValidationException;
+import org.apache.beehive.wsm.model.java.JavaParameterInfo;
 
 public class Jsr181ParameterMetadataImpl implements BeehiveWsParameterMetadata, java.io.Serializable {
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -18,9 +18,9 @@
  * $Header:$Factory
  */
 
-import org.apache.beehive.wsm.jsr181.model.*;
-import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
-import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
+import org.apache.beehive.wsm.model.*;
+import org.apache.beehive.wsm.model.java.JavaMethodInfo;
+import org.apache.beehive.wsm.model.java.JavaTypeInfo;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java Tue Apr 26 10:03:25 2005
@@ -1,8 +1,8 @@
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 import javax.jws.soap.SOAPBinding;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,7 +27,7 @@
 import javax.jws.soap.InitParam;
 import javax.jws.soap.SOAPMessageHandler;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPMessageHandlerInfo;
 
 public class SOAPMessageHandlerInfo implements java.io.Serializable, BeehiveWsSOAPMessageHandlerInfo {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SecurityRolesInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SecurityRolesInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SecurityRolesInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SecurityRolesInfo.java Tue Apr 26 10:03:25 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.wsm.jsr181.model.jsr181;
+package org.apache.beehive.wsm.model.jsr181;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,7 +24,7 @@
 
 import javax.jws.security.SecurityRoles;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSecurityRolesInfo;
 
 public class SecurityRolesInfo implements java.io.Serializable, BeehiveWsSecurityRolesInfo {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java Tue Apr 26 10:03:25 2005
@@ -16,17 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beehive.wsm.jsr181.model.wsdl;
+package org.apache.beehive.wsm.model.wsdl;
 
 import java.io.File;
 import java.io.InputStream;
 import java.io.IOException;
 import java.lang.reflect.Array;
-import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,22 +33,19 @@
 import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
 
-import org.apache.beehive.wsm.jsr181.util.TypeMappingUtil;
-import org.apache.beehive.wsm.jsr181.util.XmlBeanTypeMappingUtil;
-import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
+import org.apache.beehive.wsm.util.TypeMappingUtil;
+import org.apache.beehive.wsm.util.XmlBeanTypeMappingUtil;
+import org.apache.beehive.wsm.wsdl.WSDLProcessor;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ParameterMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.model.jsr181.SOAPBindingInfo;
 import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.SchemaTypeLoader;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
@@ -73,7 +68,6 @@
 import org.apache.xmlbeans.impl.xb.xsdschema.Element;
 import org.apache.xmlbeans.impl.xb.xsdschema.Group;
 import org.apache.xmlbeans.impl.xb.xsdschema.ComplexType;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
 import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
 
 /*******************************************************************************

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor;
+package org.apache.beehive.wsm.processor;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -30,13 +30,11 @@
 import com.sun.mirror.declaration.ParameterDeclaration;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.apt.Messager;
 
 import com.sun.mirror.type.AnnotationType;
 
-import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
-import org.apache.beehive.wsm.jsr181.model.java.JavaParameterInfo;
+import org.apache.beehive.wsm.model.java.JavaMethodInfo;
+import org.apache.beehive.wsm.model.java.JavaParameterInfo;
 
 public class MirrorMethodInfo implements JavaMethodInfo {
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -27,14 +27,10 @@
 import com.sun.mirror.declaration.ParameterDeclaration;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.apt.Messager;
 
 import com.sun.mirror.type.AnnotationType;
 
-import org.apache.beehive.wsm.jsr181.processor.apt.TypeMirrorUtil;
-
-import org.apache.beehive.wsm.jsr181.model.java.JavaParameterInfo;
+import org.apache.beehive.wsm.model.java.JavaParameterInfo;
 
 public class MirrorParameterInfo implements JavaParameterInfo {
     

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -32,13 +32,10 @@
 import com.sun.mirror.declaration.TypeDeclaration;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.apt.Messager;
-
 import com.sun.mirror.type.AnnotationType;
 
-import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
-import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
+import org.apache.beehive.wsm.model.java.JavaMethodInfo;
+import org.apache.beehive.wsm.model.java.JavaTypeInfo;
 
 public class MirrorTypeInfo implements JavaTypeInfo {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -25,7 +25,7 @@
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 import com.sun.mirror.declaration.Declaration;
-import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
+import org.apache.beehive.wsm.processor.ProcessorException;
 
 /**
  * The TwoPhaseAnnotationProcessor class is an abstract class that implements the APT

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -20,14 +20,11 @@
 
 import java.util.Collection;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SecurityRolesInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
 
 public class WebServiceMetadataViewer {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation
@@ -18,12 +18,10 @@
  * $Header:$
  */
 
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
 import com.sun.mirror.apt.Messager;
 
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
@@ -34,9 +32,9 @@
 
 import javax.jws.WebService;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ObjectModelStore;
-import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
+import org.apache.beehive.wsm.model.jsr181.Jsr181TypeMetadataImpl;
 
 
 /**

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java?rev=164832&r1=164807&r2=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java Tue Apr 26 10:03:25 2005
@@ -1,4 +1,4 @@
-package org.apache.beehive.wsm.jsr181.processor.apt;
+package org.apache.beehive.wsm.processor.apt;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/InvalidTypeMappingException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java Tue Apr 26 10:03:25 2005
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beehive.wsm.jsr181.util;
+package org.apache.beehive.wsm.util;
 
 /**
  * ****************************************************************************

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/TypeMappingUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java Tue Apr 26 10:03:25 2005
@@ -19,7 +19,7 @@
  * 
  * Original author: Jonathan Colwell
  */
-package org.apache.beehive.wsm.jsr181.util;
+package org.apache.beehive.wsm.util;
 
 import javax.xml.namespace.QName;
 

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java (from r164807, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java&r1=164807&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/util/XmlBeanTypeMappingUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java Tue Apr 26 10:03:25 2005
@@ -19,7 +19,7 @@
  * 
  * Original author: Jonathan Colwell
  */
-package org.apache.beehive.wsm.jsr181.util;
+package org.apache.beehive.wsm.util;
 
 import java.lang.reflect.Method;
 

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java (from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java&r1=164245&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java Tue Apr 26 10:03:25 2005
@@ -16,12 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beehive.wsm.jsr181.wsdl;
+package org.apache.beehive.wsm.wsdl;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
 
 import java.io.InputStream;
-import java.io.IOException;
 
 /*******************************************************************************
  * Creates a WebServiceTYPEMetadata Object from a WSDL.

Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java (from r164245, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java?p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java&r1=164245&r2=164832&rev=164832&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Wsdl2AJava.java Tue Apr 26 10:03:25 2005
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beehive.wsm.jsr181.wsdl;
+package org.apache.beehive.wsm.wsdl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -26,8 +26,8 @@
 import java.io.Writer;
 import java.util.Properties;
 
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.wsdl.XmlBeanWSDLProcessor;
+import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.model.wsdl.XmlBeanWSDLProcessor;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
@@ -68,7 +68,7 @@
 				ClasspathResourceLoader.class.getName());
 		ve = new VelocityEngine();
 		ve.init(p);
-		String templateFileName = "org/apache/beehive/wsm/jsr181/wsdl/wsdl2ajava.vm";
+		String templateFileName = "org/apache/beehive/wsm/wsdl/wsdl2ajava.vm";
 
 		try {
 			template = ve.getTemplate(templateFileName);