Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml Sun Dec 17 22:34:08 2017 @@ -187,7 +187,7 @@ <!-- transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/ --> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> @@ -196,7 +196,7 @@ </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties Sun Dec 17 22:34:08 2017 @@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE # Set the enterprise logger priority to FATAL log4j.logger.org.apache.axis2.enterprise=FATAL -log4j.logger.de.hunsicker.jalopy.io=FATAL log4j.logger.httpclient.wire.header=FATAL log4j.logger.org.apache.commons.httpclient=FATAL @@ -38,4 +37,4 @@ log4j.appender.LOGFILE=org.apache.log4j. log4j.appender.LOGFILE.File=axis2.log log4j.appender.LOGFILE.Append=true log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n \ No newline at end of file +log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-addressbook/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -1,2 +1,5 @@ +.classpath +.project +.settings *.iml target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-addressbook/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-addressbook/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-addressbook/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-addressbook/pom.xml Sun Dec 17 22:34:08 2017 @@ -17,13 +17,15 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.samples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> <artifactId>jaxws-addressbook</artifactId> <packaging>jar</packaging> - <version>1.7.0-SNAPSHOT</version> <name>JAXWS Addressbook Service</name> <build> <sourceDirectory>src</sourceDirectory> @@ -54,66 +56,22 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>gen-sources</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <property name="schema.output.base.dir" value="target/schema"/> - <property name="schema.generated.src.dir" value="${schema.output.base.dir}/src"/> - <property name="schema.generated.classes.dir" - value="${schema.output.base.dir}/classes"/> - <!-- make the dirs --> - <mkdir dir="${schema.output.base.dir}"/> - <mkdir dir="${schema.generated.src.dir}"/> - <mkdir dir="${schema.generated.classes.dir}"/> - <!-- Run JAXB schema compiler with designated schemas --> - <echo>Generating java from echo.xsd</echo> - <java classname="com.sun.tools.xjc.Driver" fork="true"> - <classpath refid="maven.runtime.classpath"/> - <classpath location="${compiled.classes.dir}"/> - <arg line="-d ${schema.generated.src.dir} src/AddressBookEntry.xsd"/> - </java> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.5</version> + <artifactId>jaxb2-maven-plugin</artifactId> <executions> <execution> - <id>add-sources</id> - <phase>process-resources</phase> <goals> - <goal>add-source</goal> + <goal>xjc</goal> </goals> <configuration> + <sourceType>XmlSchema</sourceType> <sources> - <source>${basedir}/target/schema/src</source> + <source>src/AddressBookEntry.xsd</source> </sources> </configuration> </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> <dependencies> @@ -131,17 +89,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> </dependencies> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project> Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-calculator/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -1,2 +1,5 @@ +.classpath +.project +.settings *.iml target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-calculator/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-calculator/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-calculator/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-calculator/pom.xml Sun Dec 17 22:34:08 2017 @@ -17,13 +17,15 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.samples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> <artifactId>jaxws-calculator</artifactId> <packaging>jar</packaging> - <version>1.7.0-SNAPSHOT</version> <name>JAXWS Calculator Service</name> <build> <sourceDirectory>src</sourceDirectory> @@ -52,15 +54,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> <dependencies> @@ -78,17 +71,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> </dependencies> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project> Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-interop/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -1,2 +1,5 @@ +.classpath +.project +.settings *.iml target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-interop/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-interop/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-interop/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-interop/pom.xml Sun Dec 17 22:34:08 2017 @@ -17,13 +17,15 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.samples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> <artifactId>jaxws-interop</artifactId> <packaging>jar</packaging> - <version>1.7.0-SNAPSHOT</version> <name>JAXWS Interop Sample</name> <build> <sourceDirectory>src</sourceDirectory> @@ -32,17 +34,6 @@ <directory>resources</directory> </resource> </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> </build> <dependencies> <dependency> @@ -59,17 +50,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> </dependencies> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project> Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -1,2 +1,5 @@ +.classpath +.project +.settings *.iml target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/pom.xml Sun Dec 17 22:34:08 2017 @@ -17,14 +17,15 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.examples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> <artifactId>jaxws-samples</artifactId> <name>JAXWS Samples - Echo, Ping, MTOM</name> - <version>1.7.0-SNAPSHOT</version> <packaging>war</packaging> <dependencies> <dependency> @@ -36,27 +37,27 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>addressing</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <type>mar</type> </dependency> <dependency> @@ -103,15 +104,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <compilerVersion>1.5</compilerVersion> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.2</version> <executions> @@ -171,14 +163,4 @@ </testResource> </testResources> </build> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml Sun Dec 17 22:34:08 2017 @@ -210,7 +210,7 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> @@ -219,7 +219,7 @@ </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties Sun Dec 17 22:34:08 2017 @@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE # Set the enterprise logger priority to FATAL log4j.logger.org.apache.axis2.enterprise=FATAL -log4j.logger.de.hunsicker.jalopy.io=FATAL log4j.logger.httpclient.wire.header=FATAL log4j.logger.org.apache.commons.httpclient=FATAL @@ -38,4 +37,4 @@ log4j.appender.LOGFILE=org.apache.log4j. log4j.appender.LOGFILE.File=axis2.log log4j.appender.LOGFILE.Append=true log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n \ No newline at end of file +log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-version/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -1,2 +1,5 @@ +.classpath +.project +.settings *.iml target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-version/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-version/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/jaxws-version/pom.xml Sun Dec 17 22:34:08 2017 @@ -17,12 +17,14 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.examples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> <artifactId>jaxws-version</artifactId> - <version>1.7.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Apache Axis2 -JAXWS Version Service</name> <build> @@ -32,16 +34,6 @@ <directory>resources</directory> </resource> </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> </build> <dependencies> <dependency> @@ -50,14 +42,4 @@ <version>${project.version}</version> </dependency> </dependencies> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> </project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/resources/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/resources/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/resources/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/resources/axis2.xml Sun Dec 17 22:34:08 2017 @@ -236,7 +236,7 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> @@ -245,7 +245,7 @@ </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/src/META-INF/services.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/src/META-INF/services.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/src/META-INF/services.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/json/src/META-INF/services.xml Sun Dec 17 22:34:08 2017 @@ -1,7 +1,7 @@ <service name="JsonService"> - <Description> + <description> This is a sample service to test json implementation - </Description> + </description> <messageReceivers> <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.json.gson.rpc.JsonRpcMessageReceiver" /> @@ -9,4 +9,4 @@ class="org.apache.axis2.json.gson.rpc.JsonInOnlyRPCMessageReceiver"/> </messageReceivers> <parameter name="ServiceClass" locked="false">sample.json.service.JsonService</parameter> -</service> \ No newline at end of file +</service> Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,3 @@ +.project +.settings +target Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsClient/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsClient/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsClient/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsClient/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsClient/pom.xml Sun Dec 17 22:34:08 2017 @@ -10,15 +10,14 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>https-sample</artifactId> <groupId>org.apache.axis2.examples</groupId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <groupId>org.apache.axis2.examples</groupId> <artifactId>httpsClient</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </project> \ No newline at end of file Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/pom.xml Sun Dec 17 22:34:08 2017 @@ -10,23 +10,23 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>https-sample</artifactId> <groupId>org.apache.axis2.examples</groupId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <groupId>org.apache.axis2.examples</groupId> <artifactId>httpsService</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <packaging>war</packaging> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>keytool-maven-plugin</artifactId> + <version>1.5</version> <executions> <execution> <phase>generate-resources</phase> @@ -55,13 +55,13 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.26</version> <configuration> <webAppConfig> <contextPath>/</contextPath> </webAppConfig> <connectors> - <connector - implementation="org.mortbay.jetty.security.SslSocketConnector"> + <connector implementation="org.mortbay.jetty.security.SslSocketConnector"> <port>8443</port> <maxIdleTime>60000</maxIdleTime> <keystore>${project.build.directory}/jetty-ssl.keystore</keystore> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml Sun Dec 17 22:34:08 2017 @@ -212,7 +212,7 @@ <!-- ================================================= --> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> @@ -221,7 +221,7 @@ </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/https-sample/pom.xml Sun Dec 17 22:34:08 2017 @@ -10,26 +10,17 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.examples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> <artifactId>https-sample</artifactId> - <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Axis2 Transport-HTTPS sample</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.axis2</groupId> @@ -47,16 +38,6 @@ <version>${project.version}</version> </dependency> </dependencies> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> <modules> <module>httpsService</module> <module>httpsClient</module> Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,3 @@ +.project +.settings +target Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/pom.xml Sun Dec 17 22:34:08 2017 @@ -1,14 +1,13 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>jms-sample</artifactId> <groupId>org.apache.axis2.examples</groupId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <groupId>org.apache.axis2.examples</groupId> <artifactId>jmsService</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <build> <plugins> <plugin> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml Sun Dec 17 22:34:08 2017 @@ -219,7 +219,7 @@ <!-- ================================================= --> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/transport/jms-sample/pom.xml Sun Dec 17 22:34:08 2017 @@ -10,26 +10,17 @@ License for the ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.examples</groupId> + <parent> + <groupId>org.apache.axis2.examples</groupId> + <artifactId>samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> <artifactId>jms-sample</artifactId> - <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Axis2 Transport-JMS sample</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.axis2</groupId> @@ -47,16 +38,6 @@ <version>${project.version}</version> </dependency> </dependencies> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> <modules> <module>jmsService</module> </modules> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/userguide/conf/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/userguide/conf/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/userguide/conf/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/userguide/conf/axis2.xml Sun Dec 17 22:34:08 2017 @@ -162,7 +162,7 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> @@ -171,7 +171,7 @@ </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/version/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/version/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/version/pom.xml Sun Dec 17 22:34:08 2017 @@ -21,9 +21,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>version</artifactId> <packaging>aar</packaging> @@ -53,14 +53,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.axis2</groupId> <artifactId>axis2-aar-maven-plugin</artifactId> <extensions>true</extensions> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/samples/yahoojsonsearch/resources/axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/samples/yahoojsonsearch/resources/axis2.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/samples/yahoojsonsearch/resources/axis2.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/samples/yahoojsonsearch/resources/axis2.xml Sun Dec 17 22:34:08 2017 @@ -188,12 +188,12 @@ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/> <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> <parameter name="PROTOCOL">HTTP/1.1</parameter> <parameter name="Transfer-Encoding">chunked</parameter> </transportSender> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>scripting</artifactId> <packaging>mar</packaging> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java Sun Dec 17 22:34:08 2017 @@ -195,7 +195,7 @@ public class ScriptDeploymentEngine exte InputStream definition; try { - definition = wsdlFile.toURL().openStream(); + definition = wsdlFile.toURI().toURL().openStream(); } catch (Exception e) { throw new AxisFault("exception opening wsdl", e); } @@ -239,7 +239,7 @@ public class ScriptDeploymentEngine exte protected String readScriptSource(File scriptFile) throws AxisFault { InputStream is; try { - is = scriptFile.toURL().openStream(); + is = scriptFile.toURI().toURL().openStream(); } catch (IOException e) { throw new AxisFault("IOException opening script: " + scriptFile, e); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/DefaultOMElementConvertor.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/DefaultOMElementConvertor.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/DefaultOMElementConvertor.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/DefaultOMElementConvertor.java Sun Dec 17 22:34:08 2017 @@ -20,11 +20,10 @@ package org.apache.axis2.scripting.convertors; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.bsf.BSFEngine; -import javax.xml.stream.XMLStreamException; -import java.io.ByteArrayInputStream; +import java.io.StringReader; /** * The DefaultOMElementConvertor converts between Synapse OMElements and Strings @@ -32,16 +31,8 @@ import java.io.ByteArrayInputStream; public class DefaultOMElementConvertor implements OMElementConvertor { public OMElement fromScript(Object o) { - try { - - byte[] xmlBytes = o.toString().getBytes(); - StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(xmlBytes)); - OMElement omElement = builder.getDocumentElement(); - return omElement; - - } catch (XMLStreamException e) { - throw new RuntimeException(e); - } + return OMXMLBuilderFactory.createOMBuilder( + new StringReader(o.toString())).getDocumentElement(); } public Object toScript(OMElement omElement) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/JSOMElementConvertor.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/JSOMElementConvertor.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/JSOMElementConvertor.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/JSOMElementConvertor.java Sun Dec 17 22:34:08 2017 @@ -20,7 +20,8 @@ package org.apache.axis2.scripting.convertors; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.xmlbeans.XmlObject; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; @@ -28,8 +29,6 @@ import org.mozilla.javascript.Scriptable import org.mozilla.javascript.Wrapper; import org.mozilla.javascript.xml.XMLObject; -import javax.xml.stream.XMLStreamException; - /** * JSObjectConvertor converts between OMElements and JavaScript E4X XML objects */ @@ -76,16 +75,10 @@ public class JSOMElementConvertor extend Scriptable jsXML = (Scriptable) ScriptableObject.callMethod((Scriptable) o, "copy", new Object[0]); Wrapper wrapper = (Wrapper) ScriptableObject.callMethod((XMLObject)jsXML, "getXmlObject", new Object[0]); XmlObject xmlObject = (XmlObject)wrapper.unwrap(); - try { - - StAXOMBuilder builder = new StAXOMBuilder(xmlObject.newInputStream()); - OMElement omElement = builder.getDocumentElement(); + OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(xmlObject.newInputStream()); + OMElement omElement = builder.getDocumentElement(); - return omElement; - - } catch (XMLStreamException e) { - throw new RuntimeException(e); - } + return omElement; } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/RBOMElementConvertor.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/RBOMElementConvertor.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/RBOMElementConvertor.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/src/org/apache/axis2/scripting/convertors/RBOMElementConvertor.java Sun Dec 17 22:34:08 2017 @@ -20,12 +20,11 @@ package org.apache.axis2.scripting.convertors; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.bsf.BSFEngine; import org.apache.bsf.BSFException; -import javax.xml.stream.XMLStreamException; -import java.io.ByteArrayInputStream; +import java.io.StringReader; /** * OMElementConvertor for Ruby scripts @@ -57,17 +56,8 @@ public class RBOMElementConvertor implem } public OMElement fromScript(Object o) { - try { - - byte[] xmlBytes = o.toString().getBytes(); - StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(xmlBytes)); - OMElement omElement = builder.getDocumentElement(); - - return omElement; - - } catch (XMLStreamException e) { - throw new RuntimeException(e); - } + return OMXMLBuilderFactory.createOMBuilder( + new StringReader(o.toString())).getDocumentElement(); } public void setEngine(BSFEngine e) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java Sun Dec 17 22:34:08 2017 @@ -62,9 +62,9 @@ public class ScriptModuleTest extends Te AxisConfiguration axisConfig = new AxisConfiguration(); URL url = getClass().getClassLoader().getResource("org/apache/axis2/scripting/testrepo/test.js"); File dir = Utils.toFile(url).getParentFile(); - axisConfig.setRepository(dir.getParentFile().toURL()); + axisConfig.setRepository(dir.getParentFile().toURI().toURL()); axisConfig.addParameter(new Parameter("scriptServicesDir", dir.getName())); - assertEquals(dir.toURL(), module.getScriptServicesDirectory(axisConfig).toURL()); + assertEquals(dir.toURI().toURL(), module.getScriptServicesDirectory(axisConfig).toURI().toURL()); } // public void testCreateService() throws AxisFault { @@ -80,7 +80,7 @@ public class ScriptModuleTest extends Te AxisConfiguration axisConfig = new AxisConfiguration(); URL url = getClass().getClassLoader().getResource("org/apache/axis2/scripting/testrepo/test.js"); File dir = Utils.toFile(url).getParentFile(); - axisConfig.setRepository(dir.getParentFile().toURL()); + axisConfig.setRepository(dir.getParentFile().toURI().toURL()); axisConfig.addParameter(new Parameter("scriptServicesDir", dir.getName())); ConfigurationContext configContext = new ConfigurationContext(axisConfig); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/TestUtils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/TestUtils.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/TestUtils.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/scripting/test/org/apache/axis2/scripting/TestUtils.java Sun Dec 17 22:34:08 2017 @@ -22,7 +22,7 @@ package org.apache.axis2.scripting; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMDocument; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; @@ -33,23 +33,12 @@ import org.apache.axis2.description.Axis import org.apache.axis2.description.Parameter; import org.apache.axis2.engine.AxisConfiguration; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; import java.io.StringReader; public class TestUtils { public static OMElement createOMElement(String xml) { - try { - - XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml)); - StAXOMBuilder builder = new StAXOMBuilder(reader); - return builder.getDocumentElement(); - - } catch (XMLStreamException e) { - throw new RuntimeException(e); - } + return OMXMLBuilderFactory.createOMBuilder(new StringReader(xml)).getDocumentElement(); } public static MessageContext createMockMessageContext(String payload) throws AxisFault { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/module/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/module/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/module/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/module/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>soapmonitor</artifactId> <packaging>mar</packaging> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/servlet/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/servlet/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/servlet/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/soapmonitor/servlet/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-soapmonitor-servlet</artifactId> <packaging>jar</packaging> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/spring/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/spring/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/spring/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/spring/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>axis2-spring</artifactId> <name>Apache Axis2 - spring</name> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/pom.xml Sun Dec 17 22:34:08 2017 @@ -21,9 +21,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>axis2-testutils</artifactId> <name>Apache Axis2 - Test Utilities</name> @@ -40,6 +40,16 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>7.6.15.v20140411</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.49</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java Sun Dec 17 22:34:08 2017 @@ -87,7 +87,7 @@ class RuntimeIgnoreRunNotifier extends R } @Override - public void testAborted(Description description, Throwable cause) { - target.testAborted(description, cause); + public void fireTestAssumptionFailed(Failure failure) { + target.fireTestAssumptionFailed(failure); } } \ No newline at end of file Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,3 @@ +.project +.settings +target Propchange: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart-webapp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Dec 17 22:34:08 2017 @@ -0,0 +1,3 @@ +.project +.settings +target Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart-webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart-webapp/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart-webapp/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart-webapp/pom.xml Sun Dec 17 22:34:08 2017 @@ -19,18 +19,17 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.apache.axis2.archetype</groupId> <artifactId>quickstart-webapp</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>Axis2 quickstart-web archetype </name> <description>Maven archetype for creating a Axis2 web Service as a webapp </description> @@ -51,4 +50,4 @@ </extension> </extensions> </build> -</project> \ No newline at end of file +</project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/archetype/quickstart/pom.xml Sun Dec 17 22:34:08 2017 @@ -19,18 +19,17 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.apache.axis2.archetype</groupId> <artifactId>quickstart</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>Axis2 quickstart archetype </name> <description>Maven archetype for creating a Axis2 web Service </description> @@ -51,4 +50,4 @@ </extension> </extensions> </build> -</project> \ No newline at end of file +</project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-aar-maven-plugin</artifactId> <packaging>maven-plugin</packaging> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -56,13 +56,19 @@ </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <!-- Maven supports SLF4J --> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> </dependency> </dependencies> <url>http://axis.apache.org/axis2/java/core/</url> @@ -71,6 +77,12 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin</developerConnection> <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin</url> </scm> + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging/tools/maven-plugins/axis2-aar-maven-plugin</url> + </site> + </distributionManagement> <build> <plugins> <plugin> @@ -94,6 +106,22 @@ <goalPrefix>axis2</goalPrefix> </configuration> </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>install</goal> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <postBuildHookScript>verify</postBuildHookScript> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <developers> @@ -109,4 +137,16 @@ <email>[email protected]</email> </contributor> </contributors> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports /> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> </project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java Sun Dec 17 22:34:08 2017 @@ -23,6 +23,7 @@ import org.apache.maven.archiver.MavenAr import org.apache.maven.archiver.MavenArchiver; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProjectHelper; import org.codehaus.plexus.archiver.ArchiverException; @@ -41,6 +42,15 @@ import java.io.IOException; */ public class AarMojo extends AbstractAarMojo { /** + * The Maven Session + * + * @required + * @readonly + * @parameter expression="${session}" + */ + private MavenSession session; + + /** * The directory for the generated aar. * * @parameter expression="${project.build.directory}" @@ -132,7 +142,7 @@ public class AarMojo extends AbstractAar jarArchiver.addDirectory(aarDirectory); // create archive - archiver.createArchive(project, archive); + archiver.createArchive(session, project, archive); if (classifier != null) { projectHelper.attachArtifact(project, "aar", classifier, aarFile); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java Sun Dec 17 22:34:08 2017 @@ -30,7 +30,6 @@ import org.codehaus.plexus.util.FileUtil import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -157,12 +156,11 @@ public abstract class AbstractAarMojo copyMetaInfFile(wsdlFile, wsdlFileTarget, wsdlExistsBeforeCopyingClasses, "WSDL file"); if (includeDependencies) { - Set artifacts = project.getArtifacts(); + Set<Artifact> artifacts = project.getArtifacts(); - List duplicates = findDuplicates(artifacts); + List<String> duplicates = findDuplicates(artifacts); - for (Iterator iter = artifacts.iterator(); iter.hasNext();) { - Artifact artifact = (Artifact)iter.next(); + for (Artifact artifact : artifacts) { String targetFileName = getDefaultFinalName(artifact); getLog().debug("Processing: " + targetFileName); @@ -198,11 +196,10 @@ public abstract class AbstractAarMojo * @param artifacts set of artifacts * @return List of duplicated artifacts */ - private List findDuplicates(Set artifacts) { - List duplicates = new ArrayList(); - List identifiers = new ArrayList(); - for (Iterator iter = artifacts.iterator(); iter.hasNext();) { - Artifact artifact = (Artifact)iter.next(); + private List<String> findDuplicates(Set<Artifact> artifacts) { + List<String> duplicates = new ArrayList<String>(); + List<String> identifiers = new ArrayList<String>(); + for (Artifact artifact : artifacts) { String candidate = getDefaultFinalName(artifact); if (identifiers.contains(candidate)) { duplicates.add(candidate); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-ant-plugin</artifactId> <name>Apache Axis2 - tool - Ant Plugin</name> @@ -72,11 +72,6 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> </dependency> @@ -85,12 +80,8 @@ <artifactId>xmlschema-core</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.ant</groupId> @@ -154,8 +145,8 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <phase>test</phase> @@ -163,34 +154,36 @@ <goal>execute</goal> </goals> <configuration> - <source> - import groovy.xml.* - - if (project.properties['maven.test.skip']) { - println 'Tests are skipped' - return - } - - def parser = new XmlParser() - def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/') - def xs = new Namespace('http://www.w3.org/2001/XMLSchema') - - println 'Checking extraclasses*.wsdl' - - for (i in 1..3) { - def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl")) - def complexTypes = wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name' - assert complexTypes.contains('ExtraClass1') - assert complexTypes.contains('ExtraClass2') - } - - println 'Checking mappings.wsdl' - - def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/mappings.wsdl")) - def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace' - assert namespaces.contains('http://www.example.org/schema/test-service') - assert namespaces.contains('http://www.example.org/schema/test') - </source> + <scripts> + <script> + import groovy.xml.* + + if (System.properties['maven.test.skip']) { + println 'Tests are skipped' + return + } + + def parser = new XmlParser() + def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/') + def xs = new Namespace('http://www.w3.org/2001/XMLSchema') + + println 'Checking extraclasses*.wsdl' + + for (i in 1..3) { + def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl")) + def complexTypes = wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name' + assert complexTypes.contains('ExtraClass1') + assert complexTypes.contains('ExtraClass2') + } + + println 'Checking mappings.wsdl' + + def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/mappings.wsdl")) + def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace' + assert namespaces.contains('http://www.example.org/schema/test-service') + assert namespaces.contains('http://www.example.org/schema/test') + </script> + </scripts> </configuration> </execution> </executions> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java Sun Dec 17 22:34:08 2017 @@ -23,7 +23,9 @@ import org.apache.axis2.util.CommandLine import org.apache.axis2.util.CommandLineOptionConstants; import org.apache.axis2.util.CommandLineOptionParser; import org.apache.axis2.util.URLProcessor; +import org.apache.axis2.wsdl.codegen.CodeGenConfiguration; import org.apache.axis2.wsdl.codegen.CodeGenerationEngine; +import org.apache.axis2.wsdl.codegen.CodegenConfigLoader; import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; @@ -413,7 +415,9 @@ public class AntCodegenTask extends Task Map commandLineOptions = this.fillOptionMap(); CommandLineOptionParser parser = new CommandLineOptionParser(commandLineOptions); - new CodeGenerationEngine(parser).generate(); + CodeGenConfiguration config = new CodeGenConfiguration(); + CodegenConfigLoader.loadConfig(config, parser.getAllOptions()); + new CodeGenerationEngine(config).generate(); } catch (Throwable e) { throw new BuildException(e); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java Sun Dec 17 22:34:08 2017 @@ -278,8 +278,6 @@ public class Java2WSDLTask extends Task Thread.currentThread().setContextClassLoader(cl); - if (outputLocation != null) cl.addPathElement(outputLocation); - new Java2WSDLCodegenEngine(commandLineOptions).generate(); Thread.currentThread().setContextClassLoader(conextClassLoader); } catch (Throwable e) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties Sun Dec 17 22:34:08 2017 @@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE # Set the enterprise logger priority to FATAL log4j.logger.org.apache.axis2.enterprise=FATAL -log4j.logger.de.hunsicker.jalopy.io=FATAL log4j.logger.httpclient.wire.header=FATAL log4j.logger.org.apache.commons.httpclient=FATAL
