svn commit: r1689053 - in /axis/site/axis2/java: core-staging/ core/
Author: veithen Date: Fri Jul 3 18:35:50 2015 New Revision: 1689053 URL: http://svn.apache.org/r1689053 Log: Publish the site for Axis2 1.6.3. Added: axis/site/axis2/java/core/ - copied from r1689052, axis/site/axis2/java/core-staging/ Removed: axis/site/axis2/java/core-staging/
svn commit: r1689054 - /axis/axis2/java/core/trunk/etc/doap_Axis2.rdf
Author: veithen Date: Fri Jul 3 18:41:11 2015 New Revision: 1689054 URL: http://svn.apache.org/r1689054 Log: Add entry for the Axis2 1.6.3 release to the DOAP file. Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/etc/doap_Axis2.rdf?rev=1689054&r1=1689053&r2=1689054&view=diff == --- axis/axis2/java/core/trunk/etc/doap_Axis2.rdf (original) +++ axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Fri Jul 3 18:41:11 2015 @@ -62,6 +62,7 @@ Apache Axis22011-05-171.6.0 Apache Axis22011-08-301.6.1 Apache Axis22012-04-171.6.2 +Apache Axis22015-06-271.6.3
svn commit: r9614 - in /release/axis/axis2/java/core: 1.5.6/ 1.6.2/
Author: veithen Date: Fri Jul 3 18:55:17 2015 New Revision: 9614 Log: Remove archived releases. Removed: release/axis/axis2/java/core/1.5.6/ release/axis/axis2/java/core/1.6.2/
svn commit: r1689074 - in /axis/axis2/java/core/branches/1_6: ./ modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Author: veithen Date: Fri Jul 3 19:52:23 2015 New Revision: 1689074 URL: http://svn.apache.org/r1689074 Log: AXIS2-5673: Merge r1631608 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 3 19:52:23 2015 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1 205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1621171-1621172,1649688,1677432,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961 +/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1 205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1621171-1621172,1631608,1649688,1677432,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961 Modified: axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java?rev=1689074&r1=1689073&r2=1689074&view=diff == --- axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2
svn commit: r1689086 - /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
Author: veithen
Date: Fri Jul 3 20:41:45 2015
New Revision: 1689086
URL: http://svn.apache.org/r1689086
Log:
AXIS-2909: Fix a concurrency issue that can be easily reproduced with Java 8.
Modified:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
Modified:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java?rev=1689086&r1=1689085&r2=1689086&view=diff
==
---
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
Fri Jul 3 20:41:45 2015
@@ -36,12 +36,13 @@ import org.w3c.dom.Element;
import javax.xml.namespace.QName;
import javax.xml.rpc.holders.Holder;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -520,11 +521,15 @@ public class JavaServiceDesc implements
getSyncedOperationsForName(implClass,
((OperationDesc)overloads.get(0)).getName());
+// Convert to array before sorting to avoid concurrency issues
+OperationDesc[] array = (OperationDesc[])overloads.toArray(
+new OperationDesc[overloads.size()]);
+
// Sort the overloads by number of arguments - prevents us calling
methods
// with more parameters than supplied in the request (with missing
parameters
// defaulted to null) when a perfectly good method exists with exactly
the
// supplied parameters.
-Collections.sort(overloads,
+Arrays.sort(array,
new Comparator() {
public int compare(Object o1, Object o2)
{
@@ -535,8 +540,7 @@ public class JavaServiceDesc implements
}
});
-OperationDesc [] array = new OperationDesc [overloads.size()];
-return (OperationDesc[])overloads.toArray(array);
+return array;
}
private synchronized void initQNameMap() {
svn commit: r1689089 - /axis/axis1/java/trunk/pom.xml
Author: veithen Date: Fri Jul 3 21:00:46 2015 New Revision: 1689089 URL: http://svn.apache.org/r1689089 Log: Update some plugin versions so that the site can be built with Maven 3.3.x. Modified: axis/axis1/java/trunk/pom.xml Modified: axis/axis1/java/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1689089&r1=1689088&r2=1689089&view=diff == --- axis/axis1/java/trunk/pom.xml (original) +++ axis/axis1/java/trunk/pom.xml Fri Jul 3 21:00:46 2015 @@ -221,7 +221,7 @@ maven-site-plugin -3.2 +3.4 maven-assembly-plugin @@ -372,7 +372,7 @@ maven-project-info-reports-plugin -2.6 +2.8 index issue-tracking @@ -438,7 +438,7 @@ maven-project-info-reports-plugin -2.6 +2.8
svn commit: r1689092 - /axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
Author: veithen
Date: Fri Jul 3 21:13:02 2015
New Revision: 1689092
URL: http://svn.apache.org/r1689092
Log:
Remove unnecessary/misleading plugin execution id (copy & paste error).
Modified:
axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
Modified: axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml?rev=1689092&r1=1689091&r2=1689092&view=diff
==
--- axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml (original)
+++ axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml Fri Jul 3 21:13:02
2015
@@ -58,7 +58,6 @@
${project.version}
-samples-addr
generate-sources
svn commit: r1689098 - in /axis/axis1/java/trunk: axis-rt-transport-http-javanet/ daemon-launcher/ integration/ jetty-daemon/ maven/ maven/axis-server-maven-plugin/ maven/axis-server-maven-plugin/src/
Author: veithen
Date: Fri Jul 3 21:57:51 2015
New Revision: 1689098
URL: http://svn.apache.org/r1689098
Log:
Rename the Maven plugins so that they conform to the plugin naming conventions
(https://maven.apache.org/guides/plugin/guide-java-plugin-development.html).
Added:
axis/axis1/java/trunk/maven/axis-server-maven-plugin/
- copied from r1689082,
axis/axis1/java/trunk/maven/maven-axis-server-plugin/
axis/axis1/java/trunk/maven/java2wsdl-maven-plugin/
- copied from r1689082,
axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/
axis/axis1/java/trunk/maven/wsdd-maven-plugin/
- copied from r1689082, axis/axis1/java/trunk/maven/maven-wsdd-plugin/
axis/axis1/java/trunk/maven/wsdl2java-maven-plugin/
- copied from r1689082,
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/
Removed:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/
axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/
Modified:
axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml
axis/axis1/java/trunk/daemon-launcher/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/jetty-daemon/pom.xml
axis/axis1/java/trunk/maven/axis-server-maven-plugin/pom.xml
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/site/apt/index.apt
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/site/apt/usage.apt.vm
axis/axis1/java/trunk/maven/java2wsdl-maven-plugin/pom.xml
axis/axis1/java/trunk/maven/nsmap/pom.xml
axis/axis1/java/trunk/maven/pom.xml
axis/axis1/java/trunk/maven/src/site/site.xml
axis/axis1/java/trunk/maven/src/site/xdoc/index.xml
axis/axis1/java/trunk/maven/wsdd-maven-plugin/pom.xml
axis/axis1/java/trunk/maven/wsdd-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
axis/axis1/java/trunk/maven/wsdd-maven-plugin/src/site/apt/index.apt
axis/axis1/java/trunk/maven/wsdl2java-maven-plugin/pom.xml
axis/axis1/java/trunk/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
axis/axis1/java/trunk/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
axis/axis1/java/trunk/maven/wsdl2java-maven-plugin/src/site/apt/index.apt
axis/axis1/java/trunk/maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
axis/axis1/java/trunk/samples/addr-sample/pom.xml
axis/axis1/java/trunk/samples/attachments-sample/pom.xml
axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml
axis/axis1/java/trunk/samples/echo-sample/pom.xml
axis/axis1/java/trunk/samples/encoding-sample/pom.xml
axis/axis1/java/trunk/samples/faults-sample/pom.xml
axis/axis1/java/trunk/samples/handler-sample/pom.xml
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
axis/axis1/java/trunk/samples/jms-sample/pom.xml
axis/axis1/java/trunk/samples/message-sample/pom.xml
axis/axis1/java/trunk/samples/misc-sample/pom.xml
axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml
axis/axis1/java/trunk/samples/proxy-sample/pom.xml
axis/axis1/java/trunk/samples/stock-sample/pom.xml
axis/axis1/java/trunk/samples/transport-sample/pom.xml
axis/axis1/java/trunk/src/site/apt/changelogs/1_4_1.apt
axis/axis1/java/trunk/tests/interop-tests/pom.xml
axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml?rev=1689098&r1=1689097&r2=1689098&view=diff
==
--- axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml Fri Jul 3
21:57:51 2015
@@ -69,7 +69,7 @@
${project.groupId}
-maven-wsdl2java-plugin
+wsdl2java-maven-plugin
${project.version}
@@ -123,7 +123,7 @@
${project.groupId}
-maven-axis-server-plugin
+axis-server-maven-plugin
${project.version}
Modified: axis/axis1/java/trunk/daemon-launcher/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/daemon-launcher/pom.xml?rev=1689098&r1=1689097&r2=1689098&view=diff
==
--- axis/axis1/java/trunk/daemon-launcher/pom.xml (original)
+++ axis/axis1/java/trunk/daemon-launcher/pom.xml Fri Jul 3 21:57:51 2015
@@ -28,7 +28,7 @@
daemon-launcher
Daemon Launcher
-Used by maven-axis-server-plugin to launch a Commons Daemon
implementation.
+Used by axis-server-maven-plugin to launch a Commons Daemon
implementat
svn commit: r1689103 - in /axis/site/axis/java: ./ ant/ apiDocs/ apiDocs/javax/xml/messaging/ apiDocs/javax/xml/messaging/class-use/ apiDocs/javax/xml/namespace/ apiDocs/javax/xml/namespace/class-use/
Author: veithen Date: Fri Jul 3 22:49:56 2015 New Revision: 1689103 URL: http://svn.apache.org/r1689103 Log: Publish new snapshot site after renaming the Maven plugins. [This commit notification would consist of 791 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1689104 - in /axis/axis1/java/trunk: maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/ tests/spring-compat-tests/
Author: veithen
Date: Fri Jul 3 22:53:59 2015
New Revision: 1689104
URL: http://svn.apache.org/r1689104
Log:
Support the -Daxis.server.foreground=true flag also for Jetty instances started
by the axis-server:start-webapp goal.
Added:
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
(with props)
Modified:
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
Added:
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java?rev=1689104&view=auto
==
---
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
(added)
+++
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
Fri Jul 3 22:53:59 2015
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.tools.maven.server;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+
+public abstract class AbstractStartWebServerMojo extends
AbstractStartDaemonMojo {
+/**
+ * The HTTP port.
+ *
+ * @parameter default-value="8080"
+ * @required
+ */
+private int port;
+
+/**
+ * If this flag is set to true, then the execution of the
goal will block after the
+ * server has been started. This is useful if one wants to manually test
some services deployed
+ * on the server or if one wants to run the integration tests from an IDE.
The flag should only
+ * be set using the command line, but not in the POM.
+ *
+ * @parameter expression="${axis.server.foreground}" default-value="false"
+ */
+// Note: this feature is implemented using a flag (instead of a distinct
goal) to make sure that
+// the server is configured in exactly the same way as in a normal
integration test execution.
+private boolean foreground;
+
+/**
+ * Specifies an alternate port number that will override {@link #port} if
{@link #foreground} is
+ * set to true. This parameter should be used if the port
number configured with
+ * the {@link #port} parameter is allocated dynamically. This makes it
easier to run integration
+ * tests from an IDE. For more information, see the usage
+ * documentation.
+ *
+ * @parameter
+ */
+private int foregroundPort = -1;
+
+protected final void doStartDaemon() throws MojoExecutionException,
MojoFailureException {
+Log log = getLog();
+
+doStartDaemon(foreground && foregroundPort != -1 ? foregroundPort :
port);
+
+if (foreground) {
+log.info("Server started in foreground mode. Press CRTL-C to
stop.");
+Object lock = new Object();
+synchronized (lock) {
+try {
+lock.wait();
+} catch (InterruptedException ex) {
+// Set interrupt flag and continue
+Thread.currentThread().interrupt();
+}
+}
+}
+}
+
+protected abstract void doStartDaemon(int port) throws
MojoExecutionException, MojoFailureException;
+}
Propchange:
axis/axis1/java/trunk/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
--
svn:eol-style = native
Modified:
axis/axis1/java/trunk/maven/axis-server-maven-plugin
