You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/06/11 00:40:56 UTC
svn commit: r413373 - in /beehive/wsm/trunk/src:
axis/org/apache/beehive/wsm/axis/ axis/org/apache/beehive/wsm/axis/util/
axis/org/apache/beehive/wsm/axis/xmlbeans/
webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/
Author: ekoneil
Date: Sat Jun 10 15:40:56 2006
New Revision: 413373
URL: http://svn.apache.org/viewvc?rev=413373&view=rev
Log:
Moving the XmlBean (de)serializer classes for Axis back into the axis/ package. Not sure these are even needed any longer as Axis provides this functionality OOTB in Axis 1.3.
Test: WSM pass
Added:
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializer.java
- copied, changed from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializerFactory.java
- copied, changed from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializer.java
- copied, changed from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializerFactory.java
- copied, changed from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java
Removed:
beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/
Modified:
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java
Modified: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java?rev=413373&r1=413372&r2=413373&view=diff
==============================================================================
--- beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/ServiceDescriptionFactory.java Sat Jun 10 15:40:56 2006
@@ -49,8 +49,6 @@
import org.apache.axis.encoding.ser.ArraySerializerFactory;
import org.apache.axis.utils.BeanPropertyDescriptor;
import org.apache.axis.Constants;
-import org.apache.beehive.webservice.utils.encoding.XmlBeanDeserializerFactory;
-import org.apache.beehive.webservice.utils.encoding.XmlBeanSerializerFactory;
import org.apache.beehive.webservice.utils.databinding.BindingLookupStrategy;
import org.apache.beehive.webservice.utils.databinding.TypeMappingConstants;
import org.apache.beehive.webservice.utils.JavaClassUtils;
@@ -62,6 +60,8 @@
import org.apache.beehive.wsm.exception.ConfigurationException;
import org.apache.beehive.wsm.util.TypeUtils;
import org.apache.beehive.wsm.axis.databinding.AxisBindingLookupFactory;
+import org.apache.beehive.wsm.axis.xmlbeans.XmlBeanSerializerFactory;
+import org.apache.beehive.wsm.axis.xmlbeans.XmlBeanDeserializerFactory;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.xmlbeans.XmlBeans;
Modified: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java?rev=413373&r1=413372&r2=413373&view=diff
==============================================================================
--- beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/util/WsmServiceFactory.java Sat Jun 10 15:40:56 2006
@@ -22,7 +22,7 @@
import org.apache.beehive.wsm.util.WsmddUtils;
/**
- * Factory used to create {@link WsmService} objects. This factory canb be used to plug-in
+ * Factory used to create {@link WsmService} objects. This factory can be used to plug-in
* implementations that can convert a path to a service description into a {@link WsmService}
* object model.
*/
@@ -49,7 +49,8 @@
}
finally {
if(inputStream != null)
- try{inputStream.close();}catch(IOException ignore) {}
+ try{inputStream.close();}
+ catch(IOException ignore) {}
}
return wsmService;
Copied: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializer.java (from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializer.java?p2=beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializer.java&p1=beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java&r1=413044&r2=413373&rev=413373&view=diff
==============================================================================
--- beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializer.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializer.java Sat Jun 10 15:40:56 2006
@@ -19,7 +19,10 @@
*
* Original author: Jonathan Colwell
*/
-package org.apache.beehive.webservice.utils.encoding;
+package org.apache.beehive.wsm.axis.xmlbeans;
+
+import javax.xml.namespace.QName;
+import java.util.HashMap;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
@@ -31,16 +34,13 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import javax.xml.namespace.QName;
-import java.util.HashMap;
-
/**
* Custom deserializer for XMLBeans. AXIS specific, used by WSM module and the service control.
*/
public class XmlBeanDeserializer extends DeserializerImpl
{
- private Class mJavaType;
- private QName mXmlType;
+ private Class _javaType;
+ private QName _xmlType;
/**
* Construct a new XmlBeanDeserializer.
@@ -49,8 +49,8 @@
*/
public XmlBeanDeserializer(Class javaType, QName xmlType)
{
- mJavaType = javaType;
- mXmlType = xmlType;
+ _javaType = javaType;
+ _xmlType = xmlType;
}
/**
@@ -74,7 +74,7 @@
MessageElement me = context.getCurElement();
- SchemaType st = (SchemaType) mJavaType.getField("type").get(null);
+ SchemaType st = (SchemaType) _javaType.getField("type").get(null);
XmlOptions opts = new XmlOptions().setLoadReplaceDocumentElement(null);
opts.setDocumentType(st);
@@ -83,7 +83,7 @@
// if this mis-match is detected, fix it with the following block of code
if (!isElementFormQualified(st)) {
HashMap<String, String> substituteNamespaces = new HashMap<String, String>();
- substituteNamespaces.put(mXmlType.getNamespaceURI(), "");
+ substituteNamespaces.put(_xmlType.getNamespaceURI(), "");
opts.setLoadSubstituteNamespaces(substituteNamespaces);
}
Copied: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializerFactory.java (from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializerFactory.java?p2=beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializerFactory.java&p1=beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java&r1=413044&r2=413373&rev=413373&view=diff
==============================================================================
--- beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanDeserializerFactory.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanDeserializerFactory.java Sat Jun 10 15:40:56 2006
@@ -1,6 +1,4 @@
/*
- * XmlBeanDeserializerFactory.java
- *
* Copyright 2001-2004 The Apache Software Foundation.
*
*
@@ -15,11 +13,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- *
- * Original author: Jonathan Colwell
+ *
*/
-package org.apache.beehive.webservice.utils.encoding;
+package org.apache.beehive.wsm.axis.xmlbeans;
import javax.xml.namespace.QName;
@@ -32,6 +28,6 @@
extends BaseDeserializerFactory {
public XmlBeanDeserializerFactory(Class javaType, QName xmlType) {
- super(org.apache.beehive.webservice.utils.encoding.XmlBeanDeserializer.class, xmlType, javaType);
+ super(XmlBeanDeserializer.class, xmlType, javaType);
}
}
Copied: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializer.java (from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializer.java?p2=beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializer.java&p1=beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java&r1=413044&r2=413373&rev=413373&view=diff
==============================================================================
--- beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializer.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializer.java Sat Jun 10 15:40:56 2006
@@ -1,7 +1,5 @@
/*
- * XmlBeanSerializer.java
- *
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.beehive.webservice.utils.encoding;
+package org.apache.beehive.wsm.axis.xmlbeans;
import java.io.IOException;
import java.util.HashSet;
@@ -160,7 +158,6 @@
writeSchema(nxtJavaType, types);
}
}
- return;
}
/**
@@ -208,6 +205,5 @@
else if(e.isSetRef())
dependentTypes.add(e.getRef());
}
- return;
}
}
Copied: beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializerFactory.java (from r413044, beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializerFactory.java?p2=beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializerFactory.java&p1=beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java&r1=413044&r2=413373&rev=413373&view=diff
==============================================================================
--- beehive/wsm/trunk/src/webservice-utils/xmlbeans/org/apache/beehive/webservice/utils/encoding/XmlBeanSerializerFactory.java (original)
+++ beehive/wsm/trunk/src/axis/org/apache/beehive/wsm/axis/xmlbeans/XmlBeanSerializerFactory.java Sat Jun 10 15:40:56 2006
@@ -1,7 +1,5 @@
/*
- * XmlBeanSerializerFactory.java
- *
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,25 +13,18 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- *
- * Original author: Jonathan Colwell
+ *
*/
-package org.apache.beehive.webservice.utils.encoding;
+package org.apache.beehive.wsm.axis.xmlbeans;
import javax.xml.namespace.QName;
import org.apache.axis.encoding.ser.BaseSerializerFactory;
-/**
- * ****************************************************************************
- *
- * @author Jonathan Colwell
- */
public class XmlBeanSerializerFactory
extends BaseSerializerFactory {
public XmlBeanSerializerFactory(Class javaType, QName xmlType) {
- super(org.apache.beehive.webservice.utils.encoding.XmlBeanSerializer.class, xmlType, javaType);
+ super(XmlBeanSerializer.class, xmlType, javaType);
}
}