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/12/21 03:58:57 UTC
svn commit: r358191 - in /beehive/trunk:
system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/
system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/utils/
system-controls/test/we...
Author: ekoneil
Date: Tue Dec 20 18:58:37 2005
New Revision: 358191
URL: http://svn.apache.org/viewcvs?rev=358191&view=rev
Log:
WSM work:
- add additional JSR-181 checks after taking another pass through the spec.
- move GenericHolder from wsm.databinding to wsm.util. Makes more sense there
- code cleanup in some WSM tests
BB: self
Test: WSM && WSC pass
Added:
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/GenericHolder.java (contents, props changed)
- copied, changed from r357770, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/GenericHolder.java
Removed:
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/GenericHolder.java
Modified:
beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/ParameterInfo.java
beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java
beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/holders/HolderUtilsTest.java
beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitBareWsdlTest.java
beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitWrapWsdlTest.java
beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromRpcLitWsdlTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcEncTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcLitTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerDocLitEndpointTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcEncEndpointTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcLitEndpointTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderDocLitEndpointTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcEncEndpointTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcLitEndpointTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java
beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/utils/ControlTestCase.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupStrategy.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java
beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java
Modified: beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/ParameterInfo.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/ParameterInfo.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/ParameterInfo.java (original)
+++ beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/generator/ParameterInfo.java Tue Dec 20 18:58:37 2005
@@ -126,6 +126,6 @@
return "javax.xml.rpc.holders.CalendarHolder";
else if (typeName.equals(QName.class.getName()))
return "javax.xml.rpc.holders.QNameHolder";
- else return "org.apache.beehive.wsm.databinding.GenericHolder<" + typeName + ">";
+ else return "org.apache.beehive.wsm.util.GenericHolder<" + typeName + ">";
}
}
Modified: beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java (original)
+++ beehive/trunk/system-controls/src/webservice/control/org/apache/beehive/controls/system/webservice/utils/TypeRegistrar.java Tue Dec 20 18:58:37 2005
@@ -34,7 +34,7 @@
import javax.xml.rpc.holders.Holder;
import org.apache.beehive.wsm.databinding.BindingLookupStrategy;
-import org.apache.beehive.wsm.databinding.GenericHolder;
+import org.apache.beehive.wsm.util.GenericHolder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/holders/HolderUtilsTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/holders/HolderUtilsTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/holders/HolderUtilsTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/holders/HolderUtilsTest.java Tue Dec 20 18:58:37 2005
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.beehive.controls.system.webservice.utils.HolderUtils;
-import org.apache.beehive.wsm.databinding.GenericHolder;
+import org.apache.beehive.wsm.util.GenericHolder;
import javax.xml.rpc.holders.IntHolder;
import javax.xml.rpc.holders.BigDecimalHolder;
Modified: beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitBareWsdlTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitBareWsdlTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitBareWsdlTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitBareWsdlTest.java Tue Dec 20 18:58:37 2005
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.beehive.controls.system.webservice.ServiceControl;
-import org.apache.beehive.wsm.databinding.GenericHolder;
+import org.apache.beehive.wsm.util.GenericHolder;
public class JcxGenFromDocLitBareWsdlTest
extends TestCase {
Modified: beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitWrapWsdlTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitWrapWsdlTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitWrapWsdlTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromDocLitWrapWsdlTest.java Tue Dec 20 18:58:37 2005
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.beehive.controls.system.webservice.ServiceControl;
-import org.apache.beehive.wsm.databinding.GenericHolder;
+import org.apache.beehive.wsm.util.GenericHolder;
import javax.xml.rpc.holders.IntHolder;
import java.lang.reflect.Method;
Modified: beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromRpcLitWsdlTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromRpcLitWsdlTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromRpcLitWsdlTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/junit/src/org/apache/beehive/controls/system/webservice/tests/jcxgen/JcxGenFromRpcLitWsdlTest.java Tue Dec 20 18:58:37 2005
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.beehive.controls.system.webservice.ServiceControl;
-import org.apache.beehive.wsm.databinding.GenericHolder;
+import org.apache.beehive.wsm.util.GenericHolder;
import javax.xml.rpc.holders.IntHolder;
import java.lang.reflect.Method;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcEncTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcEncTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcEncTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcEncTest.java Tue Dec 20 18:58:37 2005
@@ -15,17 +15,18 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Component;
+import java.awt.Toolkit;
+import javax.activation.DataHandler;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import javax.activation.DataHandler;
-import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-
public class DataHandlerAttachementRpcEncTest
extends ControlTestCase {
@@ -121,7 +122,6 @@
super.setUp();
initializeControls(this);
setMyControlObject(client);
-
}
catch (Exception e) {
e.printStackTrace();
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcLitTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcLitTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcLitTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/DataHandlerAttachementRpcLitTest.java Tue Dec 20 18:58:37 2005
@@ -15,16 +15,18 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.awt.MediaTracker;
+import java.awt.Component;
+import java.awt.Image;
+import java.awt.Toolkit;
+import javax.activation.DataHandler;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-
-import javax.activation.DataHandler;
-import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
public class DataHandlerAttachementRpcLitTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerDocLitEndpointTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerDocLitEndpointTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerDocLitEndpointTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerDocLitEndpointTest.java Tue Dec 20 18:58:37 2005
@@ -17,26 +17,19 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import javax.xml.rpc.holders.IntHolder;
+import javax.xml.rpc.holders.StringHolder;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.beehive.wsm.databinding.GenericHolder;
-import org.apache.log4j.Logger;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import test.HandlerDocLitEndpointService;
-import javax.xml.rpc.holders.IntHolder;
-import javax.xml.rpc.holders.StringHolder;
-
public class HandlerDocLitEndpointTest
extends ControlTestCase {
-
- private static Log LOGGER = LogFactory.getLog(HandlerDocLitEndpointTest.class);
@Control
public HandlerDocLitEndpointService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcEncEndpointTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcEncEndpointTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcEncEndpointTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcEncEndpointTest.java Tue Dec 20 18:58:37 2005
@@ -24,8 +24,6 @@
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
@@ -34,8 +32,6 @@
public class HandlerRpcEncEndpointTest
extends ControlTestCase {
-
- private static Log LOGGER = LogFactory.getLog(HandlerRpcEncEndpointTest.class);
@Control
public HandlerRpcEncEndpointService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcLitEndpointTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcLitEndpointTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcLitEndpointTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HandlerRpcLitEndpointTest.java Tue Dec 20 18:58:37 2005
@@ -22,11 +22,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
@@ -35,8 +32,6 @@
public class HandlerRpcLitEndpointTest
extends ControlTestCase {
-
- private static Log LOGGER = LogFactory.getLog(HandlerRpcLitEndpointTest.class);
@Control
public HandlerRpcLitEndpointService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderDocLitEndpointTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderDocLitEndpointTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderDocLitEndpointTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderDocLitEndpointTest.java Tue Dec 20 18:58:37 2005
@@ -17,19 +17,17 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import javax.xml.rpc.holders.IntHolder;
+import javax.xml.rpc.holders.StringHolder;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.beehive.wsm.databinding.GenericHolder;
-import org.apache.log4j.Logger;
+import org.apache.beehive.wsm.util.GenericHolder;
import test.HeaderDocLitEndpointService;
-import javax.xml.rpc.holders.IntHolder;
-import javax.xml.rpc.holders.StringHolder;
-
-public class HeaderDocLitEndpointTest extends ControlTestCase {
- static Logger logger = Logger.getLogger(HeaderDocLitEndpointTest.class);
+public class HeaderDocLitEndpointTest
+ extends ControlTestCase {
@Control
public HeaderDocLitEndpointService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcEncEndpointTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcEncEndpointTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcEncEndpointTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcEncEndpointTest.java Tue Dec 20 18:58:37 2005
@@ -23,7 +23,7 @@
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.beehive.wsm.databinding.GenericHolder;
+import org.apache.beehive.wsm.util.GenericHolder;
import test.HeaderRpcLitEndpointService;
public class HeaderRpcEncEndpointTest extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcLitEndpointTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcLitEndpointTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcLitEndpointTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/HeaderRpcLitEndpointTest.java Tue Dec 20 18:58:37 2005
@@ -17,19 +17,17 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import javax.xml.rpc.holders.IntHolder;
+import javax.xml.rpc.holders.StringHolder;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.beehive.wsm.databinding.GenericHolder;
-import org.apache.log4j.Logger;
+import org.apache.beehive.wsm.util.GenericHolder;
import test.HeaderRpcLitEndpointService;
-import javax.xml.rpc.holders.IntHolder;
-import javax.xml.rpc.holders.StringHolder;
-
-public class HeaderRpcLitEndpointTest extends ControlTestCase {
- static Logger logger = Logger.getLogger(HeaderRpcLitEndpointTest.class);
+public class HeaderRpcLitEndpointTest
+ extends ControlTestCase {
@Control
public HeaderRpcLitEndpointService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementDocLitWrappedTest.java Tue Dec 20 18:58:37 2005
@@ -15,19 +15,13 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import java.awt.Image;
+
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import test.SoapMarshallingDocLitWrappedService;
-
-import javax.xml.namespace.QName;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.awt.*;
-
public class ImageAttachementDocLitWrappedTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcEncTest.java Tue Dec 20 18:58:37 2005
@@ -15,19 +15,13 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import java.awt.Image;
+
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import test.SoapMarshallingDocLitWrappedService;
-
-import javax.xml.namespace.QName;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.awt.*;
-
public class ImageAttachementRpcEncTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/ImageAttachementRpcLitTest.java Tue Dec 20 18:58:37 2005
@@ -15,19 +15,13 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import java.awt.Image;
+
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import test.SoapMarshallingDocLitWrappedService;
-
-import javax.xml.namespace.QName;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.awt.*;
-
public class ImageAttachementRpcLitTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/RpcLitWebServiceTest.java Tue Dec 20 18:58:37 2005
@@ -23,12 +23,10 @@
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.beehive.wsm.databinding.GenericHolder;
-import org.apache.log4j.Logger;
+import org.apache.beehive.wsm.util.GenericHolder;
import test.RpcLiteralSampleService;
public class RpcLitWebServiceTest extends ControlTestCase {
- static Logger logger = Logger.getLogger(RpcLitWebServiceTest.class);
@Control
public RpcLiteralSampleService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java Tue Dec 20 18:58:37 2005
@@ -16,21 +16,22 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import test.SoapMarshallingDocLitBareArrayTypesService;
-
-import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.GregorianCalendar;
import java.util.Calendar;
+import javax.xml.namespace.QName;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import test.SoapMarshallingDocLitBareArrayTypesService;
public class SoapMarshallingDocLitBareArrayTypesTest
extends ControlTestCase {
+
@Control
public SoapMarshallingDocLitBareArrayTypesService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java Tue Dec 20 18:58:37 2005
@@ -16,114 +16,115 @@
*/
package org.apache.beehive.controls.system.webservice.units;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import javax.xml.namespace.QName;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
import test.SoapMarshallingDocLitBareService;
-import javax.xml.namespace.QName;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
public class SoapMarshallingDocLitBareTest
- extends ControlTestCase {
+ extends ControlTestCase {
@Control
public SoapMarshallingDocLitBareService client;
- public void testEchoboolean() throws Exception {
- assertFalse(client.echoboolean(false));
- assertTrue(client.echoboolean(true));
- }
-
- public void testEchoBoolean() throws Exception {
- assertFalse(client.echoBoolean(new Boolean(false)));
- assertTrue(client.echoBoolean(new Boolean(true)));
- }
-
- public void testEchobyte() throws Exception {
- assertEquals(1, client.echobyte((byte) 1));
- }
-
- public void testEchoByte() throws Exception {
- assertEquals(Byte.MAX_VALUE, client.echoByte(Byte.MAX_VALUE));
- }
-
- public void testEchoshort() throws Exception {
- assertEquals(Short.MAX_VALUE, client.echoshort(Short.MAX_VALUE));
- }
-
- public void testEchoShort() throws Exception {
- assertEquals(Short.MAX_VALUE, client.echoShort(Short.MAX_VALUE));
- }
-
- public void testEchoint() throws Exception {
- assertEquals(Integer.MAX_VALUE, client.echoint(Integer.MAX_VALUE));
- }
-
- public void testEchoInteger() throws Exception {
- assertEquals(Integer.MAX_VALUE, client.echoInteger(Integer.MAX_VALUE));
- }
-
- public void testEcholong() throws Exception {
- assertEquals(Long.MAX_VALUE, client.echolong(Long.MAX_VALUE));
- }
-
- public void testEchoLong() throws Exception {
- assertEquals(Long.MAX_VALUE, client.echoLong(Long.MAX_VALUE));
- }
-
- public void testEchoBigInteger() throws Exception {
- assertEquals(BigInteger.TEN, client.echoBigInteger(BigInteger.TEN));
- }
-
- public void testEchofloat() throws Exception {
- assertEquals(Float.MAX_VALUE, client.echofloat(Float.MAX_VALUE));
- }
-
- public void testEchoFloat() throws Exception {
- assertEquals(Float.MAX_VALUE, client.echoFloat(Float.MAX_VALUE));
- }
-
- public void testEchodouble() throws Exception {
- assertEquals(Double.MAX_VALUE, client.echodouble(Double.MAX_VALUE));
- }
-
- public void testEchoDouble() throws Exception {
- assertEquals(Double.MAX_VALUE, client.echoDouble(Double.MAX_VALUE));
- }
-
- public void testEchoBigDecimal() throws Exception {
- assertEquals(BigDecimal.TEN, client.echoBigDecimal(BigDecimal.TEN));
- }
-
- public void testEchoString() throws Exception {
- assertEquals("Hello World!", client.echoString("Hello World!"));
- }
-
- public void testEchoDate() throws Exception {
- Calendar cal = new GregorianCalendar();
- cal.setTimeInMillis(123456789);
- Calendar result = client.echoDate(cal);
- assertEquals(0, cal.compareTo(result));
- }
-
- public void testEchoCalendar() throws Exception {
- Calendar cal = new GregorianCalendar();
- cal.setTimeInMillis(123456789);
- Calendar result = client.echoCalendar(cal);
- assertEquals(0, cal.compareTo(result));
- }
-
- public void testEchoQName() throws Exception {
- QName qname = new QName("http://foo.bar", "foofoo");
- assertEquals(qname.toString(), client.echoQName(qname).toString());
- }
+ public void testEchoboolean() throws Exception {
+ assertFalse(client.echoboolean(false));
+ assertTrue(client.echoboolean(true));
+ }
+
+ public void testEchoBoolean() throws Exception {
+ assertFalse(client.echoBoolean(new Boolean(false)));
+ assertTrue(client.echoBoolean(new Boolean(true)));
+ }
+
+ public void testEchobyte() throws Exception {
+ assertEquals(1, client.echobyte((byte) 1));
+ }
+
+ public void testEchoByte() throws Exception {
+ assertEquals(Byte.MAX_VALUE, client.echoByte(Byte.MAX_VALUE));
+ }
+
+ public void testEchoshort() throws Exception {
+ assertEquals(Short.MAX_VALUE, client.echoshort(Short.MAX_VALUE));
+ }
+
+ public void testEchoShort() throws Exception {
+ assertEquals(Short.MAX_VALUE, client.echoShort(Short.MAX_VALUE));
+ }
+
+ public void testEchoint() throws Exception {
+ assertEquals(Integer.MAX_VALUE, client.echoint(Integer.MAX_VALUE));
+ }
+
+ public void testEchoInteger() throws Exception {
+ assertEquals(Integer.MAX_VALUE, client.echoInteger(Integer.MAX_VALUE));
+ }
+
+ public void testEcholong() throws Exception {
+ assertEquals(Long.MAX_VALUE, client.echolong(Long.MAX_VALUE));
+ }
+
+ public void testEchoLong() throws Exception {
+ assertEquals(Long.MAX_VALUE, client.echoLong(Long.MAX_VALUE));
+ }
+
+ public void testEchoBigInteger() throws Exception {
+ assertEquals(BigInteger.TEN, client.echoBigInteger(BigInteger.TEN));
+ }
+
+ public void testEchofloat() throws Exception {
+ assertEquals(Float.MAX_VALUE, client.echofloat(Float.MAX_VALUE));
+ }
+
+ public void testEchoFloat() throws Exception {
+ assertEquals(Float.MAX_VALUE, client.echoFloat(Float.MAX_VALUE));
+ }
+
+ public void testEchodouble() throws Exception {
+ assertEquals(Double.MAX_VALUE, client.echodouble(Double.MAX_VALUE));
+ }
+
+ public void testEchoDouble() throws Exception {
+ assertEquals(Double.MAX_VALUE, client.echoDouble(Double.MAX_VALUE));
+ }
+
+ public void testEchoBigDecimal() throws Exception {
+ assertEquals(BigDecimal.TEN, client.echoBigDecimal(BigDecimal.TEN));
+ }
+
+ public void testEchoString() throws Exception {
+ assertEquals("Hello World!", client.echoString("Hello World!"));
+ }
+
+ public void testEchoDate() throws Exception {
+ Calendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(123456789);
+ Calendar result = client.echoDate(cal);
+ assertEquals(0, cal.compareTo(result));
+ }
+
+ public void testEchoCalendar() throws Exception {
+ Calendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(123456789);
+ Calendar result = client.echoCalendar(cal);
+ assertEquals(0, cal.compareTo(result));
+ }
+
+ public void testEchoQName() throws Exception {
+ QName qname = new QName("http://foo.bar", "foofoo");
+ assertEquals(qname.toString(), client.echoQName(qname).toString());
+ }
- public void setUp() throws Exception {
+ public void setUp()
+ throws Exception {
try {
super.setUp();
initializeControls(this);
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java Tue Dec 20 18:58:37 2005
@@ -17,18 +17,18 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import test.SoapMarshallingDocLitWrappedArrayTypesService;
-
-import javax.xml.namespace.QName;
import java.math.BigInteger;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Arrays;
+import javax.xml.namespace.QName;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import test.SoapMarshallingDocLitWrappedArrayTypesService;
public class SoapMarshallingDocLitWrappedArrayTypesTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java Tue Dec 20 18:58:37 2005
@@ -15,18 +15,17 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import test.SoapMarshallingDocLitWrappedService;
-
-import javax.xml.namespace.QName;
import java.math.BigInteger;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import javax.xml.namespace.QName;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import test.SoapMarshallingDocLitWrappedService;
public class SoapMarshallingDocLitWrappedTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncArrayTypesTest.java Tue Dec 20 18:58:37 2005
@@ -16,21 +16,22 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import test.SoapMarshallingRpcEncArrayTypesService;
-
-import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import javax.xml.namespace.QName;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import test.SoapMarshallingRpcEncArrayTypesService;
public class SoapMarshallingRpcEncArrayTypesTest
- extends ControlTestCase {
+ extends ControlTestCase {
+
@Control
public SoapMarshallingRpcEncArrayTypesService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcEncTest.java Tue Dec 20 18:58:37 2005
@@ -15,21 +15,21 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import test.SoapMarshallingRpcEncService;
-
-import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.GregorianCalendar;
import java.util.Calendar;
+import javax.xml.namespace.QName;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import test.SoapMarshallingRpcEncService;
public class SoapMarshallingRpcEncTest
- extends ControlTestCase {
+ extends ControlTestCase {
+
@Control
public SoapMarshallingRpcEncService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitArrayTypesTest.java Tue Dec 20 18:58:37 2005
@@ -16,21 +16,21 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import test.SoapMarshallingRpcLitArrayTypesService;
-
-import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
+import test.SoapMarshallingRpcLitArrayTypesService;
+
public class SoapMarshallingRpcLitArrayTypesTest
- extends ControlTestCase {
+ extends ControlTestCase {
+
@Control
public SoapMarshallingRpcLitArrayTypesService client;
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingRpcLitTest.java Tue Dec 20 18:58:37 2005
@@ -15,19 +15,17 @@
*/
package org.apache.beehive.controls.system.webservice.units;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import javax.xml.namespace.QName;
import java.math.BigInteger;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
import test.SoapMarshallingRpcLitService;
-
public class SoapMarshallingRpcLitTest
extends ControlTestCase {
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/DocLitWrapWebServiceTest.java Tue Dec 20 18:58:37 2005
@@ -23,17 +23,15 @@
import junit.framework.TestSuite;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.system.webservice.units.utils.ControlTestCase;
-import org.apache.beehive.wsm.databinding.GenericHolder;
-import org.apache.log4j.Logger;
+import org.apache.beehive.wsm.util.GenericHolder;
import org.apache.axis.AxisFault;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import test.DocumentLiteralWrappedSampleService;
-public class DocLitWrapWebServiceTest extends ControlTestCase {
-
- private static Logger logger = Logger.getLogger(DocLitWrapWebServiceTest.class);
+public class DocLitWrapWebServiceTest
+ extends ControlTestCase {
@Control
public DocumentLiteralWrappedSampleService client;
@@ -44,7 +42,6 @@
assertEquals(111, phones[0].getAreaCode());
assertEquals(222, phones[1].getAreaCode());
-
}
public void testReturnAddressFromBody() throws Exception {
@@ -204,7 +201,8 @@
fail("Expected ComplexAddressException to be thrown!");
}
- public void setUp() throws Exception {
+ public void setUp()
+ throws Exception {
try {
super.setUp();
initializeControls(this);
Modified: beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/utils/ControlTestCase.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/utils/ControlTestCase.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/utils/ControlTestCase.java (original)
+++ beehive/trunk/system-controls/test/webservice/webapp/tests/org/apache/beehive/controls/system/webservice/units/utils/ControlTestCase.java Tue Dec 20 18:58:37 2005
@@ -31,15 +31,14 @@
import org.apache.beehive.controls.api.context.ControlContainerContext;
import org.apache.beehive.controls.api.context.ControlThreadContext;
-public abstract class ControlTestCase extends TestCase {
+public abstract class ControlTestCase
+ extends TestCase {
-
protected void setMyControlObject(Object obj) {
beanContext.setBaseObjectToLoadFrom(obj);
}
public void setUp() throws Exception {
-
try {
beanContext.beginContext();
} catch (Exception e) {
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupStrategy.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupStrategy.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupStrategy.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanLookupStrategy.java Tue Dec 20 18:58:37 2005
@@ -99,7 +99,7 @@
private Class scanDeclaredMethodsForViableReturnType(Method[] declared) {
/*
- todo: Does this make sense? IT looks as if the type of the class is determined based
+ todo: does this make sense? IT looks as if the type of the class is determined based
on the method return types.
*/
for(Method meth : declared) {
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/processor/checker/Jsr181AnnotationChecker.java Tue Dec 20 18:58:37 2005
@@ -169,6 +169,11 @@
return;
String endpointInterface = wsAnnotation.endpointInterface();
+ /*
+ The service implementation is bound to the contract specified in the service interface. Thus,
+ there are annotation values that are explicitly disallowed on the implementation in order to
+ avoid conflict between the implementation and interface.
+ */
if(!endpointInterface.equals("")) {
if(!wsAnnotation.name().equals(""))
@@ -239,6 +244,13 @@
if(!intfDecl.getModifiers().contains(Modifier.PUBLIC))
_messager.printError("Service endpoint interface must be public");
+ WebService wsAnnot = intfDecl.getAnnotation(WebService.class);
+ if(!"".equals(wsAnnot.serviceName()))
+ _messager.printError("Service endpoint interface can not use the @WebService's serviceName attribute");
+
+ if(!"".equals(wsAnnot.endpointInterface()))
+ _messager.printError("Service endpoint interface can not use the @WebService's endpointInterface attribute");
+
/* todo: handle @WebMethod annotations for customizing the mapping to a WSDL */
}
@@ -301,16 +313,27 @@
for(ParameterDeclaration paramDecl : params) {
WebParam webParam = paramDecl.getAnnotation(WebParam.class);
- if(webParam != null && !webParam.header() && (webParam.mode() == WebParam.Mode.INOUT || webParam.mode() == WebParam.Mode.OUT))
- _messager.printError("Document style operation \"" + methodDecl.getSimpleName() + "\" must not have a non-header OUT or INOUT parameter.");
+
+ SOAPBinding soapBindingAnnot = methodDecl.getDeclaringType().getAnnotation(SOAPBinding.class);
+ boolean isDocumentStyle = soapBindingAnnot == null || soapBindingAnnot.style() == SOAPBinding.Style.DOCUMENT;
+ /* handle document services */
+ if(isDocumentStyle) {
+ if(webParam != null && !webParam.header() && (webParam.mode() == WebParam.Mode.INOUT || webParam.mode() == WebParam.Mode.OUT))
+ _messager.printError("Document style operation \"" + methodDecl.getSimpleName() + "\" must not have a non-header " + webParam.mode().toString() + " parameter.");
+ }
+ /* handle RPC services */
+ else {
+ /* no-op -- IN, INOUT, and OUT parameters are supported in RPC style services */
+ }
}
- //todo: another check in 6.1.2.2 about the uniqueness of XML elements
+
+ /* todo: another check in 6.1.2.2 about the uniqueness of XML elements? */
}
}
- /* todo: need to compost this up into a base class so that it can be reused across
- the mirror, XMLBean, and reflection based ways of constructing JSR-181
- compliant services
+ /*
+ todo: need to compost this up into a base class so that it can be reused across
+ the mirror, XMLBean, and reflection based ways of constructing JSR-181 compliant services
*/
private void validateWsdlContract(TypeDeclaration typeDeclaration, URL wsdlLocation) {
Copied: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/GenericHolder.java (from r357770, beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/GenericHolder.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/GenericHolder.java?p2=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/GenericHolder.java&p1=beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/GenericHolder.java&r1=357770&r2=358191&rev=358191&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/databinding/GenericHolder.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/GenericHolder.java Tue Dec 20 18:58:37 2005
@@ -17,7 +17,7 @@
*
*
*/
-package org.apache.beehive.wsm.databinding;
+package org.apache.beehive.wsm.util;
import javax.xml.rpc.holders.Holder;
Propchange: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/GenericHolder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java?rev=358191&r1=358190&r2=358191&view=diff
==============================================================================
--- beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java (original)
+++ beehive/trunk/wsm/src/core/org/apache/beehive/wsm/util/TypeUtils.java Tue Dec 20 18:58:37 2005
@@ -25,8 +25,6 @@
import javax.xml.rpc.holders.Holder;
-import org.apache.beehive.wsm.databinding.GenericHolder;
-
/**
*
*/