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/12/27 18:42:36 UTC
svn commit: r1849802 [4/11] - in
/axis/axis2/java/core/branches/hermetic-tests: ./ 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/ax...
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/pom.xml Thu Dec 27 18:42:33 2018
@@ -62,14 +62,8 @@
<artifactId>xml-resolver</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -198,106 +192,67 @@
</executions>
</plugin>
<plugin>
- <groupId>com.github.veithen.alta</groupId>
- <artifactId>alta-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-properties</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </artifact>
- <artifact>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- </artifact>
- </artifacts>
- <name>jaxws.bootclasspath</name>
- <value>%file%</value>
- <separator>${path.separator}</separator>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <compilerArgument>
- -Xbootclasspath/p:${jaxws.bootclasspath}
- </compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<id>xjc-echo</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/echo.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/echo.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/echo</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-stock1</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/stock1.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/stock1.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock1</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-stock2</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/stock2.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/stock2.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock2</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-samplemtom</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/samplemtom.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/samplemtom.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/samplemtom</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-ProxyDocLitWrapped</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/ProxyDocLitWrapped.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/ProxyDocLitWrapped.wsdl</file>
+ </files>
<packageName>org.test.proxy.doclitwrapped</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProxyDocLitWrapped</outputDirectory>
</configuration>
@@ -305,13 +260,13 @@
<execution>
<id>xjc-AddNumbers</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/AddNumbers.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/AddNumbers.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AddNumbers</outputDirectory>
</configuration>
</execution>
@@ -362,7 +317,7 @@
<inherited>true</inherited>
<configuration>
<forkMode>once</forkMode>
- <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</argLine>
+ <argLine>${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>-->
<includes>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java Thu Dec 27 18:42:33 2018
@@ -80,7 +80,7 @@ public class JAXWSDeployer extends Abstr
List<URL> extraUrls = new ArrayList<>();
String webLocation = DeploymentEngine.getWebLocationString();
if (webLocation != null) {
- extraUrls.add(new File(webLocation).toURL());
+ extraUrls.add(new File(webLocation).toURI().toURL());
}
ClassLoader classLoader = Utils.createClassLoader(
repository,
@@ -91,7 +91,7 @@ public class JAXWSDeployer extends Abstr
axisConfig.isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
JAXWSDeployerSupport deployerSupport = new JAXWSDeployerSupport(configCtx, directory);
- deployerSupport.deployClasses("JAXWS-Builtin", file.toURL(), Thread.currentThread().getContextClassLoader(), classList);
+ deployerSupport.deployClasses("JAXWS-Builtin", file.toURI().toURL(), Thread.currentThread().getContextClassLoader(), classList);
} catch (NoClassDefFoundError e) {
if (log.isDebugEnabled()) {
log.debug(Messages.getMessage("deployingexception", e.getMessage()), e);
@@ -127,7 +127,7 @@ public class JAXWSDeployer extends Abstr
try {
threadClassLoader = Thread.currentThread().getContextClassLoader();
String groupName = deploymentFileData.getName();
- URL location = deploymentFileData.getFile().toURL();
+ URL location = deploymentFileData.getFile().toURI().toURL();
if (isJar(deploymentFileData.getFile())) {
log.info("Deploying artifact : " + deploymentFileData.getAbsolutePath());
List<URL> extraUrls = new ArrayList<>();
@@ -138,7 +138,7 @@ public class JAXWSDeployer extends Abstr
String webLocation = DeploymentEngine.getWebLocationString();
if (webLocation != null) {
- extraUrls.add(new File(webLocation).toURL());
+ extraUrls.add(new File(webLocation).toURI().toURL());
}
ClassLoader classLoader = Utils.createClassLoader(
deploymentFileData.getFile().toURI().toURL(),
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java Thu Dec 27 18:42:33 2018
@@ -106,7 +106,7 @@ public class JAXWSServiceBuilderExtensio
.getServiceClassNameFromMetaData(serviceMetaData);
}
- return deployerSupport.deployClasses(deploymentFileData.getFile().toURL(),
+ return deployerSupport.deployClasses(deploymentFileData.getFile().toURI().toURL(),
deploymentFileData.getClassLoader(), listOfClasses);
} catch (AxisFault e) {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java Thu Dec 27 18:42:33 2018
@@ -880,7 +880,7 @@ public class PackageSetBuilder {
String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
String wsdlLocationPath = new File(baseDir +File.separator+ wsdlLocation).getAbsolutePath();
File file = new File(wsdlLocationPath);
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
if(log.isDebugEnabled()){
log.debug("Reading WSDL from URL:" +url.toString());
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java Thu Dec 27 18:42:33 2018
@@ -49,10 +49,6 @@ public class DataSourceFormatter impleme
this.contentType = contentType;
}
- public byte[] getBytes(org.apache.axis2.context.MessageContext messageContext, OMOutputFormat format) throws AxisFault {
- throw new UnsupportedOperationException("FIXME");
- }
-
public void writeTo(org.apache.axis2.context.MessageContext messageContext, OMOutputFormat format, OutputStream outputStream, boolean preserve) throws AxisFault {
AttachmentsAdapter attachments = (AttachmentsAdapter) messageContext.getProperty(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
try {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java Thu Dec 27 18:42:33 2018
@@ -135,7 +135,7 @@ public class MultiRedirectionCatalogTest
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java Thu Dec 27 18:42:33 2018
@@ -51,10 +51,10 @@ public class XMLCatalogTests extends Tes
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse(file.toURL().toString());
+ parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(doc,file.toURL().toString(),null);
+ XmlSchema schema = schemaCol.read(doc,file.toURI().toURL().toString(),null);
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new QName("http://soapinterop.org/xsd2","SOAPStruct")));
@@ -72,10 +72,10 @@ public class XMLCatalogTests extends Tes
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse(file.toURL().toString());
+ parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(doc,file.toURL().toString(),null);
+ XmlSchema schema = schemaCol.read(doc,file.toURI().toURL().toString(),null);
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new QName("http://soapinterop.org/xsd2","SOAPStruct")));
@@ -96,11 +96,11 @@ public class XMLCatalogTests extends Tes
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse(file.toURL().toString());
+ parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
schemaCol.setSchemaResolver(new CatalogURIResolver(catalogManager));
- XmlSchema schema = schemaCol.read(doc,file.toURL().toString(),null);
+ XmlSchema schema = schemaCol.read(doc,file.toURI().toURL().toString(),null);
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new QName("http://soapinterop.org/xsd2","SOAPStruct")));
@@ -123,7 +123,7 @@ public class XMLCatalogTests extends Tes
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java Thu Dec 27 18:42:33 2018
@@ -50,7 +50,7 @@ public class ClientConfigTests extends T
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java Thu Dec 27 18:42:33 2018
@@ -966,7 +966,7 @@ public class ReleaseServiceTests extends
String wsdlLocation = getWsdlLocation(wsdlFileName);
try {
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail("Exception converting WSDL file to URL: " + e.toString());
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java Thu Dec 27 18:42:33 2018
@@ -61,7 +61,7 @@ public class DescriptionTestUtils2 {
URL wsdlURL = null;
String urlString = getWSDLLocation(wsdlFileName);
try {
- wsdlURL = new File(urlString).getAbsoluteFile().toURL();
+ wsdlURL = new File(urlString).getAbsoluteFile().toURI().toURL();
} catch (Exception e) {
TestLogger.logger.debug(
"Caught exception creating WSDL URL :" + urlString + "; exception: " +
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java Thu Dec 27 18:42:33 2018
@@ -51,7 +51,7 @@ public class AddNumbersService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java Thu Dec 27 18:42:33 2018
@@ -142,7 +142,7 @@ public class HandlerResolverTest extends
String sep = "/";
configLoc = sep + "test-resources" + sep + "configuration" + sep + "handlers" + sep + "handler.xml";
String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
- is = new File(baseDir + configLoc).toURL().openStream();
+ is = new File(baseDir + configLoc).toURI().toURL().openStream();
}
catch(Exception e) {
e.printStackTrace();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java Thu Dec 27 18:42:33 2018
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import javax.xml.namespace.QName;
+import javax.xml.soap.Node;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPFactory;
@@ -643,11 +644,11 @@ public class SOAPHeadersAdapterTests ext
// confirm headers are there
SOAPHeader soapHeader = soapMessage.getSOAPHeader();
- Iterator<SOAPHeaderElement> it = soapHeader.getChildElements();
+ Iterator<Node> it = soapHeader.getChildElements();
// TODO: not sure if the order of the header additions is or should be preserved.
// in other words, this test may be a little too strict.
- SOAPHeaderElement headerElem1 = it.next();
- SOAPHeaderElement headerElem2 = it.next();
+ SOAPHeaderElement headerElem1 = (SOAPHeaderElement)it.next();
+ SOAPHeaderElement headerElem2 = (SOAPHeaderElement)it.next();
// should only be two header elements, so...
assertFalse(it.hasNext());
@@ -703,11 +704,11 @@ public class SOAPHeadersAdapterTests ext
// confirm headers are there
SOAPHeader soapHeader = soapEnvelope.getHeader();
- Iterator<SOAPHeaderElement> it = soapHeader.getChildElements();
+ Iterator<Node> it = soapHeader.getChildElements();
// TODO: not sure if the order of the header additions is or should be preserved.
// in other words, this test may be a little too strict.
- SOAPHeaderElement headerElem1 = it.next();
- SOAPHeaderElement headerElem2 = it.next();
+ SOAPHeaderElement headerElem1 = (SOAPHeaderElement)it.next();
+ SOAPHeaderElement headerElem2 = (SOAPHeaderElement)it.next();
// should only be two header elements, so...
assertFalse(it.hasNext());
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java Thu Dec 27 18:42:33 2018
@@ -536,7 +536,7 @@ public class ClientMetadataHandlerChainT
String sep = "/";
configLoc = sep + "test-resources" + sep + "configuration" + sep + "handlers" + sep + fileName;
String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
- is = new File(baseDir + configLoc).toURL().openStream();
+ is = new File(baseDir + configLoc).toURI().toURL().openStream();
}
catch(Exception e) {
e.printStackTrace();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java Thu Dec 27 18:42:33 2018
@@ -987,7 +987,7 @@ public class ClientMetadataTest extends
String wsdlLocation = getWsdlLocation(wsdlFileName);
try {
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail("Exception converting WSDL file to URL: " + e.toString());
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java Thu Dec 27 18:42:33 2018
@@ -46,7 +46,7 @@ public class SchemaReaderTests extends T
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/pom.xml Thu Dec 27 18:42:33 2018
@@ -39,6 +39,12 @@
<dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-bind</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java Thu Dec 27 18:42:33 2018
@@ -243,7 +243,7 @@ public class CodeGenerationUtility {
// added work in finding the namespaces.
ValidationContext vctx = BindingElement.newValidationContext();
binding = BindingElement.readBinding(new FileInputStream(file), path, vctx);
- binding.setBaseUrl(file.toURL());
+ binding.setBaseUrl(file.toURI().toURL());
vctx.setBindingRoot(binding);
IncludePrevalidationVisitor ipv = new IncludePrevalidationVisitor(vctx);
vctx.tourTree(binding, ipv);
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jibx/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jibx/pom.xml Thu Dec 27 18:42:33 2018
@@ -69,7 +69,31 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>echo</artifactId>
+ <version>${project.version}</version>
+ <type>aar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>schema-validation</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- For compatibility with Java 9. -->
+ <groupId>org.apache.bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>6.3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/jibx</connection>
@@ -105,25 +129,25 @@
</goals>
<configuration>
<tasks unless="maven.test.skip">
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-unwrapped -d jibx -uw -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client" />
+ <arg line="-uri src/test/wsdl/library.wsdl -o '${project.build.directory}/gen/library-unwrapped' -d jibx -uw -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client" />
</java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-unwrapped -d jibx -ss -ssi -sd -uw -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service" />
+ <arg line="-uri src/test/wsdl/library.wsdl -o '${project.build.directory}/gen/library-unwrapped' -d jibx -ss -ssi -sd -uw -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service" />
</java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-wrapped -d jibx -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client" />
+ <arg line="-uri src/test/wsdl/library.wsdl -o '${project.build.directory}/gen/library-wrapped' -d jibx -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client" />
</java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl -o ${project.build.directory}/gen/library-wrapped -d jibx -ss -ssi -sd -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service" />
+ <arg line="-uri src/test/wsdl/library.wsdl -o '${project.build.directory}/gen/library-wrapped' -d jibx -ss -ssi -sd -Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service" />
</java>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/customer-echo.wsdl -o ${project.build.directory}/gen/customer-echo -d jibx -Ebindingfile src/test/binding/customer-binding.xml --noBuildXML -ns2p http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer" />
+ <arg line="-uri src/test/wsdl/customer-echo.wsdl -o '${project.build.directory}/gen/customer-echo' -d jibx -Ebindingfile src/test/binding/customer-binding.xml --noBuildXML -ns2p http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer" />
</java>
</tasks>
</configuration>
@@ -133,7 +157,7 @@
<phase>test-compile</phase>
<configuration>
<tasks unless="maven.test.skip">
- <java classname="org.jibx.binding.Compile" fork="true">
+ <java classname="org.jibx.binding.Compile" fork="true" failonerror="true">
<classpath refid="maven.test.classpath" />
<classpath location="target/test-classes" />
<!-- arg value="-v" /-->
@@ -168,47 +192,73 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
+ <id>echo-repo</id>
+ <goals>
+ <goal>create-test-repository</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/repo/echo</outputDirectory>
+ <services>echo</services>
+ </configuration>
+ </execution>
+ <execution>
<id>library-unwrapped-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/library-unwrapped</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <includeServices>false</includeServices>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/library-unwrapped/resources</directory>
- <targetPath>services/library.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jibx.library.unwrapped.service.LibraryImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>library-wrapped-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/library-wrapped</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <includeServices>false</includeServices>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/library-wrapped/resources</directory>
- <targetPath>services/library.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jibx.library.wrapped.service.LibraryImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
</executions>
+ <configuration>
+ <generatedAxis2xml>
+ <modules>
+ <module>checker</module>
+ <module>schema-validation</module>
+ </modules>
+ </generatedAxis2xml>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java Thu Dec 27 18:42:33 2018
@@ -19,54 +19,29 @@
package org.apache.axis2.jibx;
-import junit.framework.TestCase;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.jibx.customer.EchoCustomerServiceStub;
-import org.apache.axis2.testutils.UtilServer;
-import org.apache.axis2.util.Utils;
+import static org.junit.Assert.assertEquals;
-import javax.xml.namespace.QName;
+import org.apache.axis2.jibx.customer.EchoCustomerServiceStub;
+import org.apache.axis2.testutils.Axis2Server;
+import org.junit.ClassRule;
/**
* Full code generation and runtime test for JiBX data binding extension. This is based on the
* XMLBeans test code.
*/
-public class Test extends TestCase {
- private static final String REPOSITORY_DIR =
- System.getProperty("basedir", ".") + "/src/test/repo/";
-
- public static final QName serviceName = new QName("EchoCustomerService");
- public static final QName operationName = new QName("echo");
-
- private AxisService service;
-
- private void startServer() throws Exception {
- service = Utils.createSimpleService(serviceName,
- Echo.class.getName(), operationName);
- UtilServer.start(REPOSITORY_DIR);
- UtilServer.deployService(service);
- }
-
- private void stopServer() throws Exception {
- UtilServer.unDeployService(serviceName);
- UtilServer.stop();
-/* File outputFile = new File(OUTPUT_LOCATION_BASE);
- if (outputFile.exists() && outputFile.isDirectory()){
- deleteDir(outputFile);
- } */
- }
+public class Test {
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/echo");
+ @org.junit.Test
public void testBuildAndRun() throws Exception {
- startServer();
-
// finish by testing a roundtrip call to the echo server
Person person = new Person(42, "John", "Smith");
Customer customer = new Customer("Redmond", person, "+14258858080",
"WA", "14619 NE 80th Pl.", new Integer(98052));
- EchoCustomerServiceStub stub = new EchoCustomerServiceStub(UtilServer.getConfigurationContext(),
- "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/EchoCustomerService/echo");
+ EchoCustomerServiceStub stub = new EchoCustomerServiceStub(server.getConfigurationContext(),
+ server.getEndpoint("Echo") + "/echo");
Customer result = stub.echo(customer);
- stopServer();
assertEquals("Result object does not match request object",
customer, result);
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java Thu Dec 27 18:42:33 2018
@@ -21,35 +21,19 @@ package org.apache.axis2.jibx.library.un
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jibx.beans.Book;
import org.apache.axis2.jibx.library.unwrapped.client.LibraryStub;
-import org.apache.axis2.jibx.library.unwrapped.service.LibraryImpl;
-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 LibraryTest {
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/library-unwrapped");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("library");
- service.getParameter(Constants.SERVICE_CLASS).setValue(LibraryImpl.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/library-unwrapped");
@Test
public void test1() throws Exception {
- LibraryStub stub = new LibraryStub(UtilServer.getConfigurationContext(), "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/library");
+ LibraryStub stub = new LibraryStub(server.getConfigurationContext(), server.getEndpoint("library"));
stub.addBook("Paperback", "0618918248", new String[] { "Richard Dawkins" }, "The God Delusion");
@@ -69,7 +53,7 @@ public class LibraryTest {
@Test
public void test2() throws Exception {
- LibraryStub stub = new LibraryStub(UtilServer.getConfigurationContext(), "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/library");
+ LibraryStub stub = new LibraryStub(server.getConfigurationContext(), server.getEndpoint("library"));
stub.addBookInstance(new Book("Hardcover", "8854401765", "The Voyage of the Beagle", new String[] { "Charles Darwin" }));
Book book = stub.getBook("8854401765");
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java Thu Dec 27 18:42:33 2018
@@ -18,36 +18,20 @@
*/
package org.apache.axis2.jibx.library.wrapped;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jibx.beans.Book;
import org.apache.axis2.jibx.library.wrapped.client.LibraryStub;
-import org.apache.axis2.jibx.library.wrapped.service.LibraryImpl;
import org.apache.axis2.jibx.wrappers.AddBookRequest;
-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 LibraryTest {
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/library-wrapped");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("library");
- service.getParameter(Constants.SERVICE_CLASS).setValue(LibraryImpl.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/library-wrapped");
@Test
public void test() throws Exception {
- LibraryStub stub = new LibraryStub(UtilServer.getConfigurationContext(), "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/library");
+ LibraryStub stub = new LibraryStub(server.getConfigurationContext(), server.getEndpoint("library"));
stub.addBook(new AddBookRequest(new Book("Paperback", "0618918248", "The God Delusion", new String[] { "Richard Dawkins" })));
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/json/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/json/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/json/pom.xml Thu Dec 27 18:42:33 2018
@@ -44,11 +44,7 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
@@ -134,7 +130,7 @@
<tasks unless="maven.test.skip">
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-ss -sd -u -or -o ${project.build.directory}/gen -uri test-wsdl/LibraryService.wsdl" />
+ <arg line="-ss -sd -u -or -o '${project.build.directory}/gen' -uri test-wsdl/LibraryService.wsdl" />
</java>
<delete file="${project.build.directory}/gen/src/org/apache/axis2/json/adb/LibraryServiceSkeleton.java" />
</tasks>
@@ -173,6 +169,36 @@
<configuration>
<inputDirectory>test-repository/json</inputDirectory>
<outputDirectory>${project.build.directory}/repo/json</outputDirectory>
+ <generatedAxis2xml>
+ <messageFormatters>
+ <messageFormatter>
+ <contentType>application/json</contentType>
+ <className>org.apache.axis2.json.JSONMessageFormatter</className>
+ </messageFormatter>
+ <messageFormatter>
+ <contentType>application/json+badgerfish</contentType>
+ <className>org.apache.axis2.json.JSONBadgerfishMessageFormatter</className>
+ </messageFormatter>
+ <messageFormatter>
+ <contentType>text/javascript</contentType>
+ <className>org.apache.axis2.json.JSONMessageFormatter</className>
+ </messageFormatter>
+ </messageFormatters>
+ <messageBuilders>
+ <messageBuilder>
+ <contentType>application/json</contentType>
+ <className>org.apache.axis2.json.JSONOMBuilder</className>
+ </messageBuilder>
+ <messageBuilder>
+ <contentType>application/json+badgerfish</contentType>
+ <className>org.apache.axis2.json.JSONBadgerfishOMBuilder</className>
+ </messageBuilder>
+ <messageBuilder>
+ <contentType>text/javascript</contentType>
+ <className>org.apache.axis2.json.JSONOMBuilder</className>
+ </messageBuilder>
+ </messageBuilders>
+ </generatedAxis2xml>
</configuration>
</execution>
<execution>
@@ -183,27 +209,39 @@
<configuration>
<inputDirectory>test-repository/gson</inputDirectory>
<outputDirectory>${project.build.directory}/repo/gson</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>repo</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/repo/gson</outputDirectory>
- <resources>
- <resource>
+ <generatedAxis2xml>
+ <messageFormatters>
+ <messageFormatter>
+ <contentType>application/json</contentType>
+ <className>org.apache.axis2.json.gson.JsonFormatter</className>
+ </messageFormatter>
+ </messageFormatters>
+ <messageBuilders>
+ <messageBuilder>
+ <contentType>application/json</contentType>
+ <className>org.apache.axis2.json.gson.JsonBuilder</className>
+ </messageBuilder>
+ </messageBuilders>
+ <handlers>
+ <handler>
+ <flow>InFlow</flow>
+ <phase>Transport</phase>
+ <name>RequestURIOperationDispatcher</name>
+ <className>org.apache.axis2.dispatchers.RequestURIOperationDispatcher</className>
+ </handler>
+ <handler>
+ <flow>InFlow</flow>
+ <phase>Transport</phase>
+ <name>JSONMessageHandler</name>
+ <className>org.apache.axis2.json.gson.JSONMessageHandler</className>
+ </handler>
+ </handlers>
+ </generatedAxis2xml>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/resources</directory>
- <targetPath>services/json_adb_test.aar/META-INF</targetPath>
- </resource>
- </resources>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java Thu Dec 27 18:42:33 2018
@@ -31,10 +31,8 @@ import org.apache.axis2.description.WSDL
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.http.util.URIEncoderDecoder;
-import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -76,51 +74,6 @@ public abstract class AbstractJSONMessag
return contentType;
}
- /**
- * Gives the JSON message as an array of bytes. If the payload is an OMSourcedElement and
- * it contains a JSONDataSource with a correctly formatted JSON String, gets it directly from
- * the DataSource and returns as a byte array. If not, the OM tree is expanded and it is
- * serialized into the output stream and byte array is returned.
- *
- * @param msgCtxt Message context which contains the soap envelope to be written
- * @param format format of the message, this is ignored
- * @return the payload as a byte array
- * @throws AxisFault if there is an error in writing the message using StAX writer or IF THE
- * USER TRIES TO SEND A JSON MESSAGE WITH NAMESPACES USING THE "MAPPED"
- * CONVENTION.
- */
-
- public byte[] getBytes(MessageContext msgCtxt, OMOutputFormat format) throws AxisFault {
- OMElement element = msgCtxt.getEnvelope().getBody().getFirstElement();
- //if the element is an OMSourcedElement and it contains a JSONDataSource with
- //correct convention, directly get the JSON string.
-
- String jsonToWrite = getStringToWrite(element);
- if (jsonToWrite != null) {
- return jsonToWrite.getBytes();
- //otherwise serialize the OM by expanding the tree
- } else {
- try {
- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
- XMLStreamWriter jsonWriter = getJSONWriter(bytesOut, format, msgCtxt);
- element.serializeAndConsume(jsonWriter);
- jsonWriter.writeEndDocument();
-
- return bytesOut.toByteArray();
-
- } catch (XMLStreamException e) {
- throw AxisFault.makeFault(e);
- } catch (FactoryConfigurationError e) {
- throw AxisFault.makeFault(e);
- } catch (IllegalStateException e) {
- throw new AxisFault(
- "Mapped formatted JSON with namespaces are not supported in Axis2. " +
- "Make sure that your request doesn't include namespaces or " +
- "use the Badgerfish convention");
- }
- }
- }
-
public String formatSOAPAction(MessageContext msgCtxt, OMOutputFormat format,
String soapActionString) {
return null;
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java Thu Dec 27 18:42:33 2018
@@ -48,11 +48,7 @@ import java.util.Iterator;
public class JsonFormatter implements MessageFormatter {
private static final Log log = LogFactory.getLog(JsonFormatter.class);
- public byte[] getBytes(MessageContext messageContext, OMOutputFormat omOutputFormat) throws AxisFault {
- return new byte[0];
- }
-
- public void writeTo(MessageContext outMsgCtxt, OMOutputFormat omOutputFormat, OutputStream outputStream, boolean b) throws AxisFault {
+ public void writeTo(MessageContext outMsgCtxt, OMOutputFormat omOutputFormat, OutputStream outputStream, boolean preserve) throws AxisFault {
String charSetEncoding = (String) outMsgCtxt.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
JsonWriter jsonWriter;
String msg;
@@ -94,11 +90,7 @@ public class JsonFormatter implements Me
outMsgCtxt.getConfigurationContext());
try {
xmlsw.writeStartDocument();
- if (b) {
- element.serialize(xmlsw);
- } else {
- element.serializeAndConsume(xmlsw);
- }
+ element.serialize(xmlsw, preserve);
xmlsw.writeEndDocument();
} catch (XMLStreamException e) {
throw new AxisFault("Error while writing to the output stream using JsonWriter", e);
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/pom.xml Thu Dec 27 18:42:33 2018
@@ -45,9 +45,9 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -90,17 +90,22 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<scope>test</scope>
@@ -110,6 +115,11 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/Constants.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/Constants.java Thu Dec 27 18:42:33 2018
@@ -164,7 +164,6 @@ public class Constants extends org.apach
*/
public static final String SINGLE_SERVICE = "singleservice";
- public static final String SERVICE_MAP = "servicemap";
public static final String SERVICE_ROOT = "serviceRoot";
public static final String SERVICE_PATH = "servicePath";
public static final String SERVICE_HANDLERS = "serviceHandlers";
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java Thu Dec 27 18:42:33 2018
@@ -25,8 +25,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.util.AXIOMUtil;
-import org.apache.axiom.om.util.AttributeHelper;
-import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.metadata.InterfaceName;
@@ -215,7 +213,7 @@ public class EndpointReferenceHelper {
Iterator attrIter = addressAttributes.iterator();
while (attrIter.hasNext()) {
OMAttribute omAttribute = (OMAttribute) attrIter.next();
- AttributeHelper.importOMAttribute(omAttribute, addressE);
+ addressE.addAttribute((OMAttribute)factory.importInformationItem(omAttribute));
}
}
@@ -226,7 +224,7 @@ public class EndpointReferenceHelper {
AddressingConstants.Final.WSA_METADATA, wsaNS, eprElement);
for (int i = 0, size = metaData.size(); i < size; i++) {
OMElement omElement = (OMElement) metaData.get(i);
- metadataE.addChild(ElementHelper.importOMElement(omElement, factory));
+ metadataE.addChild((OMElement)factory.importInformationItem(omElement));
}
ArrayList metadataAttributes = epr.getMetadataAttributes();
@@ -234,7 +232,7 @@ public class EndpointReferenceHelper {
Iterator attrIter = metadataAttributes.iterator();
while (attrIter.hasNext()) {
OMAttribute omAttribute = (OMAttribute) attrIter.next();
- AttributeHelper.importOMAttribute(omAttribute, metadataE);
+ metadataE.addAttribute((OMAttribute)factory.importInformationItem(omAttribute));
}
}
}
@@ -247,7 +245,7 @@ public class EndpointReferenceHelper {
Iterator iterator = referenceParameters.values().iterator();
while (iterator.hasNext()) {
OMElement omElement = (OMElement) iterator.next();
- refParameterElement.addChild(ElementHelper.importOMElement(omElement, factory));
+ refParameterElement.addChild((OMElement)factory.importInformationItem(omElement));
}
}
@@ -255,7 +253,7 @@ public class EndpointReferenceHelper {
if (attributes != null) {
for (int i = 0, size = attributes.size(); i < size; i++) {
OMAttribute omAttribute = (OMAttribute) attributes.get(i);
- AttributeHelper.importOMAttribute(omAttribute, eprElement);
+ eprElement.addAttribute((OMAttribute)factory.importInformationItem(omAttribute));
}
}
@@ -264,7 +262,7 @@ public class EndpointReferenceHelper {
if (extensibleElements != null) {
for (int i = 0, size = extensibleElements.size(); i < size; i++) {
OMElement omElement = (OMElement) extensibleElements.get(i);
- eprElement.addChild(ElementHelper.importOMElement(omElement, factory));
+ eprElement.addChild((OMElement)factory.importInformationItem(omElement));
}
}
} else {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java Thu Dec 27 18:42:33 2018
@@ -95,7 +95,9 @@ public interface DeploymentConstants {
String TAG_EXTRACT_SERVICE_ARCHIVE = "extractServiceArchive";
String TAG_DISPATCH_ORDER = "dispatchOrder";
String TAG_DISPATCHER = "dispatcher";
- String TAG_DESCRIPTION = "Description";
+ String TAG_DESCRIPTION = "description";
+ // Alternate description tag; see AXIS2-5884
+ String TAG_DESCRIPTION_ALT = "Description";
String TAG_CLASS_NAME = "class";
String TAG_LIST_ID = "listId";
String TAG_EXCLUDE_PROPERTIES= "excludeProperties";
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Thu Dec 27 18:42:33 2018
@@ -148,7 +148,9 @@ public class ModuleBuilder extends Descr
// Process service description
OMElement descriptionElement =
moduleElement.getFirstChildWithName(new QName(TAG_DESCRIPTION));
-
+ if (descriptionElement == null) {
+ descriptionElement = moduleElement.getFirstChildWithName(new QName(TAG_DESCRIPTION_ALT));
+ }
if (descriptionElement != null) {
OMElement descriptionValue = descriptionElement.getFirstElement();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Thu Dec 27 18:42:33 2018
@@ -135,7 +135,7 @@ public class RepositoryListener implemen
int idx = path.lastIndexOf("!/");
if (idx != -1 && path.substring(idx+2).equals("META-INF/module.xml")) {
moduleURI = new URI(path.substring(0, idx).replaceAll(" ", "%20"));
- if (!moduleURI.getScheme().equals("file")) {
+ if (!"file".equals(moduleURI.getScheme())) {
continue;
}
} else {