svn commit: r356380 - in /beehive/trunk: system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/ wsm/src/axis/org/apache/beehive/wsm/axis/r...

[ek...@apache.org]

Author: ekoneil
Date: Mon Dec 12 13:20:28 2005
New Revision: 356380

URL: http://svn.apache.org/viewcvs?rev=356380&view=rev
Log:
Moving the TypeRegistrar code into the web service control since that's the only place it's used.

More clearing the path for the type binding work in WSM.

BB: self
Test: WSM and web service control pass


Added:
    beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/AxisTypeRegistrar.java
      - copied, changed from r356287, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
    beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java
      - copied, changed from r356287, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/registration/TypeRegistrar.java
Removed:
    beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
    beehive/trunk/wsm/src/core/org/apache/beehive/wsm/registration/TypeRegistrar.java
Modified:
    beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java
    beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScCall.java

Modified: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java?rev=356380&r1=356379&r2=356380&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScAxisCall.java Mon Dec 12 13:20:28 2005
@@ -15,18 +15,8 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.controls.system.webservice.jaxrpc;
 
-import org.apache.axis.constants.Use;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.encoding.XMLType;
-import org.apache.beehive.controls.api.ControlException;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpParameter;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOperation;
-import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
-import org.apache.beehive.wsm.axis.registration.AxisTypeRegistrar;
-
 import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.ParameterMode;
@@ -34,6 +24,14 @@
 import javax.xml.rpc.ServiceException;
 import javax.xml.rpc.encoding.TypeMapping;
 
+import org.apache.axis.constants.Use;
+import org.apache.axis.description.ParameterDesc;
+import org.apache.axis.encoding.XMLType;
+import org.apache.beehive.controls.api.ControlException;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpParameter;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOperation;
+import org.apache.beehive.controls.system.webservice.utils.AxisTypeRegistrar;
+import org.apache.beehive.wsm.axis.databinding.TypeSystemLookupService;
 
 /**
  * This is the AXIS 1.2 implementation of the call abstraction layer of the service control.

Modified: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScCall.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScCall.java?rev=356380&r1=356379&r2=356380&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScCall.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ScCall.java Mon Dec 12 13:20:28 2005
@@ -18,15 +18,6 @@
  */
 package org.apache.beehive.controls.system.webservice.jaxrpc;
 
-import org.apache.beehive.controls.api.ControlException;
-import org.apache.beehive.controls.system.webservice.utils.HolderUtils;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpFault;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpFaultList;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpParameter;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpReturnType;
-import org.apache.beehive.controls.system.webservice.wsdl.WsdlOperation;
-import org.apache.beehive.wsm.registration.TypeRegistrar;
-
 import javax.xml.namespace.QName;
 import javax.xml.rpc.Call;
 import javax.xml.rpc.holders.Holder;
@@ -38,6 +29,14 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.beehive.controls.api.ControlException;
+import org.apache.beehive.controls.system.webservice.utils.HolderUtils;
+import org.apache.beehive.controls.system.webservice.utils.TypeRegistrar;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpFault;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpFaultList;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpParameter;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOpReturnType;
+import org.apache.beehive.controls.system.webservice.wsdl.WsdlOperation;
 
 /**
  * The abstract base class for the service control's JAX-RPC Call abstraction layer.  Due to some

Copied: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/AxisTypeRegistrar.java (from r356287, beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/AxisTypeRegistrar.java?p2=beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/AxisTypeRegistrar.java&p1=beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java&r1=356287&r2=356380&rev=356380&view=diff
==============================================================================
--- beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/AxisTypeRegistrar.java Mon Dec 12 13:20:28 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beehive.wsm.axis.registration;
+package org.apache.beehive.controls.system.webservice.utils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -34,10 +34,11 @@
 import org.apache.axis.encoding.ser.BeanDeserializerFactory;
 import org.apache.axis.encoding.ser.BeanSerializerFactory;
 import org.apache.axis.utils.BeanPropertyDescriptor;
+import org.apache.beehive.controls.system.webservice.utils.TypeRegistrar;
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
+import org.apache.beehive.wsm.axis.registration.AxisTypeMappingMetaData;
 import org.apache.beehive.wsm.databinding.BindingLookupService;
-import org.apache.beehive.wsm.registration.TypeRegistrar;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java (from r356287, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/registration/TypeRegistrar.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java?p2=beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/registration/TypeRegistrar.java&r1=356287&r2=356380&rev=356380&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/registration/TypeRegistrar.java (original)
+++ beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java Mon Dec 12 13:20:28 2005
@@ -17,7 +17,7 @@
  * 
  * 
  */
-package org.apache.beehive.wsm.registration;
+package org.apache.beehive.controls.system.webservice.utils;
 
 import java.io.File;
 import java.lang.reflect.Array;