You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/01/05 19:50:26 UTC
svn commit: r1820348 [1/3] - in
/axis/axis2/java/core/branches/schema-validation: ./ apidocs/
databinding-tests/jaxbri-tests/
databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/
databinding-tests/jaxbri-tests/src/test/java/org/apache/...
Author: veithen
Date: Fri Jan 5 19:50:25 2018
New Revision: 1820348
URL: http://svn.apache.org/viewvc?rev=1820348&view=rev
Log:
Merge latest changes from trunk.
Added:
axis/axis2/java/core/branches/schema-validation/modules/jaxbri-codegen/
- copied from r1820347, axis/axis2/java/core/trunk/modules/jaxbri-codegen/
axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/src/test/java/
- copied from r1820347, axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/
axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/src/test/servicejars/
- copied from r1820347, axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/servicejars/
axis/axis2/java/core/branches/schema-validation/modules/kernel/src/org/apache/axis2/util/LogWriter.java
- copied unchanged from r1820347, axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
- copied unchanged from r1820347, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AxisServiceFactory.java
- copied unchanged from r1820347, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/AxisServiceFactory.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/Junit4ClassRunnerWithRuntimeIgnore.java
- copied unchanged from r1820347, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Junit4ClassRunnerWithRuntimeIgnore.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/SimpleAxisServiceFactory.java
- copied unchanged from r1820347, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/SimpleAxisServiceFactory.java
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Transport.java
- copied unchanged from r1820347, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Transport.java
axis/axis2/java/core/branches/schema-validation/modules/xmlbeans-codegen/
- copied from r1820347, axis/axis2/java/core/trunk/modules/xmlbeans-codegen/
Removed:
axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/repo/
axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/repo/
axis/axis2/java/core/branches/schema-validation/modules/integration/conf/
axis/axis2/java/core/branches/schema-validation/modules/integration/test-resources/xsd/type-test.xsd
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/om/OMAttributeTest.java
axis/axis2/java/core/branches/schema-validation/modules/jaxbri/
axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/test/
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/UtilServer.java
axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XSDConfig.java
axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/
Modified:
axis/axis2/java/core/branches/schema-validation/ (props changed)
axis/axis2/java/core/branches/schema-validation/apidocs/pom.xml
axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
axis/axis2/java/core/branches/schema-validation/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java
axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java
axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java
axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
axis/axis2/java/core/branches/schema-validation/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
axis/axis2/java/core/branches/schema-validation/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
axis/axis2/java/core/branches/schema-validation/modules/distribution/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/integration/itest-build.xml
axis/axis2/java/core/branches/schema-validation/modules/integration/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ServiceClientTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServer.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java
axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java
axis/axis2/java/core/branches/schema-validation/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/jibx/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
axis/axis2/java/core/branches/schema-validation/modules/json/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/kernel/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
axis/axis2/java/core/branches/schema-validation/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java
axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
axis/axis2/java/core/branches/schema-validation/modules/webapp/pom.xml
axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/pom.xml
axis/axis2/java/core/branches/schema-validation/pom.xml
axis/axis2/java/core/branches/schema-validation/src/site/markdown/release-notes/1.8.0.md
Propchange: axis/axis2/java/core/branches/schema-validation/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 5 19:50:25 2018
@@ -3,4 +3,4 @@
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
/axis/axis2/java/core/branches/AXIS2-5785:1793298-1793391
/axis/axis2/java/core/branches/google-java-format:1800516-1800554
-/axis/axis2/java/core/trunk:1818704-1818748
+/axis/axis2/java/core/trunk:1818704-1820347
Modified: axis/axis2/java/core/branches/schema-validation/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/apidocs/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/apidocs/pom.xml (original)
+++ axis/axis2/java/core/branches/schema-validation/apidocs/pom.xml Fri Jan 5 19:50:25 2018
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/pom.xml Fri Jan 5 19:50:25 2018
@@ -30,12 +30,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-jaxbri</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -197,85 +191,104 @@
</dependencies>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>Test01-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/Test01</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/Test01/resources</directory>
- <targetPath>services/Test01.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.Test01Impl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>processor-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/processor</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/processor/resources</directory>
- <targetPath>services/processor.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.processor.ProcessorImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>identityservice-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/identityservice</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/identityservice/resources</directory>
- <targetPath>services/identityservice.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.identityservice.IdentityLinkingServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>mtom-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/mtom</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/mtom/resources</directory>
- <targetPath>services/mtom.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.mtom.MtomImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
+ <generatedAxis2xml>
+ <parameters>
+ <parameter>
+ <name>enableMTOM</name>
+ <value>true</value>
+ </parameter>
+ </parameters>
+ </generatedAxis2xml>
</configuration>
</execution>
</executions>
+ <configuration>
+ <generatedAxis2xml/>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java (original)
+++ axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java Fri Jan 5 19:50:25 2018
@@ -20,12 +20,8 @@ package org.apache.axis2.jaxbri;
import static org.junit.Assert.assertEquals;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.testutils.UtilServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
import org.junit.Test;
import com.foo.wsns.axis2.test01.Test01;
@@ -33,22 +29,12 @@ import com.foo.wsns.axis2.test01.Test01S
import com.foo.xmlns.axis2.test01.Add;
public class Test01Test {
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/Test01");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("Test01");
- service.getParameter(Constants.SERVICE_CLASS).setValue(Test01Impl.class.getName());
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/Test01");
@Test
public void test() throws Exception {
- Test01 stub = new Test01Stub(UtilServer.getConfigurationContext(), "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/Test01");
+ Test01 stub = new Test01Stub(server.getConfigurationContext(), server.getEndpoint("Test01"));
Add add = new Add();
add.setArg1(3);
add.setArg2(4);
Modified: axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java Fri Jan 5 19:50:25 2018
@@ -18,37 +18,21 @@
*/
package org.apache.axis2.jaxbri.identityservice;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.testutils.UtilServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
import org.junit.Test;
/**
* Regression test for AXIS2-4197.
*/
public class IdentityServiceTest {
- private static final String ENDPOINT = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/IdentityLinkingService";
-
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/identityservice");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("IdentityLinkingService");
- service.getParameter(Constants.SERVICE_CLASS).setValue(IdentityLinkingServiceImpl.class.getName());
- service.setScope(Constants.SCOPE_APPLICATION);
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/identityservice");
@Test
public void test() throws Exception {
- IdentityLinkingService stub = new IdentityLinkingServiceStub(UtilServer.getConfigurationContext(), ENDPOINT);
+ IdentityLinkingService stub = new IdentityLinkingServiceStub(
+ server.getConfigurationContext(), server.getEndpoint("IdentityLinkingService"));
LinkIdentitiesType linkIdentities = new LinkIdentitiesType();
linkIdentities.setOwningPlatform("test");
stub.createLinkedIdentities(linkIdentities);
Modified: axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java Fri Jan 5 19:50:25 2018
@@ -23,35 +23,17 @@ import javax.activation.DataSource;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.testutils.UtilServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
import org.junit.Test;
public class MtomTest {
- private static final String ENDPOINT = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/mtom";
-
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/mtom");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- axisConfiguration.getParameter(Constants.Configuration.ENABLE_MTOM).setValue(true);
- AxisService service = axisConfiguration.getService("mtom");
- service.getParameter(Constants.SERVICE_CLASS).setValue(MtomImpl.class.getName());
- service.setScope(Constants.SCOPE_APPLICATION);
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/mtom");
@Test
public void test() throws Exception {
- MtomStub stub = new MtomStub(UtilServer.getConfigurationContext(), ENDPOINT);
+ MtomStub stub = new MtomStub(server.getConfigurationContext(), server.getEndpoint("mtom"));
UploadDocument uploadRequest = new UploadDocument();
DataSource contentDS = new RandomDataSource(1234567L, 1024);
uploadRequest.setContent(new DataHandler(contentDS));
Modified: axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java Fri Jan 5 19:50:25 2018
@@ -29,20 +29,16 @@ import javax.xml.transform.dom.DOMResult
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jaxbri.processor.client.Processor;
import org.apache.axis2.jaxbri.processor.client.ProcessorStub;
import org.apache.axis2.jaxbri.processor.data.ReplyMessage;
import org.apache.axis2.jaxbri.processor.data.RequestMessage;
-import org.apache.axis2.testutils.UtilServer;
+import org.apache.axis2.testutils.Axis2Server;
import org.custommonkey.xmlunit.XMLAssert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -50,24 +46,12 @@ import org.w3c.dom.Document;
* Regression test for AXIS2-5147.
*/
public class ProcessorTest {
- private static final String ENDPOINT = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/Processor";
-
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/processor");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("Processor");
- service.getParameter(Constants.SERVICE_CLASS).setValue(ProcessorImpl.class.getName());
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/processor");
@Test
public void testStub() throws Exception {
- Processor stub = new ProcessorStub(UtilServer.getConfigurationContext(), ENDPOINT);
+ Processor stub = new ProcessorStub(server.getConfigurationContext(), server.getEndpoint("Processor"));
RequestMessage request = new RequestMessage();
request.setRequestID("A3TN39840");
request.setRequestData("DATA");
@@ -85,9 +69,9 @@ public class ProcessorTest {
InputStream in = ProcessorTest.class.getResourceAsStream("request.xml");
try {
OMElement request = OMXMLBuilderFactory.createOMBuilder(in).getDocumentElement();
- ServiceClient client = new ServiceClient(UtilServer.getConfigurationContext(), null);
+ ServiceClient client = new ServiceClient(server.getConfigurationContext(), null);
Options options = client.getOptions();
- options.setTo(new EndpointReference(ENDPOINT));
+ options.setTo(new EndpointReference(server.getEndpoint("Processor")));
try {
OMElement omResponse = client.sendReceive(request);
TransformerFactory.newInstance().newTransformer().transform(omResponse.getSAXSource(false), new DOMResult(response));
Modified: axis/axis2/java/core/branches/schema-validation/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/adb-tests/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/adb-tests/pom.xml Fri Jan 5 19:50:25 2018
@@ -44,12 +44,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -346,30 +340,19 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
- <phase>generate-test-resources</phase>
+ <id>client-repo</id>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/repo</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <outputDirectory>${project.build.directory}/repo/client</outputDirectory>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-repo-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
<execution>
<id>repo-axis2-5741</id>
<goals>
@@ -431,6 +414,9 @@
</configuration>
</execution>
</executions>
+ <configuration>
+ <generatedAxis2xml/>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java Fri Jan 5 19:50:25 2018
@@ -27,9 +27,14 @@ import org.apache.axis2.databinding.axis
import org.apache.axis2.databinding.axis2_5750.client.FixedValueServiceStub;
import org.apache.axis2.databinding.axis2_5750.client.NonFixedValue_type1;
import org.apache.axis2.databinding.axis2_5750.service.FixedValueServiceImpl;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
public class ServiceTest {
+ @ClassRule
+ public static final ClientHelper clientHelper = new ClientHelper("target/repo/client");
+
@Test
public void test() throws Exception {
int port = PortAllocator.allocatePort();
@@ -40,7 +45,7 @@ public class ServiceTest {
NonFixedValue_type1 nonFixedValue_type1 = new NonFixedValue_type1();
nonFixedValue_type1.setNonFixedValue_type0("SomeId");
fixedValue.setNonFixedValue(nonFixedValue_type1);
- FixedValueServiceStub stub = new FixedValueServiceStub(address);
+ FixedValueServiceStub stub = clientHelper.createStub(FixedValueServiceStub.class, address);
assertThat(stub.test(fixedValue).getOut()).isEqualTo("OK");
} finally {
endpoint.stop();
Modified: axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java Fri Jan 5 19:50:25 2018
@@ -26,16 +26,21 @@ import org.apache.axiom.testutils.PortAl
import org.apache.axis2.databinding.axis2_5758.client.StockQuoteServiceStub;
import org.apache.axis2.databinding.axis2_5758.client.TradePriceRequest;
import org.apache.axis2.databinding.axis2_5758.service.StockQuoteServiceImpl;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
public class ServiceTest {
+ @ClassRule
+ public static final ClientHelper clientHelper = new ClientHelper("target/repo/client");
+
@Test
public void test() throws Exception {
int port = PortAllocator.allocatePort();
String address = "http://localhost:" + port + "/service";
Endpoint endpoint = Endpoint.publish(address, new StockQuoteServiceImpl());
try {
- StockQuoteServiceStub stub = new StockQuoteServiceStub(address);
+ StockQuoteServiceStub stub = clientHelper.createStub(StockQuoteServiceStub.class, address);
TradePriceRequest request = new TradePriceRequest();
request.setTickerSymbol(null);
assertThat(stub.getLastTradePrice(request).getPrice()).isNaN();
Modified: axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java Fri Jan 5 19:50:25 2018
@@ -26,16 +26,21 @@ import org.apache.axiom.testutils.PortAl
import org.apache.axis2.databinding.axis2_5799.client.ComplexTypeWithAttribute;
import org.apache.axis2.databinding.axis2_5799.client.EchoServiceStub;
import org.apache.axis2.databinding.axis2_5799.service.EchoImpl;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
public class ServiceTest {
+ @ClassRule
+ public static final ClientHelper clientHelper = new ClientHelper("target/repo/client");
+
@Test
public void test() throws Exception {
int port = PortAllocator.allocatePort();
String address = "http://localhost:" + port + "/service";
Endpoint endpoint = Endpoint.publish(address, new EchoImpl());
try {
- EchoServiceStub stub = new EchoServiceStub(address);
+ EchoServiceStub stub = clientHelper.createStub(EchoServiceStub.class, address);
ComplexTypeWithAttribute request = new ComplexTypeWithAttribute();
request.setAttr("value");
assertThat(stub.echo(request).getAttr()).isEqualTo("value");
Modified: axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java Fri Jan 5 19:50:25 2018
@@ -28,16 +28,21 @@ import org.apache.axis2.Constants;
import org.apache.axis2.databinding.mtom.client.MTOMServiceStub;
import org.apache.axis2.databinding.mtom.client.MTOMServiceStub.GetContent;
import org.apache.axis2.databinding.mtom.service.MTOMServiceImpl;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
public class MTOMTest {
+ @ClassRule
+ public static final ClientHelper clientHelper = new ClientHelper("target/repo/client");
+
@Test
public void test() throws Exception {
int port = PortAllocator.allocatePort();
String address = "http://localhost:" + port + "/mtom";
Endpoint endpoint = Endpoint.publish(address, new MTOMServiceImpl());
try {
- MTOMServiceStub stub = new MTOMServiceStub(address);
+ MTOMServiceStub stub = clientHelper.createStub(MTOMServiceStub.class, address);
// JAX-WS only produces an MTOM response if the request uses MTOM
stub._getServiceClient().getOptions().setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
DataHandler content = stub.getContent(new GetContent()).getContent();
Modified: axis/axis2/java/core/branches/schema-validation/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Fri Jan 5 19:50:25 2018
@@ -22,8 +22,6 @@ package org.apache.axis2.handlers.addres
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.util.AttributeHelper;
-import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -333,14 +331,14 @@ public class AddressingOutHandler extend
if (!isAddressingHeaderAlreadyAvailable(Final.FAULT_HEADER_DETAIL, false)) {
SOAPHeaderBlock faultDetail = header.addHeaderBlock(
Final.FAULT_HEADER_DETAIL, addressingNamespaceObject);
- faultDetail.addChild(ElementHelper.importOMElement(detailElement, factory));
+ faultDetail.addChild((OMElement)factory.importInformationItem(detailElement));
}
} else if (!messageContext.isSOAP11()) {
// Add detail to the Fault in the SOAP Body
SOAPFault fault = envelope.getBody().getFault();
if (fault != null && fault.getDetail() != null) {
fault.getDetail().addDetailEntry(
- ElementHelper.importOMElement(detailElement, factory));
+ (OMElement)factory.importInformationItem(detailElement));
}
}
}
@@ -428,7 +426,7 @@ public class AddressingOutHandler extend
}
}
- private OMElement createSOAPHeaderBlock(String value, String headerName, ArrayList attributes) {
+ private OMElement createSOAPHeaderBlock(String value, String headerName, ArrayList<OMAttribute> attributes) {
if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
log.trace("createSOAPHeaderBlock: value=" + value + " headerName=" + headerName);
}
@@ -437,10 +435,10 @@ public class AddressingOutHandler extend
header.addHeaderBlock(headerName, addressingNamespaceObject);
soapHeaderBlock.addChild(factory.createOMText(value));
if (attributes != null && !attributes.isEmpty()) {
- Iterator attrIterator = attributes.iterator();
+ Iterator<OMAttribute> attrIterator = attributes.iterator();
while (attrIterator.hasNext()) {
- AttributeHelper
- .importOMAttribute((OMAttribute)attrIterator.next(), soapHeaderBlock);
+ soapHeaderBlock.addAttribute(
+ (OMAttribute)soapHeaderBlock.getOMFactory().importInformationItem(attrIterator.next()));
}
}
addRoleToHeader(soapHeaderBlock);
@@ -503,7 +501,7 @@ public class AddressingOutHandler extend
Iterator iterator = referenceInformation.values().iterator();
while (iterator.hasNext()) {
OMElement omElement = (OMElement)iterator.next();
- SOAPHeaderBlock newElement = ElementHelper.toSOAPHeaderBlock(omElement, factory);
+ SOAPHeaderBlock newElement = factory.createSOAPHeaderBlock(omElement);
if (isFinalAddressingNamespace) {
newElement.addAttribute(Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
Final.WSA_TYPE_ATTRIBUTE_VALUE,
@@ -529,7 +527,7 @@ public class AddressingOutHandler extend
// Only add the reference parameter from the WSDL if it does not already exist.
// This allows clients to override the values before invoking the service.
if (referenceInformation == null || !referenceInformation.containsKey(omElement.getQName())) {
- SOAPHeaderBlock newElement = ElementHelper.toSOAPHeaderBlock(omElement, factory);
+ SOAPHeaderBlock newElement = factory.createSOAPHeaderBlock(omElement);
if (isFinalAddressingNamespace) {
newElement.addAttribute(Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
Final.WSA_TYPE_ATTRIBUTE_VALUE,
Modified: axis/axis2/java/core/branches/schema-validation/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java Fri Jan 5 19:50:25 2018
@@ -26,12 +26,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.axiom.om.util.LogOutputStream;
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.axis2.util.CommandLineOptionParser;
+import org.apache.axis2.util.LogWriter;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
+import org.apache.commons.io.output.WriterOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -89,10 +90,7 @@ public class JAXWSCodeGenerationEngine {
* the code generation exception
*/
public void generate() throws CodeGenerationException {
-
- LogOutputStream logOutputStream = new LogOutputStream(log,
- Integer.MAX_VALUE);
- WsimportTool importTool = new WsimportTool(logOutputStream);
+ WsimportTool importTool = new WsimportTool(new WriterOutputStream(new LogWriter(log)));
ArrayList<String> args = new ArrayList<String>();
configurImportToolOptions(args);
mergeOriginalArgs(args);
Modified: axis/axis2/java/core/branches/schema-validation/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/distribution/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/distribution/pom.xml Fri Jan 5 19:50:25 2018
@@ -99,7 +99,7 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/itest-build.xml?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/itest-build.xml (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/itest-build.xml Fri Jan 5 19:50:25 2018
@@ -75,12 +75,6 @@
</java>
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/wsdl/complexdatatypebare" />
- <!-- compile the schema for XMLbeans -->
- <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">
- <classpath refid="maven.runtime.classpath" />
- <arg line="-src target/xmlbeans/java -d target/xmlbeans/resources -srconly test-resources/xsd/type-test.xsd" />
- </java>
-
<ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="rpc-wsdl-codegen" />
<ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="wsdl20-codegen" />
</target>
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/pom.xml Fri Jan 5 19:50:25 2018
@@ -33,11 +33,6 @@
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-clustering</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${project.version}</version>
</dependency>
@@ -48,12 +43,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>scripting</artifactId>
- <type>mar</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
<version>${project.version}</version>
</dependency>
@@ -79,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-metadata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-mtompolicy</artifactId>
<version>${project.version}</version>
</dependency>
@@ -99,16 +83,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>org.apache.axis2.osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<version>${project.version}</version>
<type>mar</type>
@@ -129,6 +103,17 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
@@ -243,7 +228,19 @@
</goals>
<configuration>
<outputDirectory>target/test-resources/samples</outputDirectory>
- <axis2xml>conf/axis2.xml</axis2xml>
+ <generatedAxis2xml>
+ <modules>
+ <module>addressing</module>
+ </modules>
+ <handlers>
+ <handler>
+ <flow>InFlow</flow>
+ <phase>Transport</phase>
+ <name>RequestURIOperationDispatcher</name>
+ <className>org.apache.axis2.dispatchers.RequestURIOperationDispatcher</className>
+ </handler>
+ </handlers>
+ </generatedAxis2xml>
<modules>addressing</modules>
</configuration>
</execution>
@@ -255,7 +252,11 @@
</goals>
<configuration>
<outputDirectory>target/test-resources/repository-client</outputDirectory>
- <axis2xml>conf/axis2.xml</axis2xml>
+ <generatedAxis2xml>
+ <modules>
+ <module>addressing</module>
+ </modules>
+ </generatedAxis2xml>
<modules>addressing</modules>
</configuration>
</execution>
@@ -302,7 +303,11 @@
</goals>
<configuration>
<outputDirectory>target/test-resources/integrationRepo</outputDirectory>
- <axis2xml>conf/axis2.xml</axis2xml>
+ <generatedAxis2xml>
+ <modules>
+ <module>addressing</module>
+ </modules>
+ </generatedAxis2xml>
<modules>addressing</modules>
</configuration>
</execution>
@@ -386,7 +391,11 @@
</goals>
<configuration>
<outputDirectory>target/Repository</outputDirectory>
- <axis2xml>conf/axis2.xml</axis2xml>
+ <generatedAxis2xml>
+ <modules>
+ <module>addressing</module>
+ </modules>
+ </generatedAxis2xml>
<modules>addressing,SOAP12TestModuleB,SOAP12TestModuleC</modules>
<includeServices>true</includeServices>
<services>SOAP12TestServiceB,SOAP12TestServiceC</services>
@@ -400,7 +409,11 @@
</goals>
<configuration>
<outputDirectory>target/perf2/build/repo</outputDirectory>
- <axis2xml>conf/axis2.xml</axis2xml>
+ <generatedAxis2xml>
+ <modules>
+ <module>addressing</module>
+ </modules>
+ </generatedAxis2xml>
<modules>addressing</modules>
</configuration>
</execution>
@@ -412,7 +425,11 @@
</goals>
<configuration>
<outputDirectory>target/perf/build/repo/conf</outputDirectory>
- <axis2xml>conf/axis2.xml</axis2xml>
+ <generatedAxis2xml>
+ <modules>
+ <module>addressing</module>
+ </modules>
+ </generatedAxis2xml>
<modules>addressing</modules>
</configuration>
</execution>
@@ -432,6 +449,19 @@
<configuration>
<configurationDirectory>conf</configurationDirectory>
<includeServices>false</includeServices>
+ <generatedAxis2xml>
+ <transportReceivers>
+ <transportReceiver>
+ <name>http</name>
+ <parameters>
+ <parameter>
+ <name>port</name>
+ <value>0</value>
+ </parameter>
+ </parameters>
+ </transportReceiver>
+ </transportReceivers>
+ </generatedAxis2xml>
</configuration>
</plugin>
<plugin>
@@ -508,10 +538,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <!-- The pertest forkMode is not ideal but seems to be necessary
- because the test server doesn't shut down properly :-(
- Should be removed if possible -->
- <forkMode>pertest</forkMode>
<argLine>-Xms256m -Xmx512m</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java Fri Jan 5 19:50:25 2018
@@ -40,7 +40,7 @@ import javax.xml.namespace.QName;
public class EchoRawRuntimeProxyTest extends UtilServerBasedTestCase {
public static final EndpointReference targetEPR = new EndpointReference(
- "http://localhost:5555"
+ "http://localhost:" + UtilServer.TESTING_PORT
+ "/axis2/services/EchoXMLService/echoOMElement");
public static final QName serviceName = new QName("EchoXMLService");
@@ -84,7 +84,7 @@ public class EchoRawRuntimeProxyTest ext
HttpTransportProperties.ProxyProperties proxyproperties =
new HttpTransportProperties.ProxyProperties();
proxyproperties.setProxyName("localhost");
- proxyproperties.setProxyPort(5555);
+ proxyproperties.setProxyPort(UtilServer.TESTING_PORT);
proxyproperties.setDomain("anonymous");
proxyproperties.setPassWord("anonymous");
proxyproperties.setUserName("anonymous");
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java Fri Jan 5 19:50:25 2018
@@ -65,7 +65,6 @@ public class LongRunningServiceTest exte
}
protected void setUp() throws Exception {
- UtilServer.start();
UtilServer.engageAddressingModule();
AxisService service =
Utils.createSimpleService(serviceName,
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ServiceClientTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ServiceClientTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ServiceClientTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ServiceClientTest.java Fri Jan 5 19:50:25 2018
@@ -72,6 +72,7 @@ public class ServiceClientTest extends U
protected void tearDown() throws Exception {
UtilServer.unDeployService(new QName("Echo"));
UtilServer.unDeployClientService();
+ UtilServer.stop();
}
public static OMElement createDummyOMElement() {
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java Fri Jan 5 19:50:25 2018
@@ -21,6 +21,8 @@ package org.apache.axis2.engine;
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -35,9 +37,16 @@ import org.apache.axis2.engine.util.Test
import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.testutils.PortAllocator;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.Utils;
+import static com.google.common.truth.Truth.assertThat;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
import javax.xml.namespace.QName;
public class ThirdPartyResponseRawXMLTest extends UtilServerBasedTestCase implements TestConstants {
@@ -45,12 +54,12 @@ public class ThirdPartyResponseRawXMLTes
return getTestSetup(new TestSuite(ThirdPartyResponseRawXMLTest.class));
}
- private boolean received;
+ private final BlockingQueue<OMElement> received = new ArrayBlockingQueue<>(1);
protected AxisService service;
private SimpleHTTPServer receiver;
private String callbackOperation;
private String callbackServiceName = "CallbackService";
- private int callbackserverPort = 17458;
+ private int callbackserverPort = PortAllocator.allocatePort();
protected void setUp() throws Exception {
service = Utils.createSimpleService(serviceName,
@@ -62,8 +71,13 @@ public class ThirdPartyResponseRawXMLTes
AxisService callbackService = Utils.createSimpleInOnlyService(new QName(callbackServiceName),new MessageReceiver(){
public void receive(MessageContext messageCtx) throws AxisFault {
SOAPEnvelope envelope = messageCtx.getEnvelope();
- TestingUtils.compareWithCreatedOMElement(envelope.getBody().getFirstElement());
- received = true;
+ OMElement bodyContent = envelope.getBody().getFirstElement();
+ bodyContent.build();
+ try {
+ received.put(bodyContent);
+ } catch (InterruptedException ex) {
+ // Do nothing
+ }
}
},new QName(callbackOperation));
UtilServer.deployService(callbackService);
@@ -85,14 +99,9 @@ public class ThirdPartyResponseRawXMLTes
sender.setOptions(op);
sender.engageModule(Constants.MODULE_ADDRESSING);
sender.fireAndForget(TestingUtils.createDummyOMElement());
- int index = 0;
- while (!received) {
- Thread.sleep(1000);
- index++;
- if (index == 20) {
- throw new AxisFault("error Occured");
- }
- }
+ OMElement bodyContent = received.poll(20, TimeUnit.SECONDS);
+ assertThat(bodyContent).isNotNull();
+ TestingUtils.compareWithCreatedOMElement(bodyContent);
}
protected void tearDown() throws Exception {
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java Fri Jan 5 19:50:25 2018
@@ -19,8 +19,10 @@
package org.apache.axis2.engine.map;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import javax.xml.stream.XMLStreamException;
-import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -31,33 +33,19 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisServer;
+import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.SimpleAxisServiceFactory;
+import org.junit.ClassRule;
+import org.junit.Test;
/**
* The Class MapServiceTest.
*/
-public class MapServiceTest extends TestCase {
- private AxisServer server;
+public class MapServiceTest {
+ @ClassRule
+ public static Axis2Server server = new Axis2Server(null,
+ new SimpleAxisServiceFactory(MapService.class));
- /** The service. */
- protected AxisService service;
-
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- server = new AxisServer();
- server.deployService(MapService.class.getName());
- }
-
- @Override
- protected void tearDown() throws Exception {
- server.stop();
- }
-
/**
* Test string generics map service.
*
@@ -66,9 +54,10 @@ public class MapServiceTest extends Test
* @throws AxisFault
* the axis fault
*/
+ @Test
public void testStringGenericsMapService() throws XMLStreamException,
AxisFault {
- String epr = "http://localhost:6060/axis2/services/MapService/stringGenericsMapService";
+ String epr = server.getEndpoint("MapService") + "/stringGenericsMapService";
Options options = new Options();
options.setTo(new EndpointReference(epr));
ServiceClient sender = new ServiceClient();
@@ -94,10 +83,11 @@ public class MapServiceTest extends Test
* @throws AxisFault
* the axis fault
*/
+ @Test
public void testStringGenericsTreeMapService() throws XMLStreamException,
AxisFault {
- String epr = "http://localhost:6060/axis2/services/MapService/stringGenericsTreeMapService";
+ String epr = server.getEndpoint("MapService") + "/stringGenericsTreeMapService";
Options options = new Options();
options.setTo(new EndpointReference(epr));
ServiceClient sender = new ServiceClient();
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/TestingUtils.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/TestingUtils.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/TestingUtils.java Fri Jan 5 19:50:25 2018
@@ -25,6 +25,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import static com.google.common.truth.Truth.assertThat;
+
import java.io.File;
import java.io.IOException;
@@ -56,7 +58,7 @@ public class TestingUtils {
OMElement firstChild = element.getFirstElement();
TestCase.assertNotNull(firstChild);
String textValue = firstChild.getText();
- TestCase.assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy");
+ assertThat(textValue).isEqualTo("Isaac Asimov, The Foundation Trilogy");
}
public static String prefixBaseDirectory(String path) {
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServer.java Fri Jan 5 19:50:25 2018
@@ -31,6 +31,7 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.engine.ListenerManager;
+import org.apache.axis2.testutils.PortAllocator;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import javax.xml.namespace.QName;
@@ -38,11 +39,9 @@ import java.io.File;
import java.io.FilenameFilter;
public class UtilServer {
- private static int count = 0;
-
private static SimpleHTTPServer receiver;
- public static final int TESTING_PORT = 5555;
+ public static final int TESTING_PORT = PortAllocator.allocatePort();
public static final String FAILURE_MESSAGE = "Intentional Failure";
@@ -72,60 +71,29 @@ public class UtilServer {
public static synchronized void start(String repository) throws Exception {
- if (count == 0) {
- ConfigurationContext er = getNewConfigurationContext(repository);
-
- receiver = new SimpleHTTPServer(er, TESTING_PORT);
-
- try {
- receiver.start();
- ListenerManager listenerManager = er.getListenerManager();
- TransportInDescription trsIn = new TransportInDescription(Constants.TRANSPORT_HTTP);
- trsIn.setReceiver(receiver);
- if (listenerManager == null) {
- listenerManager = new ListenerManager();
- listenerManager.init(er);
- }
- listenerManager.addListener(trsIn, true);
- System.out.print("Server started on port "
- + TESTING_PORT + ".....");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e1) {
- throw new AxisFault("Thread interuptted", e1);
+ if (receiver != null) {
+ throw new IllegalStateException("Server already running");
}
+ ConfigurationContext er = getNewConfigurationContext(repository);
- count++;
- }
-
- public static synchronized void start(String repository, String axis2xml) throws Exception {
- if (count == 0) {
- ConfigurationContext er = getNewConfigurationContext(repository, axis2xml);
-
- receiver = new SimpleHTTPServer(er, TESTING_PORT);
-
- try {
- receiver.start();
- System.out.print("Server started on port "
- + TESTING_PORT + ".....");
- } catch (Exception e) {
- throw AxisFault.makeFault(e);
- }
+ receiver = new SimpleHTTPServer(er, TESTING_PORT);
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e1) {
- throw new AxisFault("Thread interuptted", e1);
+ try {
+ receiver.start();
+ ListenerManager listenerManager = er.getListenerManager();
+ TransportInDescription trsIn = new TransportInDescription(Constants.TRANSPORT_HTTP);
+ trsIn.setReceiver(receiver);
+ if (listenerManager == null) {
+ listenerManager = new ListenerManager();
+ listenerManager.init(er);
}
-
+ listenerManager.addListener(trsIn, true);
+ System.out.print("Server started on port "
+ + TESTING_PORT + ".....");
+ } catch (Exception e) {
+ e.printStackTrace();
}
- count++;
}
public static ConfigurationContext getNewConfigurationContext(
@@ -154,22 +122,22 @@ public class UtilServer {
}
public static synchronized void stop() throws AxisFault {
- if (count == 1) {
- receiver.stop();
- while (receiver.isRunning()) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e1) {
- //nothing to do here
- }
+ if (receiver == null) {
+ throw new IllegalStateException();
+ }
+
+ receiver.stop();
+ while (receiver.isRunning()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e1) {
+ //nothing to do here
}
- count = 0;
-// tp.doStop();
- System.out.print("Server stopped .....");
- } else {
- count--;
}
+// tp.doStop();
+ System.out.print("Server stopped .....");
receiver.getConfigurationContext().terminate();
+ receiver = null;
}
public static ConfigurationContext getConfigurationContext() {
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java Fri Jan 5 19:50:25 2018
@@ -56,16 +56,4 @@ public class UtilServerBasedTestCase ext
}
};
}
-
- protected static Test getTestSetup3(Test test, final String param1, final String param2) {
- return new TestSetup(test) {
- public void setUp() throws Exception {
- UtilServer.start(param1, param2);
- }
-
- public void tearDown() throws Exception {
- UtilServer.stop();
- }
- };
- }
}
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Fri Jan 5 19:50:25 2018
@@ -203,7 +203,8 @@ public class EchoRawMTOMTest extends Uti
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo/conf/axis2.xml"));
ServiceClient sender = new ServiceClient(configContext, null);
sender.engageModule("addressing");
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java Fri Jan 5 19:50:25 2018
@@ -138,8 +138,9 @@ public class MessageSaveAndRestoreWithMT
options.setTimeOutInMilliSeconds(50000);
ConfigurationContext configurationContext = ConfigurationContextFactory
- .createConfigurationContextFromFileSystem(TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
- null);
+ .createConfigurationContextFromFileSystem(
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo/conf/axis2.xml"));
ServiceClient sender = new ServiceClient(configurationContext, null);
sender.setOptions(options);
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java Fri Jan 5 19:50:25 2018
@@ -84,7 +84,6 @@ public class ComplexDataTypesComplexData
protected void setUp() throws Exception {
String className = "org.tempuri.complex.ComplexDataTypes";
- UtilServer.start();
AxisService service = AxisService.createService(
className, UtilServer.getConfigurationContext().getAxisConfiguration());
service.setElementFormDefault(true);
Modified: axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java Fri Jan 5 19:50:25 2018
@@ -79,7 +79,7 @@ public class EchoRawSwAFileInputTest ext
}
public void testEchoXMLSync() throws Exception {
- Socket socket = new Socket("127.0.0.1", 5555);
+ Socket socket = new Socket("127.0.0.1", UtilServer.TESTING_PORT);
OutputStream outStream = socket.getOutputStream();
socket.getInputStream();
InputStream requestMsgInStream = new FileInputStream(TestingUtils.prefixBaseDirectory("test-resources/swa/swainput.bin"));
Modified: axis/axis2/java/core/branches/schema-validation/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java?rev=1820348&r1=1820347&r2=1820348&view=diff
==============================================================================
--- axis/axis2/java/core/branches/schema-validation/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java (original)
+++ axis/axis2/java/core/branches/schema-validation/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java Fri Jan 5 19:50:25 2018
@@ -26,8 +26,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.axiom.om.util.LogOutputStream;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.util.LogWriter;
+import org.apache.commons.io.output.WriterOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
@@ -71,9 +72,7 @@ public class JAXWS2WSDLCodegenEngine {
* the exception
*/
public void generate() throws Exception {
- LogOutputStream logOutputStream = new LogOutputStream(log,
- Integer.MAX_VALUE);
- WsgenTool genTool = new WsgenTool(logOutputStream);
+ WsgenTool genTool = new WsgenTool(new WriterOutputStream(new LogWriter(log)));
List<String> args = new ArrayList<String>();
configurImportToolOptions(args);