Author: veithen
Date: Mon Jun 9 17:56:17 2014
New Revision: 1601456
URL: http://svn.apache.org/r1601456
Log:
Fix some build failures on Java 7.
Modified:
axis/axis2/java/core/trunk/modules/codegen/pom.xml
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Mon Jun 9 17:56:17 2014
@@ -77,6 +77,11 @@
<artifactId>jaxws-rt</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Mon Jun 9 17:56:17
2014
@@ -101,6 +101,11 @@
<artifactId>jaxws-rt</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
Mon Jun 9 17:56:17 2014
@@ -321,7 +321,12 @@ public class ClassUtils {
}
try {
if (type instanceof Class) {
- list.add( (Class)type);
+ Class<?> clazz = (Class<?>)type;
+ if (clazz.isArray()) {
+ getClasses(clazz.getComponentType(), list);
+ } else {
+ list.add(clazz);
+ }
}
if (type instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType) type;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Mon Jun 9 17:56:17 2014
@@ -73,6 +73,7 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Hashtable;
import java.util.LinkedHashMap;
@@ -301,6 +302,14 @@ public class DefaultSchemaGenerator impl
serviceMethods.add(method);
}
}
+ // The order of the methods returned by getMethods is undefined, but
the test cases assume that the
+ // order is the same on all Java versions. Java 6 seems to use reverse
lexical order, so we use that
+ // here to make things deterministic.
+ Collections.sort(serviceMethods, new Comparator<Method>() {
+ public int compare(Method o1, Method o2) {
+ return -o1.getName().compareTo(o2.getName());
+ }
+ });
methods = processMethods(serviceMethods.toArray(new
Method[serviceMethods.size()]));
for (String extraClassName : getExtraClasses()) {
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Mon Jun 9 17:56:17 2014
@@ -94,8 +94,8 @@
<httpclient.version>4.2.1</httpclient.version>
<intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
- <jaxb.api.version>2.2.4</jaxb.api.version>
- <jaxbri.version>2.2.4</jaxbri.version>
+ <jaxb.api.version>2.2.6</jaxb.api.version>
+ <jaxbri.version>2.2.6</jaxbri.version>
<jettison.version>1.3</jettison.version>
<jibx.version>1.2</jibx.version>
<junit.version-jdk1.4>3.8.2</junit.version-jdk1.4>
@@ -129,8 +129,8 @@
<failIfNoTests>false</failIfNoTests>
<m2Repository>'${settings.localRepository}'</m2Repository>
<geronimo-spec.jta.version>1.1</geronimo-spec.jta.version>
- <jaxws.tools.version>2.2.5</jaxws.tools.version>
- <jaxws.rt.version>2.2.5</jaxws.rt.version>
+ <jaxws.tools.version>2.2.6</jaxws.tools.version>
+ <jaxws.rt.version>2.2.6</jaxws.rt.version>
<jsr311.api.version>1.1.1</jsr311.api.version>
</properties>
<mailingLists>
Modified: axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml Mon Jun 9
17:56:17 2014
@@ -126,6 +126,24 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>default-tools.jar-3</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Oracle Corporation</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1601456&r1=1601455&r2=1601456&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Mon Jun 9 17:56:17 2014
@@ -209,48 +209,20 @@
</plugin>
<plugin>
<!-- Compile the JSPs so that syntax errors are detected
during the build. -->
- <groupId>org.codehaus.mojo.jspc</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <version>2.0-alpha-3</version>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-jspc-plugin</artifactId>
+ <version>6.1.26</version>
<executions>
<execution>
<goals>
- <goal>compile</goal>
+ <goal>jspc</goal>
</goals>
</execution>
</executions>
<configuration>
- <includeInProject>false</includeInProject>
+ <!-- We don't want to keep the generated classes; we just
want to validate the JSPs -->
+
<generatedClasses>${project.build.directory}/jspc</generatedClasses>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo.jspc</groupId>
- <artifactId>jspc-compiler-tomcat6</artifactId>
- <version>2.0-alpha-3</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <!-- We only want to validate the JSPs, but not to
include the compiled
- versions in the project. However, the
includeInProject parameter of
- the jspc-maven-plugin seems to be broken (the
classes are always
- compiled to the target/classes folder) and
maven-war-plugin doesn't
- have an option to exclude specific classes or
packages. Therefore
- the only way to achieve this is to delete the
files after compilation. -->
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete
dir="${project.build.outputDirectory}/jsp" />
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
