Author: veithen
Date: Sun Sep 30 08:19:09 2012
New Revision: 1391964
URL: http://svn.apache.org/viewvc?rev=1391964&view=rev
Log:
Migrated test/wsdl/qnameser to the Maven build. Also renamed the test service
from PlanWS to PlanWS2 to avoid conflict with a service deployed by another
test.
Added:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/PlanService.java
- copied unchanged from r1391765,
axis/axis1/java/trunk/test/wsdl/qnameser/PlanService.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/QNameSerTestCase.java
- copied, changed from r1391765,
axis/axis1/java/trunk/test/wsdl/qnameser/QNameSerTestCase.java
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/qnameser/
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/qnameser/server-deploy.wsdd
- copied, changed from r1391765,
axis/axis1/java/trunk/test/wsdl/qnameser/server-deploy.wsdd
axis/axis1/java/trunk/integration/src/test/wsdl/qnameser/
axis/axis1/java/trunk/integration/src/test/wsdl/qnameser/extension.wsdl
- copied, changed from r1391765,
axis/axis1/java/trunk/test/wsdl/qnameser/extension.wsdl
Removed:
axis/axis1/java/trunk/test/wsdl/qnameser/
Modified:
axis/axis1/java/trunk/integration/pom.xml
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1391964&r1=1391963&r2=1391964&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sun Sep 30 08:19:09 2012
@@ -943,6 +943,24 @@
<implementation>true</implementation>
</configuration>
</execution>
+ <execution>
+ <id>qnameser</id>
+ <goals>
+ <goal>generate-test-sources</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/qnameser/extension.wsdl</file>
+ <generate>client</generate>
+ <noWrapped>true</noWrapped>
+ <wrapArrays>true</wrapArrays>
+ <mappings>
+ <mapping>
+ <namespace>http://tempuri.org/</namespace>
+ <package>test.wsdl.qnameser</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
<!-- This tests polymorphism of return values -->
<execution>
<id>polymorphism</id>
@@ -1298,6 +1316,7 @@
<directory>src/test/wsdd</directory>
<includes>
<include>**/deploy.wsdd</include>
+
<include>**/server-deploy.wsdd</include>
</includes>
</wsdd>
<wsdd>
Copied:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/QNameSerTestCase.java
(from r1391765, axis/axis1/java/trunk/test/wsdl/qnameser/QNameSerTestCase.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/QNameSerTestCase.java?p2=axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/QNameSerTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/qnameser/QNameSerTestCase.java&r1=1391765&r2=1391964&rev=1391964&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/qnameser/QNameSerTestCase.java (original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/qnameser/QNameSerTestCase.java
Sun Sep 30 08:19:09 2012
@@ -1,18 +1,8 @@
package test.wsdl.qnameser;
-import org.apache.axis.client.AdminClient;
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.message.MessageElement;
-import org.apache.axis.message.Text;
-import org.apache.axis.utils.Options;
-import org.apache.commons.logging.Log;
-import org.apache.log4j.Logger;
-
import javax.xml.namespace.QName;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.Calendar;
+
+import test.HttpTestUtil;
public class QNameSerTestCase extends junit.framework.TestCase {
@@ -23,9 +13,8 @@ public class QNameSerTestCase extends ju
public void testQName() throws Exception {
PlanWSSoap binding;
try {
- PlanWSLocator locator = new PlanWSLocator();
- binding = locator.getPlanWSSoap();
- deployServer();
+ PlanWS2Locator locator = new PlanWS2Locator();
+ binding =
locator.getPlanWS2Soap(HttpTestUtil.getTestEndpoint(locator.getPlanWS2SoapAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre);
@@ -44,9 +33,8 @@ public class QNameSerTestCase extends ju
public void testQNameList() throws Exception {
PlanWSSoap binding;
try {
- PlanWSLocator locator = new PlanWSLocator();
- binding = locator.getPlanWSSoap();
- deployServer();
+ PlanWS2Locator locator = new PlanWS2Locator();
+ binding =
locator.getPlanWS2Soap(HttpTestUtil.getTestEndpoint(locator.getPlanWS2SoapAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre);
@@ -61,29 +49,5 @@ public class QNameSerTestCase extends ju
GetMPlan in = new GetMPlan(list);
binding.getMPlan(in);
}
-
- private void deployServer() {
- final String INPUT_FILE = "server-deploy.wsdd";
-
- InputStream is = getClass().getResourceAsStream(INPUT_FILE);
- if (is == null) {
- // try current directory
- try {
- is = new FileInputStream(INPUT_FILE);
- } catch (FileNotFoundException e) {
- is = null;
- }
- }
- assertNotNull("Unable to find " + INPUT_FILE + ". Make sure it is on
the classpath or in the current directory.", is);
- AdminClient admin = new AdminClient();
- try {
- Options opts = new Options( null );
-
opts.setDefaultURL("http://localhost:8080/axis/services/AdminService";);
- admin.process(opts, is);
- } catch (Exception e) {
- assertTrue("Unable to deploy " + INPUT_FILE + ". ERROR: " + e,
false);
- }
- }
-
}
Copied:
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/qnameser/server-deploy.wsdd
(from r1391765, axis/axis1/java/trunk/test/wsdl/qnameser/server-deploy.wsdd)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/qnameser/server-deploy.wsdd?p2=axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/qnameser/server-deploy.wsdd&p1=axis/axis1/java/trunk/test/wsdl/qnameser/server-deploy.wsdd&r1=1391765&r2=1391964&rev=1391964&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/qnameser/server-deploy.wsdd (original)
+++
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/qnameser/server-deploy.wsdd
Sun Sep 30 08:19:09 2012
@@ -12,10 +12,10 @@
<!-- Services from PlanWS WSDL service -->
- <service name="PlanWSSoap" provider="java:RPC" style="document"
use="literal">
+ <service name="PlanWS2Soap" provider="java:RPC" style="document"
use="literal">
<parameter name="wsdlTargetNamespace" value="http://tempuri.org/"/>
- <parameter name="wsdlServiceElement" value="PlanWS"/>
- <parameter name="wsdlServicePort" value="PlanWSSoap"/>
+ <parameter name="wsdlServiceElement" value="PlanWS2"/>
+ <parameter name="wsdlServicePort" value="PlanWS2Soap"/>
<parameter name="className" value="test.wsdl.qnameser.PlanService"/>
<parameter name="wsdlPortType" value="PlanWSSoap"/>
<parameter name="allowedMethods" value="*"/>
Copied: axis/axis1/java/trunk/integration/src/test/wsdl/qnameser/extension.wsdl
(from r1391765, axis/axis1/java/trunk/test/wsdl/qnameser/extension.wsdl)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/wsdl/qnameser/extension.wsdl?p2=axis/axis1/java/trunk/integration/src/test/wsdl/qnameser/extension.wsdl&p1=axis/axis1/java/trunk/test/wsdl/qnameser/extension.wsdl&r1=1391765&r2=1391964&rev=1391964&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/qnameser/extension.wsdl (original)
+++ axis/axis1/java/trunk/integration/src/test/wsdl/qnameser/extension.wsdl Sun
Sep 30 08:19:09 2012
@@ -85,9 +85,9 @@ style="document" />
</operation>
</binding>
- <service name="PlanWS">
- <port name="PlanWSSoap" binding="s0:PlanWSSoap">
- <soap:address location="http://localhost:8080/axis/services/PlanWSSoap";
/>
+ <service name="PlanWS2">
+ <port name="PlanWS2Soap" binding="s0:PlanWSSoap">
+ <soap:address location="http://localhost:8080/axis/services/PlanWS2Soap";
/>
</port>
</service>
</definitions>
\ No newline at end of file
