svn commit: r1854269 - /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java

[robertlazarski]

Author: robertlazarski
Date: Sun Feb 24 17:16:32 2019
New Revision: 1854269

URL: http://svn.apache.org/viewvc?rev=1854269&view=rev
Log:
in XMLUtils set uconn.setInstanceFollowRedirects(false)

Modified:

axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java?rev=1854269&r1=1854268&r2=1854269&view=diff
==
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
 Sun Feb 24 17:16:32 2019
@@ -819,7 +819,7 @@ public class XMLUtils {
 uconn.setDefaultUseCaches(false);
 uconn.setDoInput(true);
 uconn.setDoOutput(false);
-uconn.setInstanceFollowRedirects(true);
+uconn.setInstanceFollowRedirects(false);
 uconn.setUseCaches(false);
 
 // username/password info in the URL overrides passed in values

svn commit: r1855184 - /axis/axis1/java/trunk/axis-war/pom.xml

[robertlazarski]

Author: robertlazarski
Date: Mon Mar 11 00:27:44 2019
New Revision: 1855184

URL: http://svn.apache.org/viewvc?rev=1855184&view=rev
Log:
remove sample jws files from the WAR distribution

Modified:
axis/axis1/java/trunk/axis-war/pom.xml

Modified: axis/axis1/java/trunk/axis-war/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/pom.xml?rev=1855184&r1=1855183&r2=1855184&view=diff
==
--- axis/axis1/java/trunk/axis-war/pom.xml (original)
+++ axis/axis1/java/trunk/axis-war/pom.xml Mon Mar 11 00:27:44 2019
@@ -89,6 +89,7 @@
 maven-war-plugin
 
 
WEB-INF/lib/soapmonitor-applet-*.jar
+*.jws
 
 
 ${project.groupId}

svn commit: r1866702 - in /axis/axis1/java/trunk: axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java pom.xml

[robertlazarski]

Author: robertlazarski
Date: Mon Sep  9 17:44:23 2019
New Revision: 1866702

URL: http://svn.apache.org/viewvc?rev=1866702&view=rev
Log:
Apply patch for AXIS-2905, remove animal sniffer API check plugin from the 
pom.xml because patch requires JDK classes marked with 'Since 1.5' and internal 
the internal Apache build on Travis runs JDK 8

Modified:

axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
axis/axis1/java/trunk/pom.xml

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java?rev=1866702&r1=1866701&r2=1866702&view=diff
==
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
 Mon Sep  9 17:44:23 2019
@@ -15,12 +15,6 @@
  */
 package org.apache.axis.components.net;
 
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.utils.StringUtils;
-
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,7 +22,33 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Socket;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import javax.naming.InvalidNameException;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.apache.axis.utils.Messages;
+import org.apache.axis.utils.StringUtils;
+import org.apache.axis.utils.XMLUtils;
 
 
 /**
@@ -41,6 +61,10 @@ import java.util.Hashtable;
  */
 public class JSSESocketFactory extends DefaultSocketFactory implements 
SecureSocketFactory {
 
+// This is a a sorted list, if you insert new elements do it orderdered.
+private final static String[] BAD_COUNTRY_2LDS =
+{"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
+"lg", "ne", "net", "or", "org"};
 /** Field sslFactory   */
 protected SSLSocketFactory sslFactory = null;
 
@@ -187,6 +211,279 @@ public class JSSESocketFactory extends D
 if (log.isDebugEnabled()) {
 log.debug(Messages.getMessage("createdSSL00"));
 }
+verifyHostName(host, (SSLSocket) sslSocket);
 return sslSocket;
 }
+/**
+ * Verifies that the given hostname in certicifate is the hostname we are 
trying to connect to.
+ * This resolves CVE-2012-5784 and CVE-2014-3596
+ * @param host
+ * @param ssl
+ * @throws IOException
+ */
+
+   private static void verifyHostName(String host, SSLSocket ssl)
+   throws IOException {
+   if (host == null) {
+   throw new IllegalArgumentException("host to verify was 
null");
+   }
+
+   SSLSession session = ssl.getSession();
+   if (session == null) {
+// In our experience this only happens under IBM 1.4.x when
+// spurious (unrelated) certificates show up in the server's chain.
+// Hopefully this will unearth the real problem:
+   InputStream in = ssl.getInputStream();
+   in.available();
+/*
+ If you're looking at the 2 lines of code above because you're
+ running into a problem, you probably have two options:
+
+#1.  Clean up the certificate chain that your server
+ is presenting (e.g. edit "/etc/apache2/server.crt" or
+ wherever it is your server's certificate chain is
+ defined).
+
+ OR
+
+#2.   Upgrade to an IBM 1.5.x or greater JVM, or switch to 
a
+  

svn commit: r1866705 - /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java

[robertlazarski]

Author: robertlazarski
Date: Mon Sep  9 18:38:03 2019
New Revision: 1866705

URL: http://svn.apache.org/viewvc?rev=1866705&view=rev
Log:
Apply patch for AXIS-2929, JDK 8,9,10,11 support

Modified:

axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java?rev=1866705&r1=1866704&r2=1866705&view=diff
==
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
 Mon Sep  9 18:38:03 2019
@@ -59,6 +59,16 @@ public class ClassReader extends ByteArr
 private static final int CONSTANT_Double = 6;
 private static final int CONSTANT_NameAndType = 12;
 private static final int CONSTANT_Utf8 = 1;
+   
+/*java 8 9 10 11 new tokens 
https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html*/
+private static final int CONSTANT_MethodHandle = 15;
+private static final int CONSTANT_MethodType = 16;
+private static final int CONSTANT_Dynamic = 17;
+private static final int CONSTANT_InvokeDynamic= 18;
+private static final int CONSTANT_Module = 19;
+private static final int CONSTANT_Package = 20;
+/*end of ava 8 9 10 11 new tokens*/
+   
 /**
  * the constant pool.  constant pool indices in the class file
  * directly index into this array.  The value stored in this array
@@ -347,11 +357,30 @@ public class ClassReader extends ByteArr
 int len = readShort();
 skipFully(len);
 break;
+case CONSTANT_MethodHandle:
+
+read(); // reference kind
+readShort(); // reference index
+break;
+
+case CONSTANT_MethodType:
+
+readShort(); // descriptor index
+break;
+
+case CONSTANT_Dynamic:
+readShort(); // bootstrap method attr index
+readShort(); // name and type index
+break;
+case CONSTANT_InvokeDynamic:
+
+readShort(); // bootstrap method attr index
+readShort(); // name and type index
+break;
 
 default:
 // corrupt class file
-throw new IllegalStateException(
-Messages.getMessage("unexpectedBytes00"));
+throw new IllegalStateException("Error looking for 
paramter names in bytecode: unexpected bytes in file, tag:"+c);
 }
 }
 }

svn commit: r1866709 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java

[robertlazarski]

Author: robertlazarski
Date: Mon Sep  9 20:37:11 2019
New Revision: 1866709

URL: http://svn.apache.org/viewvc?rev=1866709&view=rev
Log:
Apply patch for AXIS2-5935, JDK 8,9,10,11 support

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java?rev=1866709&r1=1866708&r2=1866709&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
 Mon Sep  9 20:37:11 2019
@@ -59,6 +59,18 @@ public class ClassReader extends ByteArr
 private static final int CONSTANT_Double = 6;
 private static final int CONSTANT_NameAndType = 12;
 private static final int CONSTANT_Utf8 = 1;
+   
+   /*java 8 9 10 11 new tokens 
https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html*/
+   private static final int CONSTANT_MethodHandle = 15;
+private static final int CONSTANT_MethodType = 16;
+   private static final int CONSTANT_Dynamic = 17;
+private static final int CONSTANT_InvokeDynamic= 18;
+   private static final int CONSTANT_Module = 19;
+   private static final int CONSTANT_Package = 20;
+   /*end of ava 8 9 10 11 new tokens*/ 
+   
+   
+   
 /**
  * the constant pool.  constant pool indices in the class file
  * directly index into this array.  The value stored in this array
@@ -349,9 +361,31 @@ public class ClassReader extends ByteArr
 skipFully(len);
 break;
 
+case CONSTANT_MethodHandle:
+
+read(); // reference kind
+readShort(); // reference index
+break;
+
+case CONSTANT_MethodType:
+
+readShort(); // descriptor index
+break;
+
+   case CONSTANT_Dynamic:
+   readShort(); // bootstrap method attr index
+readShort(); // name and type index
+break;
+
+case CONSTANT_InvokeDynamic:
+
+readShort(); // bootstrap method attr index
+readShort(); // name and type index
+break;
+
 default:
 // corrupt class file
-throw new IllegalStateException("Error looking for 
paramter names in bytecode: unexpected bytes in file");
+throw new IllegalStateException("Error looking for 
paramter names in bytecode: unexpected bytes in file, tag:"+c);
 }
 }
 }

svn commit: r1866711 - /axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java

[robertlazarski]

Author: robertlazarski
Date: Mon Sep  9 20:52:14 2019
New Revision: 1866711

URL: http://svn.apache.org/viewvc?rev=1866711&view=rev
Log:
Apply patch for AXIS-5935 to 1_7 branch, for JDK 8,9,10,11 support

Modified:

axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java

Modified: 
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java?rev=1866711&r1=1866710&r2=1866711&view=diff
==
--- 
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
 (original)
+++ 
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
 Mon Sep  9 20:52:14 2019
@@ -59,6 +59,18 @@ public class ClassReader extends ByteArr
 private static final int CONSTANT_Double = 6;
 private static final int CONSTANT_NameAndType = 12;
 private static final int CONSTANT_Utf8 = 1;
+   
+   /*java 8 9 10 11 new tokens 
https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html*/
+   private static final int CONSTANT_MethodHandle = 15;
+private static final int CONSTANT_MethodType = 16;
+   private static final int CONSTANT_Dynamic = 17;
+private static final int CONSTANT_InvokeDynamic= 18;
+   private static final int CONSTANT_Module = 19;
+   private static final int CONSTANT_Package = 20;
+   /*end of ava 8 9 10 11 new tokens*/ 
+   
+   
+   
 /**
  * the constant pool.  constant pool indices in the class file
  * directly index into this array.  The value stored in this array
@@ -348,10 +360,29 @@ public class ClassReader extends ByteArr
 int len = readShort();
 skipFully(len);
 break;
+case CONSTANT_MethodHandle:
+
+read(); // reference kind
+readShort(); // reference index
+break;
+
+case CONSTANT_MethodType:
+
+readShort(); // descriptor index
+break;
+   case CONSTANT_Dynamic:
+   readShort(); // bootstrap method attr 
index
+readShort(); // name and type index
+break;
+case CONSTANT_InvokeDynamic:
+
+readShort(); // bootstrap method attr index
+readShort(); // name and type index
+break;
 
 default:
 // corrupt class file
-throw new IllegalStateException("Error looking for 
paramter names in bytecode: unexpected bytes in file");
+throw new IllegalStateException("Error looking for 
paramter names in bytecode: unexpected bytes in file, tag:"+c);
 }
 }
 }

svn commit: r1868672 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

[robertlazarski]

Author: robertlazarski
Date: Mon Oct 21 01:02:03 2019
New Revision: 1868672

URL: http://svn.apache.org/viewvc?rev=1868672&view=rev
Log:
apply patch for AXIS2-5969

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1868672&r1=1868671&r2=1868672&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Mon Oct 21 01:02:03 2019
@@ -624,10 +624,9 @@ public class ConverterUtil {
 calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
 
 // set the day light off set only if time zone
-if (source.length() >= 10) {
+if (source.length() > 10) {
 calendar.set(Calendar.DST_OFFSET, 0);
 }
-calendar.getTimeInMillis();
 if (bc){
 calendar.set(Calendar.ERA, GregorianCalendar.BC);
 }

svn commit: r1871014 - /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java

[robertlazarski]

Author: robertlazarski
Date: Sun Dec  8 01:16:07 2019
New Revision: 1871014

URL: http://svn.apache.org/viewvc?rev=1871014&view=rev
Log:
AXIS-2935 apply fix for IOException in multi-threaded end user code

Modified:

axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java?rev=1871014&r1=1871013&r2=1871014&view=diff
==
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
 Sun Dec  8 01:16:07 2019
@@ -152,19 +152,20 @@ public class FileProvider extends Delega
 public void configureEngine(AxisEngine engine)
 throws ConfigurationException {
 try {
-if (getInputStream() == null) {
+InputStream configFileInputStream = getInputStream();
+if (configFileInputStream == null) {
 try {
-setInputStream(new FileInputStream(configFile));
+configFileInputStream = new FileInputStream(configFile);
 } catch (Exception e) {
 // Ignore and continue
 }
 }
-if (getInputStream() == null && searchClasspath) {
+if (configFileInputStream == null && searchClasspath) {
 // Attempt to load the file from the classpath
-setInputStream(ClassUtils.getResourceAsStream(filename, 
engine.getClass().getClassLoader()));
+configFileInputStream = 
ClassUtils.getResourceAsStream(filename, engine.getClass().getClassLoader());
 }
 
-if (getInputStream() == null) {
+if (configFileInputStream == null) {
 // Load the default configuration. This piece of code provides 
compatibility with Axis 1.4,
 // which ends up loading 
org/apache/axis/(client|server)/(client|server)-config.wsdd if
 // (1) filename is (client|server)-config.wsdd;
@@ -184,7 +185,7 @@ public class FileProvider extends Delega
 deployment = defaultConfig.getDeployment();
 } else {
 WSDDDocument doc = new WSDDDocument(XMLUtils.
-
newDocument(getInputStream()));
+
newDocument(configFileInputStream));
 deployment = doc.getDeployment();
 
 deployment.configureEngine(engine);

svn commit: r1872360 - /axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java

[robertlazarski]

Author: robertlazarski
Date: Sun Jan  5 23:38:15 2020
New Revision: 1872360

URL: http://svn.apache.org/viewvc?rev=1872360&view=rev
Log:
throw generic IOException on invalid JSON, instead of exposing info in the 
stack trace

Modified:

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java

Modified: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java?rev=1872360&r1=1872359&r2=1872360&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java
 Sun Jan  5 23:38:15 2020
@@ -19,6 +19,9 @@
 
 package org.apache.axis2.json.gson.rpc;
 
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonReader;
 
@@ -29,6 +32,8 @@ import java.lang.reflect.Method;
 
 public class JsonUtils {
 
+private static final Log log = LogFactory.getLog(JsonUtils.class);
+
 public static Object invokeServiceClass(JsonReader jsonReader,
 Object service,
 Method operation ,
@@ -37,28 +42,33 @@ public class JsonUtils {
 IllegalAccessException, IOException  {
 
 Object[] methodParam = new Object[paramCount];
-Gson gson = new Gson();
-String[] argNames = new String[paramCount];
-
-if( ! jsonReader.isLenient()){
-jsonReader.setLenient(true);
-}
-jsonReader.beginObject();
-String messageName=jsonReader.nextName(); // get message name from 
input json stream
-jsonReader.beginArray();
-
-int i = 0;
-for (Class paramType : paramClasses) {
+   try {
+Gson gson = new Gson();
+String[] argNames = new String[paramCount];
+
+if( ! jsonReader.isLenient()){
+jsonReader.setLenient(true);
+}
 jsonReader.beginObject();
-argNames[i] = jsonReader.nextName();
-methodParam[i] = gson.fromJson(jsonReader, paramType);   // gson 
handle all types well and return an object from it
+String messageName=jsonReader.nextName(); // get message name 
from input json stream
+jsonReader.beginArray();
+
+int i = 0;
+for (Class paramType : paramClasses) {
+jsonReader.beginObject();
+argNames[i] = jsonReader.nextName();
+methodParam[i] = gson.fromJson(jsonReader, paramType);   // 
gson handle all types well and return an object from it
+jsonReader.endObject();
+i++;
+}
+
+jsonReader.endArray();
 jsonReader.endObject();
-i++;
+} catch (Exception ex) {
+log.error(ex.getMessage(), ex);
+throw new IOException("Bad Request");
 }
 
-jsonReader.endArray();
-jsonReader.endObject();
-
 return  operation.invoke(service, methodParam);
 
 }

svn commit: r1872364 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java

[robertlazarski]

Author: robertlazarski
Date: Sun Jan  5 23:54:24 2020
New Revision: 1872364

URL: http://svn.apache.org/viewvc?rev=1872364&view=rev
Log:
AXIS2-5943, simply return false in MessageContext.isFault() if the envelope is 
null. This can happen in JSON based REST services

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1872364&r1=1872363&r2=1872364&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 Sun Jan  5 23:54:24 2020
@@ -4286,6 +4286,16 @@ public class MessageContext extends Abst
 }
 
 public boolean isFault() {
+   if (getEnvelope() == null) {
+   // AXIS2-5943 , the basic assumption that the Axis2 architecture 
makes 
+   // is that any payload always has some form of SOAP representation 
and 
+   // the envelope should therefore never be null.
+   // In the HTTP Response of JSON based REST services, the 
axisOperation
+   // is null so no envelope is created
+log.debug(getLogIDString() + ", " + myClassName +
+" , isFault() found a null soap envelope, returning false. 
This can happen in REST HTTP responses. ");
+return false;
+}
 return getEnvelope().hasFault();
 }
 

svn commit: r1872621 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

[robertlazarski]

Author: robertlazarski
Date: Sat Jan 11 20:43:17 2020
New Revision: 1872621

URL: http://svn.apache.org/viewvc?rev=1872621&view=rev
Log:
AXIS2-5575 Use trim() in ConverterUtil.convertToToken

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1872621&r1=1872620&r2=1872621&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Sat Jan 11 20:43:17 2020
@@ -670,7 +670,8 @@ public class ConverterUtil {
 if ((s == null) || s.equals("")){
 return null;
 }
-return new Token(s);
+   // add trim() for AXIS2-5575
+return new Token(s.trim());
 }
 
 

svn commit: r1873186 - /axis/axis2/java/core/trunk/pom.xml

[robertlazarski]

Author: robertlazarski
Date: Sun Jan 26 18:58:50 2020
New Revision: 1873186

URL: http://svn.apache.org/viewvc?rev=1873186&view=rev
Log:
remove snapshot from the xmlschema version so the build compiles

Modified:
axis/axis2/java/core/trunk/pom.xml

Modified: axis/axis2/java/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1873186&r1=1873185&r2=1873186&view=diff
==
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Jan 26 18:58:50 2020
@@ -512,7 +512,7 @@
 3.1.2-SNAPSHOT
 1.0M11-SNAPSHOT
 1.3.0-SNAPSHOT
-2.2.5-SNAPSHOT
+2.2.5
 1.7.0
 2.7.7
 2.4.0

svn commit: r1875140 - in /axis/axis2/java/core/trunk/modules/samples/json: README.txt src/sample/json/client/JsonClient.java

[robertlazarski]

Author: robertlazarski
Date: Thu Mar 12 19:50:49 2020
New Revision: 1875140

URL: http://svn.apache.org/viewvc?rev=1875140&view=rev
Log:
AXIS2-5943 fix samples/json client code

Modified:
axis/axis2/java/core/trunk/modules/samples/json/README.txt

axis/axis2/java/core/trunk/modules/samples/json/src/sample/json/client/JsonClient.java

Modified: axis/axis2/java/core/trunk/modules/samples/json/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/json/README.txt?rev=1875140&r1=1875139&r2=1875140&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/json/README.txt (original)
+++ axis/axis2/java/core/trunk/modules/samples/json/README.txt Thu Mar 12 
19:50:49 2020
@@ -9,19 +9,24 @@ convention.
 
 In this sample it sends
 
-{"echoUser":{"user":{"name":"My_Name","surname":"MY_Surname","middleName":"My_MiddleName","age":123,
-
"address":{"country":"My_Country","city":"My_City","street":"My_Street","building":"My_Building","flat":"My_Flat","zipCode":"My_ZipCode"
+{"echoUser":[{"arg0":{"name":My_Name,"surname":MY_Surname,"middleName":My_MiddleName,"age":123
+,"address":{"country":My_Country,"city":My_City,"street":My_Street,"building":My_Building,"fla
+t":My_Flat,"zipCode":My_ZipCode}}}]}
+
 
 JSON request to the echoUser method and get the response as
 
 
{"Response":{"name":"My_Name","surname":"MY_Surname","middleName":"My_MiddleName","age":123,
 
"address":{"country":"My_Country","city":"My_City","street":"My_Street","building":"My_Building","flat":"My_Flat","zipCode":"My_ZipCode"}}}
 
+Note that the above request String could be placed into a file myjson.dat and 
used with curl:
+
+curl -v -H "Content-Type: application/json" -X POST --data @/root/myjson.dat 
http://localhost:8080/axis2/services/JsonService/echoUser
 
 Pre-Requisites
 ==
 
-Apache Ant 1.6.2 or later
+Apache Ant 1.8 or later
 
 Running The Sample
 ==
@@ -43,4 +48,4 @@ Then type "ant run.client" to compile cl
 
 Help
 
-Please contact axis-user list (axis-u...@ws.apache.org) if you have any 
trouble running the sample.
\ No newline at end of file
+Please contact axis-user list (axis-u...@ws.apache.org) if you have any 
trouble running the sample.

Modified: 
axis/axis2/java/core/trunk/modules/samples/json/src/sample/json/client/JsonClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/json/src/sample/json/client/JsonClient.java?rev=1875140&r1=1875139&r2=1875140&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/samples/json/src/sample/json/client/JsonClient.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/samples/json/src/sample/json/client/JsonClient.java
 Thu Mar 12 19:50:49 2020
@@ -31,13 +31,11 @@ import java.io.UnsupportedEncodingExcept
 public class JsonClient{
 
 private String url = 
"http://localhost:8080/axis2/services/JsonService/echoUser";;
-private String contentType = "application/json-impl";
+private String contentType = "application/json";
 private String charSet = "UTF-8";
 
 public static void main(String[] args)throws IOException {
-String echoUser = 
"{\"echoUser\":{\"user\":{\"name\":\"My_Name\",\"surname\":\"MY_Surname\",\"middleName\":"
 +
-
"\"My_MiddleName\",\"age\":123,\"address\":{\"country\":\"My_Country\",\"city\":\"My_City\",\"street\":"
 +
-
"\"My_Street\",\"building\":\"My_Building\",\"flat\":\"My_Flat\",\"zipCode\":\"My_ZipCode\"";
+   String echoUser = 
"{\"echoUser\":[{\"arg0\":{\"name\":\"My_Name\",\"surname\":\"MY_Surname\",\"middleName\":"
 + 
"\"My_MiddleName\",\"age\":123,\"address\":{\"country\":\"My_Country\",\"city\":\"My_City\",\"street\":"
 + 
"\"My_Street\",\"building\":\"My_Building\",\"flat\":\"My_Flat\",\"zipCode\":\"My_ZipCode\"}}}]}";
 
 JsonClient jsonClient = new JsonClient();
 jsonClient.post(echoUser);

svn commit: r1875428 - in /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net: DefaultHTTPTransportClientProperties.java TransportClientPropertiesFactory.java

[robertlazarski]

Author: robertlazarski
Date: Thu Mar 19 14:46:35 2020
New Revision: 1875428

URL: http://svn.apache.org/viewvc?rev=1875428&view=rev
Log:
AXIS-2295 Apply community suggested fixes to http proxy parameters caching 
mechanism

Modified:

axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java

axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java?rev=1875428&r1=1875427&r2=1875428&view=diff
==
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
 Thu Mar 19 14:46:35 2020
@@ -37,11 +37,9 @@ public class DefaultHTTPTransportClientP
  * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyHost()
  */
 public String getProxyHost() {
-if (proxyHost == null) {
-proxyHost = AxisProperties.getProperty("http.proxyHost");
-if (proxyHost == null)
-proxyHost = emptyString;
-}
+proxyHost = AxisProperties.getProperty("http.proxyHost");
+if (proxyHost == null)
+proxyHost = emptyString;
 return proxyHost;
 }
 
@@ -49,11 +47,9 @@ public class DefaultHTTPTransportClientP
  * @see 
org.apache.axis.components.net.TransportClientProperties#getNonProxyHosts()
  */
 public String getNonProxyHosts() {
-if (nonProxyHosts == null) {
-nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
-if (nonProxyHosts == null)
-nonProxyHosts = emptyString;
-}
+nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
+if (nonProxyHosts == null)
+nonProxyHosts = emptyString;
 return nonProxyHosts;
 }
 
@@ -61,11 +57,9 @@ public class DefaultHTTPTransportClientP
  * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyPort()
  */
 public String getProxyPort() {
-if (proxyPort == null) {
-proxyPort = AxisProperties.getProperty("http.proxyPort");
-if (proxyPort == null)
-proxyPort = emptyString;
-}
+proxyPort = AxisProperties.getProperty("http.proxyPort");
+if (proxyPort == null)
+proxyPort = emptyString;
 return proxyPort;
 }
 
@@ -73,11 +67,9 @@ public class DefaultHTTPTransportClientP
  * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyUser()
  */
 public String getProxyUser() {
-if (proxyUser == null) {
-proxyUser = AxisProperties.getProperty("http.proxyUser");
-if (proxyUser == null)
-proxyUser = emptyString;
-}
+proxyUser = AxisProperties.getProperty("http.proxyUser");
+if (proxyUser == null)
+proxyUser = emptyString;
 return proxyUser;
 }
 
@@ -85,11 +77,9 @@ public class DefaultHTTPTransportClientP
  * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
  */
 public String getProxyPassword() {
-if (proxyPassword == null) {
-proxyPassword = AxisProperties.getProperty("http.proxyPassword");
-if (proxyPassword == null)
-proxyPassword = emptyString;
-}
+proxyPassword = AxisProperties.getProperty("http.proxyPassword");
+if (proxyPassword == null)
+proxyPassword = emptyString;
 return proxyPassword;
 }
 }

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java?rev=1875428&r1=1875427&r2=1875428&view=diff
==
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
 Thu Mar 19 14:46:35 2020
@@ -27,7 +27,7 @@ import java.util.HashMap;
  */
 public class TransportClientPropertiesFactory {
 

svn commit: r1875438 - in /axis/axis2/java/core/trunk/modules/adb: src/org/apache/axis2/databinding/utils/ConverterUtil.java test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

[robertlazarski]

Author: robertlazarski
Date: Thu Mar 19 22:54:34 2020
New Revision: 1875438

URL: http://svn.apache.org/viewvc?rev=1875438&view=rev
Log:
AXIS2-5724 Apply patch from community, to ADB ConverterUtil class

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1875438&r1=1875437&r2=1875438&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Thu Mar 19 22:54:34 2020
@@ -79,6 +79,8 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -1344,7 +1346,15 @@ public class ConverterUtil {
  * @return 0 if equal , + value if greater than , - value if less than
  */
 public static long compare(BigInteger binBigInteger, String value) {
-return binBigInteger.longValue() - Long.parseLong(value);
+//AXIS2-5724 - Handle Decimal String value when casting to Long.
+long param;
+try {
+NumberFormat nf = NumberFormat.getInstance();
+param = nf.parse(value).longValue();
+} catch (Exception e) {
+throw new ObjectConversionException(e);
+}
+return binBigInteger.longValue() - param;
 }
 
 /**

Modified: 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1875438&r1=1875437&r2=1875438&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 Thu Mar 19 22:54:34 2020
@@ -566,4 +566,21 @@ public class ConverterUtilTest extends T
 // 
https://stackoverflow.com/questions/46372764/axis2-adb-and-mininclusive-2147483648
 assertThat(ConverterUtil.compare(3, "-2147483648")).isGreaterThan(0);
 }
+
+public void 
testCompareBigIntegerValueIsLessThanTotalDigitsFacetRestriction() {
+//AXIS2-5724 - Handle Decimal String value when casting to Long.
+BigInteger value = BigInteger.valueOf(100L);
+String totalDigitsFromXsd = "3";
+String decimalNotationString = 
ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+assertThat(ConverterUtil.compare(value, 
decimalNotationString)).isLessThan(0L);
+}
+
+public void 
testCompareBigIntegerValueIsGreaterThanOrEqualToTotalDigitsFacetRestriction() {
+//AXIS2-5724 - Handle Decimal String value when casting to Long.
+BigInteger value = BigInteger.valueOf(1000L);
+String totalDigitsFromXsd = "3";
+String decimalNotationString = 
ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+long result = ConverterUtil.compare(value, decimalNotationString);
+assertThat(result).isAtLeast(0L);
+}
 }

[axis-axis2-java-core] branch master updated: github testing, add space to README.txt

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new cbf8970  github testing, add space to README.txt
cbf8970 is described below

commit cbf897023e3308730fe84858b5a123a775035db6
Author: robert lazarski 
AuthorDate: Mon Jun 1 03:27:47 2020 -1000

github testing, add space to README.txt
---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 5b820ad..73d462d 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,7 @@ http://axis.apache.org/axis2/java/core/
 --
 
 ___
-Building
+Building 
 ===
 
 We use Maven 2 (http://maven.apache.org) to build, and you'll find a

[axis-axis1-java] branch master updated: github testing, add space to README.txt

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git


The following commit(s) were added to refs/heads/master by this push:
 new 1ab0004  github testing, add space to README.txt
1ab0004 is described below

commit 1ab0004dfd1d7ef3aacf6042e4a1f870c60051e8
Author: robert lazarski 
AuthorDate: Mon Jun 1 05:40:30 2020 -1000

github testing, add space to README.txt
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 7e3245a..8e4d11f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
  Axis (Apache eXtensible Interaction System)
- ---
+ --- 
 
 Welcome to Axis!  You'll find documentation in the docs/ directory.
 

[axis-axis2-java-rampart] branch master updated: github testing, add space to README.txt

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git


The following commit(s) were added to refs/heads/master by this push:
 new 72cbff5  github testing, add space to README.txt
72cbff5 is described below

commit 72cbff55e065c1a193315c625bfd34910da491cf
Author: robert lazarski 
AuthorDate: Mon Jun 1 05:54:50 2020 -1000

github testing, add space to README.txt
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 642c3a0..3e0c1b6 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ http://axis.apache.org/axis2/java/rampart
 --
 
 ___
-Contents of Binary Distribution
+Contents of Binary Distribution 
 ===
 
 lib  - This directory contains all the libraries required by rampart

[axis-axis2-java-core] branch master updated: AXIS2-5984 Switch to org.glassfish.jaxb artifacts

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new ecd17f3  AXIS2-5984 Switch to org.glassfish.jaxb artifacts
ecd17f3 is described below

commit ecd17f36cab19c1e88a915811e6c8724fb702060
Author: robert lazarski 
AuthorDate: Thu Sep 3 13:17:39 2020 -1000

AXIS2-5984 Switch to org.glassfish.jaxb artifacts
---
 legal/jaxb-core-LICENSE.txt|  35 
 legal/jaxb-impl-LICENSE.txt| 384 
 legal/jaxb-jxc-LICENSE.txt |   7 +
 legal/jaxb-runtime-LICENSE.txt |   7 +
 legal/jaxb-xjc-LICENSE.txt | 387 +
 modules/codegen/pom.xml|  12 +-
 modules/distribution/pom.xml   |   4 +-
 modules/java2wsdl/pom.xml  |   2 +-
 modules/jaxbri-codegen/pom.xml |   6 +-
 modules/jaxws/pom.xml  |   2 +-
 modules/webapp/pom.xml |  14 ++
 pom.xml|  23 ++-
 12 files changed, 104 insertions(+), 779 deletions(-)

diff --git a/legal/jaxb-core-LICENSE.txt b/legal/jaxb-core-LICENSE.txt
new file mode 100644
index 000..2946b26
--- /dev/null
+++ b/legal/jaxb-core-LICENSE.txt
@@ -0,0 +1,35 @@
+Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common Development
+and Distribution License("CDDL") (collectively, the "License").  You
+may not use this file except in compliance with the License.  You can
+obtain a copy of the License at
+https://oss.oracle.com/licenses/CDDL+GPL-1.1
+or LICENSE.txt.  See the License for the specific
+language governing permissions and limitations under the License.
+
+When distributing the software, include this License Header Notice in each
+file and include the License file at LICENSE.txt.
+
+GPL Classpath Exception:
+Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the GPL Version 2 section of the License
+file that accompanied this code.
+
+Modifications:
+If applicable, add the following below the License Header, with the fields
+enclosed by brackets [] replaced by your own identifying information:
+"Portions Copyright [year] [name of copyright owner]"
+
+Contributor(s):
+If you wish your version of this file to be governed by only the CDDL or
+only the GPL Version 2, indicate your decision by adding "[Contributor]
+elects to include this software in this distribution under the [CDDL or GPL
+Version 2] license."  If you don't indicate a single choice of license, a
+recipient has the option to distribute your version of this file under
+either the CDDL, the GPL Version 2 or to extend the choice of license to
+its licensees as provided above.  However, if you add GPL Version 2 code
+and therefore, elected the GPL Version 2 license, then the option applies
+only if the new code is made subject to such option by the copyright
+holder.
diff --git a/legal/jaxb-impl-LICENSE.txt b/legal/jaxb-impl-LICENSE.txt
deleted file mode 100644
index d7debf8..000
--- a/legal/jaxb-impl-LICENSE.txt
+++ /dev/null
@@ -1,384 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-  1. Definitions.
-
-1.1. "Contributor" means each individual or entity that
-creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the
-Original Software, prior Modifications used by a
-Contributor (if any), and the Modifications made by that
-particular Contributor.
-
-1.3. "Covered Software" means (a) the Original Software, or
-(b) Modifications, or (c) the combination of files
-containing Original Software with files containing
-Modifications, in each case including portions thereof.
-
-1.4. "Executable" means the Covered Software in any form
-other than Source Code. 
-
-1.5. "Initial Developer" means the individual or entity
-that first makes Original Software available under this
-License. 
-
-1.6. "Larger Work" means a work which combines Covered
-Software or portions thereof with code not governed by the
-terms of this License.
-
-1.7. "License" means this document.
-
-1.8. "Licensable" means having the right to grant, to the
-maximum extent possible, whether at the time o

[axis-axis2-java-core] branch master updated: attempt to fix Travis build on JDK 9

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 23ab3a6  attempt to fix Travis build on JDK 9
23ab3a6 is described below

commit 23ab3a6cd876ac84b808046a0d872973177b6b50
Author: robert lazarski 
AuthorDate: Thu Sep 3 14:57:59 2020 -1000

attempt to fix Travis build on JDK 9
---
 legal/jaxws-rt-LICENSE.txt | 7 +++
 pom.xml| 5 +
 2 files changed, 12 insertions(+)

diff --git a/legal/jaxws-rt-LICENSE.txt b/legal/jaxws-rt-LICENSE.txt
new file mode 100644
index 000..3d9c8b9
--- /dev/null
+++ b/legal/jaxws-rt-LICENSE.txt
@@ -0,0 +1,7 @@
+ Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Distribution License v. 1.0, which is available at
+http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: BSD-3-Clause
diff --git a/pom.xml b/pom.xml
index 6a9d3ba..03b7dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -639,6 +639,11 @@
 
 
 com.sun.xml.ws
+jaxws-rt
+2.3.3
+
+
+com.sun.xml.ws
 jaxws-tools
 ${jaxws.tools.version}
 

[axis-axis2-java-core] branch master updated: attempt to fix Travis build on JDK 9

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 23ab3a6  attempt to fix Travis build on JDK 9
23ab3a6 is described below

commit 23ab3a6cd876ac84b808046a0d872973177b6b50
Author: robert lazarski 
AuthorDate: Thu Sep 3 14:57:59 2020 -1000

attempt to fix Travis build on JDK 9
---
 legal/jaxws-rt-LICENSE.txt | 7 +++
 pom.xml| 5 +
 2 files changed, 12 insertions(+)

diff --git a/legal/jaxws-rt-LICENSE.txt b/legal/jaxws-rt-LICENSE.txt
new file mode 100644
index 000..3d9c8b9
--- /dev/null
+++ b/legal/jaxws-rt-LICENSE.txt
@@ -0,0 +1,7 @@
+ Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Distribution License v. 1.0, which is available at
+http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: BSD-3-Clause
diff --git a/pom.xml b/pom.xml
index 6a9d3ba..03b7dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -639,6 +639,11 @@
 
 
 com.sun.xml.ws
+jaxws-rt
+2.3.3
+
+
+com.sun.xml.ws
 jaxws-tools
 ${jaxws.tools.version}
 

[axis-axis2-java-core] branch master updated: attempt to fix Travis build on JDK 9

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 362baf4  attempt to fix Travis build on JDK 9
362baf4 is described below

commit 362baf41f259bf35a85f0d6bd60135e678f8da94
Author: robert lazarski 
AuthorDate: Fri Sep 4 14:36:17 2020 -1000

attempt to fix Travis build on JDK 9
---
 pom.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 03b7dc3..031c651 100644
--- a/pom.xml
+++ b/pom.xml
@@ -642,6 +642,12 @@
 jaxws-rt
 2.3.3
 
+   
+   com.sun.xml.messaging.saaj
+   saaj-impl
+   1.5.2
+   
+
 
 com.sun.xml.ws
 jaxws-tools

[axis-axis2-java-core] branch master updated: attempt to fix Travis build on JDK 9

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new e45a3af  attempt to fix Travis build on JDK 9
e45a3af is described below

commit e45a3afa9f3199ff660aed8b18fd575457fe4eaa
Author: robert lazarski 
AuthorDate: Sat Sep 5 10:03:07 2020 -1000

attempt to fix Travis build on JDK 9
---
 legal/saaj-api-LICENSE.txt  | 384 
 legal/saaj-impl-LICENSE.txt | 384 
 pom.xml |  16 +-
 3 files changed, 778 insertions(+), 6 deletions(-)

diff --git a/legal/saaj-api-LICENSE.txt b/legal/saaj-api-LICENSE.txt
new file mode 100644
index 000..d7debf8
--- /dev/null
+++ b/legal/saaj-api-LICENSE.txt
@@ -0,0 +1,384 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+
+  1. Definitions.
+
+1.1. "Contributor" means each individual or entity that
+creates or contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the
+Original Software, prior Modifications used by a
+Contributor (if any), and the Modifications made by that
+particular Contributor.
+
+1.3. "Covered Software" means (a) the Original Software, or
+(b) Modifications, or (c) the combination of files
+containing Original Software with files containing
+Modifications, in each case including portions thereof.
+
+1.4. "Executable" means the Covered Software in any form
+other than Source Code. 
+
+1.5. "Initial Developer" means the individual or entity
+that first makes Original Software available under this
+License. 
+
+1.6. "Larger Work" means a work which combines Covered
+Software or portions thereof with code not governed by the
+terms of this License.
+
+1.7. "License" means this document.
+
+1.8. "Licensable" means having the right to grant, to the
+maximum extent possible, whether at the time of the initial
+grant or subsequently acquired, any and all of the rights
+conveyed herein.
+
+1.9. "Modifications" means the Source Code and Executable
+form of any of the following: 
+
+  A. Any file that results from an addition to,
+  deletion from or modification of the contents of a
+  file containing Original Software or previous
+  Modifications; 
+
+  B. Any new file that contains any part of the
+  Original Software or previous Modification; or 
+
+  C. Any new file that is contributed or otherwise made
+  available under the terms of this License.
+
+1.10. "Original Software" means the Source Code and
+Executable form of computer software code that is
+originally released under this License. 
+
+1.11. "Patent Claims" means any patent claim(s), now owned
+or hereafter acquired, including without limitation,
+method, process, and apparatus claims, in any patent
+Licensable by grantor. 
+
+1.12. "Source Code" means (a) the common form of computer
+software code in which modifications are made and (b)
+associated documentation included in or with such code.
+
+1.13. "You" (or "Your") means an individual or a legal
+entity exercising rights under, and complying with all of
+the terms of, this License. For legal entities, "You"
+includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this
+definition, "control" means (a) the power, direct or
+indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (b) ownership
+of more than fifty percent (50%) of the outstanding shares
+or beneficial ownership of such entity.
+
+  2. License Grants. 
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide,
+royalty-free, non-exclusive license: 
+
+  (a) under intellectual property rights (other than
+  patent or trade

[axis-axis2-java-core] branch master updated: attempt to fix Travis build on JDK 9

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new b4a237d  attempt to fix Travis build on JDK 9
b4a237d is described below

commit b4a237dbcd41ef6a06d0bf3fd4dc58de0ecd9c96
Author: robert lazarski 
AuthorDate: Sun Sep 6 07:00:58 2020 -1000

attempt to fix Travis build on JDK 9
---
 modules/adb-tests/pom.xml | 10 ++
 pom.xml   |  7 ---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index 4aaf153..aff3a73 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -514,6 +514,16 @@
 jaxws-tools
 ${jaxws.tools.version}
 
+
+com.sun.xml.messaging.saaj
+saaj-impl
+${saaj.impl.version}
+
+
+javax.xml.soap
+saaj-api
+${saaj.api.version}
+
 
 
 
diff --git a/pom.xml b/pom.xml
index d735a8b..615d740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -557,7 +557,8 @@
 2.3.3
 2.3.1
 1.1.1
-
+1.5.2
+1.3.5
 
@@ -645,12 +646,12 @@
 
 com.sun.xml.messaging.saaj
 saaj-impl
-1.5.2
+${saaj.impl.version}
 
 
 javax.xml.soap
 saaj-api
-1.3.5
+${saaj.api.version}
 
 
 com.sun.xml.ws

[axis-axis2-java-core] branch master updated: JDK 11 compilation fixes

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 5783927  JDK 11 compilation fixes
5783927 is described below

commit 5783927e1a8ef87516ce583904f19c5c2a953030
Author: robert lazarski 
AuthorDate: Fri Sep 11 12:14:30 2020 -1000

JDK 11 compilation fixes
---
 modules/adb-codegen/pom.xml  |  5 +++
 modules/adb-tests/pom.xml| 46 
 modules/saaj/pom.xml |  1 +
 modules/tool/axis2-xsd2java-maven-plugin/pom.xml |  2 +-
 pom.xml  |  3 +-
 5 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml
index 6934e07..dede36d 100644
--- a/modules/adb-codegen/pom.xml
+++ b/modules/adb-codegen/pom.xml
@@ -64,6 +64,11 @@
 xmlunit
 test
 
+
+com.google.googlejavaformat
+google-java-format
+1.3
+
 
 http://axis.apache.org/axis2/java/core/
 
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index aff3a73..3cb72dc 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -85,6 +85,33 @@
 mar
 test
 
+
+com.sun.xml.messaging.saaj
+saaj-impl
+${saaj.impl.version}
+
+
+javax.xml.soap
+saaj-api
+${saaj.api.version}
+
+
+com.google.googlejavaformat
+google-java-format
+1.3
+
+   
+javax.xml.soap
+javax.xml.soap-api
+${soap-api.version}
+
+
+
+com.google.guava
+guava
+20.0
+
 
 
 
@@ -199,6 +226,13 @@
 
 
 
+
+
+com.google.googlejavaformat
+google-java-format
+1.3
+
+
 
 
 ${project.groupId}
@@ -345,6 +379,13 @@
 
 adb
 
+
+
+com.google.googlejavaformat
+google-java-format
+1.3
+
+
 
 
 ${project.groupId}
@@ -524,6 +565,11 @@
 saaj-api
 ${saaj.api.version}
 
+
+com.sun.activation
+javax.activation
+1.2.0
+
 
 
 
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index bc7d48a..684bfa6 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -68,6 +68,7 @@
 
 javax.xml.soap
 javax.xml.soap-api
+${soap-api.version}
 
 
 junit
diff --git a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml 
b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
index 48fae64..7f5a9d1 100644
--- a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
+++ b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
@@ -50,7 +50,7 @@
  a version that works for both. -->
 com.google.guava
 guava
-19.0
+20.0
 
 
 
diff --git a/pom.xml b/pom.xml
index 615d740..5d67e74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,6 +528,7 @@
 4.4.13
 4.5.12
 5.0
+1.4.0
 2.3.1
 2.3.3
 2.3.0.1
@@ -636,7 +637,7 @@
 
 javax.xml.soap
 javax.xml.soap-api
-1.3.8
+   ${soap-api.version}
 
 
 com.sun.xml.ws

[axis-axis2-java-core] branch master updated: upgrade commons fileupload to 1.4

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 923d3c4  upgrade commons fileupload to 1.4
923d3c4 is described below

commit 923d3c4d9ffa6102607c18ddf29e34f685e4de52
Author: robert lazarski 
AuthorDate: Thu Oct 8 07:27:01 2020 -1000

upgrade commons fileupload to 1.4
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5d67e74..71d3366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -516,7 +516,7 @@
 1.7.0
 2.7.7
 2.4.0
-1.3.3
+1.4
 3.1
 2.1
 1.1.1

[axis-axis2-java-core] branch master updated: AXIS2-5990 fix axis2.sh with JDK 9 and above

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new a2fa849  AXIS2-5990 fix axis2.sh with JDK 9 and above
a2fa849 is described below

commit a2fa849cb3202c6b91f9672a3c6604180c626218
Author: root 
AuthorDate: Mon Nov 9 14:18:09 2020 -0500

AXIS2-5990 fix axis2.sh with JDK 9 and above
---
 modules/tool/script/axis2.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/tool/script/axis2.sh b/modules/tool/script/axis2.sh
index 733860d..5056733 100644
--- a/modules/tool/script/axis2.sh
+++ b/modules/tool/script/axis2.sh
@@ -46,7 +46,9 @@ do
 
if [ "$prearg"=-classpath ] || [ "$prearg"=-cp  ]
then
-  AXIS2_CLASSPATH="$arg":"$AXIS2_CLASSPATH"
+  if [[ $arg  == "*.jar" ]]; then
+  AXIS2_CLASSPATH="$arg":"$AXIS2_CLASSPATH"
+  fi
fi
prearg="$arg"
 done 

[axis-axis2-java-core] branch master updated: fix doc typos in 'creatingclients-xmlbeans'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 06fbea0  fix doc typos in 'creatingclients-xmlbeans'
06fbea0 is described below

commit 06fbea0d6414275e7163109818369653ab9d24a0
Author: root 
AuthorDate: Fri Nov 13 11:53:37 2020 -0500

fix doc typos in 'creatingclients-xmlbeans'
---
 src/site/xdoc/docs/userguide-creatingclients-xmlbeans.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/site/xdoc/docs/userguide-creatingclients-xmlbeans.xml 
b/src/site/xdoc/docs/userguide-creatingclients-xmlbeans.xml
index 2769f7d..00fd1c9 100644
--- a/src/site/xdoc/docs/userguide-creatingclients-xmlbeans.xml
+++ b/src/site/xdoc/docs/userguide-creatingclients-xmlbeans.xml
@@ -318,7 +318,7 @@ public class Client{
 
 data.setMessageString("fire and forget it!");
 
-stub.DoInOnly(req);
+stub.doInOnly(req);
 System.out.println("done");
 } catch(Exception e){
 e.printStackTrace();
@@ -337,7 +337,7 @@ public class Client{
 data.setEchoString("echo! ... echo!");
 
 TwoWayOneParameterEchoResponseDocument res =
-stub.TwoWayOneParameterEcho(req);
+stub.twoWayOneParameterEcho(req);
 
 
System.out.println(res.getTwoWayOneParameterEchoResponse().getEchoString());
 } catch(Exception e){
@@ -354,7 +354,7 @@ public class Client{
 NoParametersRequestDocument.NoParametersRequest data =
 req.addNewNoParametersRequest();
 
-System.out.println(stub.NoParameters(req));
+System.out.println(stub.noParameters(req));
 } catch(Exception e){
 e.printStackTrace();
 System.out.println("\n\n\n");
@@ -376,7 +376,7 @@ public class Client{
 data.setItemName("flour");
 
 MultipleParametersAddItemResponseDocument res =
-stub.MultipleParametersAddItem(req);
+stub.multipleParametersAddItem(req);
 MultipleParametersAddItemResponseDocument.
 MultipleParametersAddItemResponse dataRes =
 res.getMultipleParametersAddItemResponse();
@@ -411,7 +411,7 @@ don't, check out the Building Services document)
 you can run the client by adding the two .jar files to your
 classpath and typing:
-java.org.apache.axis2.axis2userguide.Client
+java org.apache.axis2.axis2userguide.Client
 You should see the response in a console window of your servlet
 container. It should look something like this:
 

[axis-axis2-java-core] 02/02: AXIS2-5992, Admin page, add filtering to HTTP input variables

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 98fa23317dbf0247e3d1c33b3f091e94403d
Author: Robert Lazarski 
AuthorDate: Sun Nov 15 09:35:22 2020 -1000

AXIS2-5992, Admin page, add filtering to HTTP input variables
---
 legal/esapi-LICENSE.txt | 28 
 1 file changed, 28 insertions(+)

diff --git a/legal/esapi-LICENSE.txt b/legal/esapi-LICENSE.txt
new file mode 100644
index 000..5d132f9
--- /dev/null
+++ b/legal/esapi-LICENSE.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2013, ESAPI
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
modification,
+are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice, 
this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+  Neither the name of the {organization} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

[axis-axis2-java-core] branch master updated (06fbea0 -> 98fa233)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 06fbea0  fix doc typos in 'creatingclients-xmlbeans'
 new 95870b0  AXIS2-5992, Admin page, add filtering to HTTP input variables
 new 98fa233  AXIS2-5992, Admin page, add filtering to HTTP input variables

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 legal/{jibx-run-LICENSE.txt => esapi-LICENSE.txt}  |   25 +-
 modules/webapp/conf/ESAPI.properties   | 2932 
 modules/webapp/pom.xml |   11 +
 .../java/org/apache/axis2/webapp/AdminActions.java |  310 ++-
 pom.xml|6 +
 5 files changed, 3239 insertions(+), 45 deletions(-)
 copy legal/{jibx-run-LICENSE.txt => esapi-LICENSE.txt} (52%)
 create mode 100644 modules/webapp/conf/ESAPI.properties

[axis-axis2-java-core] 02/02: Revert "AXIS2-5992, Admin page, add filtering to HTTP input variables"

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 35e7d597f00214fdccbe6b1145b78817e8278981
Author: Robert Lazarski 
AuthorDate: Sun Nov 15 13:02:48 2020 -1000

Revert "AXIS2-5992, Admin page, add filtering to HTTP input variables"

This reverts commit 98fa23317dbf0247e3d1c33b3f091e94403d.
---
 legal/esapi-LICENSE.txt | 28 
 1 file changed, 28 deletions(-)

diff --git a/legal/esapi-LICENSE.txt b/legal/esapi-LICENSE.txt
deleted file mode 100644
index 5d132f9..000
--- a/legal/esapi-LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2013, ESAPI
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
modification,
-are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice, 
this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-  Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

[axis-axis2-java-core] branch master updated (98fa233 -> 35e7d59)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 98fa233  AXIS2-5992, Admin page, add filtering to HTTP input variables
 new aa062fb  Revert "AXIS2-5992, Admin page, add filtering to HTTP input 
variables"
 new 35e7d59  Revert "AXIS2-5992, Admin page, add filtering to HTTP input 
variables"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 legal/esapi-LICENSE.txt|   28 -
 modules/webapp/conf/ESAPI.properties   | 2932 
 modules/webapp/pom.xml |   11 -
 .../java/org/apache/axis2/webapp/AdminActions.java |  310 +--
 pom.xml|6 -
 5 files changed, 34 insertions(+), 3253 deletions(-)
 delete mode 100644 legal/esapi-LICENSE.txt
 delete mode 100644 modules/webapp/conf/ESAPI.properties

[axis-axis2-java-core] branch master updated: AXIS2-5992, Admin page, add regex blacklist filtering of bad chars to HTTP input variables and input filename Strings

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 1403091  AXIS2-5992, Admin page, add regex blacklist filtering of bad 
chars to HTTP input variables and input filename Strings
1403091 is described below

commit 1403091d4f6f50da58181ecedc60ca3005346a7f
Author: Robert Lazarski 
AuthorDate: Sun Nov 15 18:17:56 2020 -1000

AXIS2-5992, Admin page, add regex blacklist filtering of bad chars to HTTP 
input variables and input filename Strings
---
 .../java/org/apache/axis2/webapp/AdminActions.java | 170 -
 1 file changed, 169 insertions(+), 1 deletion(-)

diff --git 
a/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java 
b/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
index a672178..0a261d7 100644
--- a/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
+++ b/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
@@ -71,6 +71,8 @@ final class AdminActions {
 private static final String ACTIVATE_SERVICE = "activateService";
 private static final String EDIT_SERVICE_PARAMETERS = 
"editServiceParameters";
 private static final String VIEW_OPERATION_SPECIFIC_CHAINS = 
"viewOperationSpecificChains";
+private static final String HTTP_PARAM_REGEX_INVALID_CHARS = 
"^[a-zA-Z0-9.\\-\\/+=@_,: ]*$";
+private static final String FILENAME_REGEX_INVALID_CHARS = 
"^[a-zA-Z0-9!@#$%^&{}\\[\\]()_+\\-=,.~'` ]{1,255}$";
 
 /**
  * Field LIST_MULTIPLE_SERVICE_JSP_NAME
@@ -120,7 +122,12 @@ final class AdminActions {
 if (req.getSession(false) != null) {
 return new Redirect(LOGOUT);
 } else {
-if ("true".equals(req.getParameter("failed"))) {
+String failed = req.getParameter("failed");
+if (failed.matches(HTTP_PARAM_REGEX_INVALID_CHARS)) {
+log.error("welcome() received invalid 'failed' param, 
redirecting to: " + LOGOUT);
+return new Redirect(LOGOUT);
+}
+if ("true".equals(failed)) {
 req.setAttribute("errorMessage", "Invalid auth credentials!");
 }
 return new View(LOGIN_JSP_NAME);
@@ -175,6 +182,10 @@ final class AdminActions {
 .length());
 }
 
+if 
(fileNameOnly.matches(FILENAME_REGEX_INVALID_CHARS) || fileNameOnly.length() > 
100) {
+log.error("doUpload() received invalid 
filename, redirecting to: " + WELCOME);
+return new Redirect(UPLOAD).withStatus(false, 
"Received invalid filename");
+}
 File uploadedFile = new File(serviceDir, 
fileNameOnly);
 item.write(uploadedFile);
 return new Redirect(UPLOAD).withStatus(true, "File 
" + fileNameOnly + " successfully uploaded");
@@ -200,6 +211,16 @@ final class AdminActions {
 String username = req.getParameter("userName");
 String password = req.getParameter("password");
 
+if (username.matches(HTTP_PARAM_REGEX_INVALID_CHARS) || 
username.length() > 100) {
+log.error("login() received invalid 'username' param, redirecting 
to: " + WELCOME);
+return new Redirect(WELCOME).withParameter("failed", "true");
+}
+
+if (password.matches(HTTP_PARAM_REGEX_INVALID_CHARS) || 
password.length() > 100) {
+log.error("login() received invalid 'password' param, redirecting 
to: " + WELCOME);
+return new Redirect(WELCOME).withParameter("failed", "true");
+}
+
 if ((username == null) || (password == null) || 
username.trim().length() == 0
 || password.trim().length() == 0) {
 return new Redirect(WELCOME).withParameter("failed", "true");
@@ -221,6 +242,11 @@ final class AdminActions {
 @Action(name=EDIT_SERVICE_PARAMETERS)
 public View editServiceParameters(HttpServletRequest req) throws AxisFault 
{
 String serviceName = req.getParameter("axisService");
+if (serviceName.matches(HTTP_PARAM_REGEX_INVALID_CHARS) || 
serviceName.length() > 100) {
+log.error("editServiceParameters() received invalid 'serviceName' 
param, redirecting to: editServiceParameters.jsp");
+req.setAttribute("status", "

[axis-axis2-java-core] branch master updated: fix admin page filtering of invalid chars

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 331b767  fix admin page filtering of invalid chars
331b767 is described below

commit 331b7679d8dd5f159ec7dad881f057b8237b962d
Author: Robert Lazarski 
AuthorDate: Tue Nov 17 17:09:50 2020 -0500

fix admin page filtering of invalid chars
---
 .../java/org/apache/axis2/webapp/AdminActions.java | 86 +++---
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git 
a/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java 
b/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
index 0a261d7..9affc3c 100644
--- a/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
+++ b/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
@@ -71,7 +71,7 @@ final class AdminActions {
 private static final String ACTIVATE_SERVICE = "activateService";
 private static final String EDIT_SERVICE_PARAMETERS = 
"editServiceParameters";
 private static final String VIEW_OPERATION_SPECIFIC_CHAINS = 
"viewOperationSpecificChains";
-private static final String HTTP_PARAM_REGEX_INVALID_CHARS = 
"^[a-zA-Z0-9.\\-\\/+=@_,: ]*$";
+private static final String HTTP_PARAM_VALUE_REGEX_WHITELIST_CHARS = 
"^[a-zA-Z0-9.\\-\\/+=@,: ]*$";
 private static final String FILENAME_REGEX_INVALID_CHARS = 
"^[a-zA-Z0-9!@#$%^&{}\\[\\]()_+\\-=,.~'` ]{1,255}$";
 
 /**
@@ -120,16 +120,14 @@ final class AdminActions {
 public ActionResult welcome(HttpServletRequest req) {
 // Session fixation prevention: if there is an existing session, first 
invalidate it.
 if (req.getSession(false) != null) {
+log.debug("welcome() found an active http session, first 
invalidate it, redirecting to: " + LOGOUT);
 return new Redirect(LOGOUT);
 } else {
-String failed = req.getParameter("failed");
-if (failed.matches(HTTP_PARAM_REGEX_INVALID_CHARS)) {
-log.error("welcome() received invalid 'failed' param, 
redirecting to: " + LOGOUT);
-return new Redirect(LOGOUT);
-}
-if ("true".equals(failed)) {
+if ("true".equals(req.getParameter("failed"))) {
+log.error("welcome() received 'failed' param as true, 
redirecting to: " + LOGIN_JSP_NAME);
 req.setAttribute("errorMessage", "Invalid auth credentials!");
 }
+log.debug("welcome() returning view: " + LOGIN_JSP_NAME);
 return new View(LOGIN_JSP_NAME);
 }
 }
@@ -182,7 +180,7 @@ final class AdminActions {
 .length());
 }
 
-if 
(fileNameOnly.matches(FILENAME_REGEX_INVALID_CHARS) || fileNameOnly.length() > 
100) {
+if 
(!fileNameOnly.matches(FILENAME_REGEX_INVALID_CHARS)) {
 log.error("doUpload() received invalid 
filename, redirecting to: " + WELCOME);
 return new Redirect(UPLOAD).withStatus(false, 
"Received invalid filename");
 }
@@ -211,12 +209,12 @@ final class AdminActions {
 String username = req.getParameter("userName");
 String password = req.getParameter("password");
 
-if (username.matches(HTTP_PARAM_REGEX_INVALID_CHARS) || 
username.length() > 100) {
+if (username != null && 
!username.matches(HTTP_PARAM_VALUE_REGEX_WHITELIST_CHARS)) {
 log.error("login() received invalid 'username' param, redirecting 
to: " + WELCOME);
 return new Redirect(WELCOME).withParameter("failed", "true");
 }
 
-if (password.matches(HTTP_PARAM_REGEX_INVALID_CHARS) || 
password.length() > 100) {
+if (password != null && 
!password.matches(HTTP_PARAM_VALUE_REGEX_WHITELIST_CHARS)) {
 log.error("login() received invalid 'password' param, redirecting 
to: " + WELCOME);
 return new Redirect(WELCOME).withParameter("failed", "true");
 }
@@ -242,9 +240,15 @@ final class AdminActions {
 @Action(name=EDIT_SERVICE_PARAMETERS)
 public View editServiceParameters(HttpServletRequest req) throws AxisFault 
{
 String serviceName = req.getParameter("axisService");
-if (serviceName.matches(HTTP_PARAM_REGEX_INVALID_CHARS) || 
serviceName.length() > 100) {
- 

[axis-axis2-java-core] branch master updated: change OSGi commons-fileupload classpath to new MANIFEST.MF formt

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new fb1063e  change OSGi commons-fileupload classpath to new MANIFEST.MF 
formt
fb1063e is described below

commit fb1063eaf4da9febff95083e8de176963263f41f
Author: Robert Lazarski 
AuthorDate: Mon Nov 23 18:47:20 2020 -0500

change OSGi commons-fileupload classpath to new MANIFEST.MF formt
---
 modules/osgi-tests/src/test/java/OSGiTest.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/osgi-tests/src/test/java/OSGiTest.java 
b/modules/osgi-tests/src/test/java/OSGiTest.java
index bfe9e15..b1bb0d9 100644
--- a/modules/osgi-tests/src/test/java/OSGiTest.java
+++ b/modules/osgi-tests/src/test/java/OSGiTest.java
@@ -67,7 +67,11 @@ public class OSGiTest {
 url("link:classpath:org.apache.james.apache-mime4j-core.link"),
 
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
 
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
-url("link:classpath:org.apache.commons.fileupload.link"),
+// commons-file upload 1.4 changed the MANIFEST.MF file from:
+// Bundle-SymbolicName: org.apache.commons.fileupload
+// to:
+// Bundle-SymbolicName: org.apache.commons.commons-fileupload
+
url("link:classpath:org.apache.commons.commons-fileupload.link"),
 url("link:classpath:org.apache.commons.io.link"),
 
url("link:classpath:org.apache.servicemix.bundles.commons-httpclient.link"), // 
TODO: still necessary???
 
url("link:classpath:org.apache.servicemix.bundles.commons-codec.link"), // 
TODO: still necessary???

[axis-axis2-java-core] branch master updated: update README.txt to indicate Maven 3 instead of Maven 2

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 8f9695a  update README.txt to indicate Maven 3 instead of Maven 2
8f9695a is described below

commit 8f9695a71cf367397e1ebdd981f8bf61955b0409
Author: Robert Lazarski 
AuthorDate: Tue Nov 24 11:06:09 2020 -0500

update README.txt to indicate Maven 3 instead of Maven 2
---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 73d462d..9696f15 100644
--- a/README.txt
+++ b/README.txt
@@ -8,7 +8,7 @@ ___
 Building 
 ===
 
-We use Maven 2 (http://maven.apache.org) to build, and you'll find a
+We use Maven 3 (http://maven.apache.org) to build, and you'll find a
 pom.xml in each module, as well as at the top level.  Use "mvn install"
 (or "mvn clean install" to clean up first) to build.
 

[axis-axis2-java-core] branch master updated: AXIS2-5993 upgrade entirely to log4j2

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new f0dade9  AXIS2-5993 upgrade entirely to log4j2
f0dade9 is described below

commit f0dade92256ccecba1dd6d56dad49a50e8b5ba8e
Author: Robert Lazarski 
AuthorDate: Thu Dec 3 07:40:46 2020 -1000

AXIS2-5993 upgrade entirely to log4j2
---
 modules/distribution/pom.xml   |  8 ++-
 .../src/main/assembly/bin-assembly.xml |  2 +-
 modules/integration/pom.xml| 13 +++--
 .../axis2/engine/MessageContextSaveATest.java  |  1 -
 .../axis2/engine/MessageContextSaveBTest.java  |  1 -
 .../axis2/engine/MessageContextSaveCTest.java  |  1 -
 .../engine/MessageContextSelfManagedDataTest.java  |  1 -
 .../org/apache/axis2/engine/ObjectSave2Test.java   |  1 -
 .../org/apache/axis2/engine/ObjectSaveTest.java|  1 -
 .../axis2/engine/OperationContextSaveTest.java |  1 -
 .../org/apache/axis2/engine/OptionsSaveTest.java   |  1 -
 .../mtom/MessageSaveAndRestoreWithMTOMTest.java| 11 +++-
 modules/jaxws-integration/pom.xml  |  9 +++-
 .../xmlhttp/DispatchXMessageDataSourceTests.java   |  2 +-
 .../test-resources/log4j.properties| 60 --
 .../jaxws-integration/test-resources/log4j2.xml| 22 
 modules/jaxws/pom.xml  |  9 +++-
 modules/jaxws/test-resources/log4j.properties  | 58 -
 modules/jaxws/test-resources/log4j2.xml| 22 
 .../apache/axis2/jaxws/message/SOAP12Tests.java|  8 ++-
 modules/kernel/conf/log4j.properties   | 39 --
 modules/kernel/conf/log4j2.xml | 22 
 modules/metadata/pom.xml   |  9 +++-
 modules/metadata/test-resources/log4j.properties   | 41 ---
 modules/metadata/test-resources/log4j2.xml | 22 
 .../AnnotationProviderImplDescriptionTests.java|  7 ++-
 .../AnnotationServiceImplDescriptionTests.java |  7 ++-
 .../AnnotationServiceImplWithDBCTests.java |  1 -
 .../jaxws/description/ServiceAnnotationTests.java  |  7 ++-
 .../jaxws/description/WrapperPackageTests.java | 10 ++--
 .../converter/ReflectiveConverterTests.java|  7 ++-
 modules/saaj/pom.xml   | 13 -
 modules/saaj/test-resources/log4j.properties   | 42 ---
 modules/saaj/test-resources/log4j2.xml | 22 
 modules/samples/book/src/main/log4j.properties | 39 --
 modules/samples/book/src/main/log4j2.xml   | 44 
 .../src/webapp/WEB-INF/classes/log4j.properties| 40 ---
 .../src/webapp/WEB-INF/classes/log4j2.xml  | 44 
 .../src/webapp/WEB-INF/classes/log4j.properties| 40 ---
 .../src/webapp/WEB-INF/classes/log4j2.xml  | 44 
 .../src/test/resources/log4j.properties| 40 ---
 modules/tool/axis2-idea-plugin/pom.xml |  8 ++-
 modules/tool/axis2-wsdl2code-maven-plugin/pom.xml  |  4 +-
 .../src/test/resources/log4j.properties| 40 ---
 modules/transport/jms/pom.xml  |  2 +-
 .../org/apache/axis2/transport/jms/LogAspect.java  |  4 +-
 modules/transport/mail/pom.xml |  2 +-
 .../transport/mail/GreenMailTestEnvironment.java   |  6 +--
 .../org/apache/axis2/transport/mail/LogAspect.java |  4 +-
 modules/transport/tcp/pom.xml  |  2 +-
 modules/transport/testkit/pom.xml  | 10 
 .../axis2/transport/testkit/ManagedTestSuite.java  |  4 +-
 .../axis2/transport/testkit/axis2/LogAspect.java   | 16 +++---
 .../testkit/axis2/endpoint/AxisTestEndpoint.java   |  4 +-
 .../testkit/http/JettyByteArrayAsyncEndpoint.java  |  6 +--
 .../axis2/transport/testkit/package-info.java  |  6 +--
 .../transport/testkit/tests/ManagedTestCase.java   | 10 ++--
 .../{LogManager.java => TestKitLogManager.java}| 55 +---
 modules/webapp/pom.xml |  8 ++-
 pom.xml| 31 ---
 src/site/xdoc/docs/modules.xml |  5 --
 src/site/xdoc/docs/userguide.xml   |  2 +-
 62 files changed, 451 insertions(+), 550 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index db33dea..f08fede 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -266,8 +266,12 @@
  on our users. However, for the binary distribution, we need to
  choose one. -->
 
-log4j
-log4j
+org.apache.logging.log4j
+log

[axis-axis2-java-core] branch master updated: add log4j2.xml to axis2.war

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 8c1c8dd  add log4j2.xml to axis2.war
8c1c8dd is described below

commit 8c1c8dd4e2afe75778d4cdafb8f20825f1fb366e
Author: Robert Lazarski 
AuthorDate: Thu Dec 3 08:40:42 2020 -1000

add log4j2.xml to axis2.war
---
 modules/webapp/conf/log4j2.xml | 22 ++
 modules/webapp/pom.xml |  7 +++
 2 files changed, 29 insertions(+)

diff --git a/modules/webapp/conf/log4j2.xml b/modules/webapp/conf/log4j2.xml
new file mode 100644
index 000..6decd11
--- /dev/null
+++ b/modules/webapp/conf/log4j2.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml
index 0536371..41f5bb6 100644
--- a/modules/webapp/pom.xml
+++ b/modules/webapp/pom.xml
@@ -404,6 +404,13 @@
 servlet*.txt
 
 
+
+conf
+WEB-INF/classes
+
+*.xml
+
+
 
 
 

[axis-axis2-java-core] branch master updated (d61b082 -> 7714ef0)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from d61b082  Don't run the deploy step on forks
 add 7714ef0  update Tomcat Tribes to 10.0.2

No new revisions were added by this update.

Summary of changes:
 modules/clustering/pom.xml |  6 +++---
 .../axis2/clustering/tribes/Axis2GroupChannel.java |  5 +
 .../clustering/tribes/WkaMembershipService.java| 24 ++
 3 files changed, 32 insertions(+), 3 deletions(-)

[axis-axis2-java-core] branch master updated (7714ef0 -> 955dbaf)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 7714ef0  update Tomcat Tribes to 10.0.2
 add 8d45ed1  Bump tomcat.version from 10.0.2 to 10.0.4
 add 955dbaf  Merge remote-tracking branch 
'origin/dependabot/maven/tomcat.version-10.0.4'

No new revisions were added by this update.

Summary of changes:
 modules/clustering/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated: bump xmlbeans to 3.0.1

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new e6c5939  bump xmlbeans to 3.0.1
e6c5939 is described below

commit e6c59396d4e736ae17807bb9018b3671304fa9a6
Author: robert lazarski 
AuthorDate: Fri Mar 12 08:19:15 2021 -1000

bump xmlbeans to 3.0.1
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8bc66e5..0eecd12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -524,7 +524,7 @@
 5.3.3
 1.6.3
 2.7.2
-2.6.0
+3.0.1
 1.2
 1.4
 

[axis-axis2-java-core] 01/01: Merge remote-tracking branch 'origin/dependabot/maven/log4j2.version-2.14.1'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 5daf1bac3cd51b31cd5e3325c8f2809c2dc50b7b
Merge: e6c5939 8185af0
Author: robert lazarski 
AuthorDate: Fri Mar 12 08:40:40 2021 -1000

Merge remote-tracking branch 'origin/dependabot/maven/log4j2.version-2.14.1'

 modules/transport/testkit/pom.xml | 4 ++--
 pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[axis-axis2-java-core] branch master updated (e6c5939 -> 5daf1ba)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from e6c5939  bump xmlbeans to 3.0.1
 add 8185af0  Bump log4j2.version from 2.14.0 to 2.14.1
 new 5daf1ba  Merge remote-tracking branch 
'origin/dependabot/maven/log4j2.version-2.14.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 modules/transport/testkit/pom.xml | 4 ++--
 pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[axis-axis2-java-core] branch master updated: Add jaxbri to CodegenToolReference.xml, as pointed out on the users list it is missing

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 12acb56  Add jaxbri to CodegenToolReference.xml, as pointed out on the 
users list it is missing
12acb56 is described below

commit 12acb56ebb4dcec1e19d72b052e0ae12b2b713d8
Author: robert lazarski 
AuthorDate: Mon Apr 5 10:33:11 2021 -1000

Add jaxbri to CodegenToolReference.xml, as pointed out on the users list it 
is missing
---
 src/site/xdoc/tools/CodegenToolReference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/xdoc/tools/CodegenToolReference.xml 
b/src/site/xdoc/tools/CodegenToolReference.xml
index 8ce1272..47d3b6d 100644
--- a/src/site/xdoc/tools/CodegenToolReference.xml
+++ b/src/site/xdoc/tools/CodegenToolReference.xml
@@ -335,7 +335,7 @@ using the target namespace of the WSDL) will be used. Maps 
to the
 databindingName
 Data binding framework name. Maps to the -d option of the
 command line tool. Possible values include "adb", "xmlbeans",
-"jibx".
+"jibx","jaxbri".
 
 
 serviceName

[axis-axis2-java-core] branch master updated: AXIS2-5959 replace org.apache.commons.httpclient with org.apache.http in the json samples and unit tests

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 91be03f  AXIS2-5959 replace org.apache.commons.httpclient with 
org.apache.http in the json samples and unit tests
91be03f is described below

commit 91be03fe100c63ea7e611be08aa8510c3b29abfa
Author: robert lazarski 
AuthorDate: Wed Apr 7 09:15:48 2021 -1000

AXIS2-5959 replace org.apache.commons.httpclient with org.apache.http in 
the json samples and unit tests
---
 .../axis2/json/gson/JSONXMLStreamAPITest.java  |  6 +-
 .../test/org/apache/axis2/json/gson/UtilTest.java  | 36 
 .../json/gson/rpc/JSONRPCIntegrationTest.java  |  7 +--
 .../json/src/sample/json/client/JsonClient.java| 64 +-
 4 files changed, 66 insertions(+), 47 deletions(-)

diff --git 
a/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java 
b/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
index bb11e97..348ab23 100644
--- a/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
+++ b/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
@@ -32,8 +32,6 @@ public class JSONXMLStreamAPITest {
 public void xmlStreamAPITest()throws Exception{
 String getLibURL = server.getEndpoint("LibraryService") + "getLibrary";
 String echoLibURL = server.getEndpoint("LibraryService") + 
"echoLibrary";
-String contentType = "application/json";
-String charSet = "UTF-8";
 
 String echoLibrary = 
"{\"echoLibrary\":{\"args0\":{\"admin\":{\"address\":{\"city\":\"My 
City\",\"country\":" +
 "\"My Country\",\"street\":\"My 
Street\",\"zipCode\":\"0\"},\"age\":24,\"name\":\"micheal\"," +
@@ -67,11 +65,11 @@ public class JSONXMLStreamAPITest {
 
"{\"author\":\"Jhon_4\",\"numOfPages\":175,\"publisher\":\"Foxier\",\"reviewers\":[\"rev1\",\"rev2\","
 +
 "\"rev3\"]}],\"staff\":50}}}";
 
-String actualResponse = UtilTest.post(echoLibrary, echoLibURL, 
contentType, charSet);
+String actualResponse = UtilTest.post(echoLibrary, echoLibURL);
 Assert.assertNotNull(actualResponse);
 Assert.assertEquals(echoLibraryResponse , actualResponse);
 
-String actualRespose_2 = UtilTest.post(getLibrary, getLibURL, 
contentType, charSet);
+String actualRespose_2 = UtilTest.post(getLibrary, getLibURL);
 Assert.assertNotNull(actualRespose_2);
 Assert.assertEquals(getLibraryResponse, actualRespose_2);
 
diff --git a/modules/json/test/org/apache/axis2/json/gson/UtilTest.java 
b/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
index ac1df45..c70937b 100644
--- a/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
+++ b/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
@@ -19,26 +19,38 @@
 
 package org.apache.axis2.json.gson;
 
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.HttpEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
 
 public class UtilTest {
 
-public static String post(String jsonString, String strURL, String 
contentType, String charSet)
+public static String post(String jsonString, String strURL)
 throws IOException {
-PostMethod post = new PostMethod(strURL);
-RequestEntity entity = new StringRequestEntity(jsonString, 
contentType, charSet);
-post.setRequestEntity(entity);
-HttpClient httpclient = new HttpClient();
+HttpEntity stringEntity = new 
StringEntity(jsonString,ContentType.APPLICATION_JSON);
+   HttpPost httpPost = new HttpPost(strURL);
+httpPost.setEntity(stringEntity);
+   CloseableHttpClient httpclient = HttpClients.createDefault();
+
 try {
-int result = httpclient.executeMethod(post);
-return post.getResponseBodyAsString();
+   

[axis-axis2-java-core] branch master updated (9d0fadb -> d79b56b)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 9d0fadb  Bump jakarta.mail from 1.6.6 to 1.6.7
 add d79b56b  AXIS2-5959 remove commons-httpclient from json pom.xml

No new revisions were added by this update.

Summary of changes:
 modules/json/pom.xml | 5 -
 1 file changed, 5 deletions(-)

[axis-axis2-java-core] branch master updated (d79b56b -> 66c68a7)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from d79b56b  AXIS2-5959 remove commons-httpclient from json pom.xml
 add 66c68a7  AXIS2-5959 replace org.apache.commons.httpclient with 
org.apache.http in the integration unit tests

No new revisions were added by this update.

Summary of changes:
 modules/integration/pom.xml|  5 --
 .../axis2/mtom/EchoRawMTOMFaultReportTest.java | 96 +-
 .../org/apache/axis2/rest/RESTfulServiceTest.java  | 72 ++--
 3 files changed, 103 insertions(+), 70 deletions(-)

[axis-axis2-java-core] branch master updated (66c68a7 -> 56cf084)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 66c68a7  AXIS2-5959 replace org.apache.commons.httpclient with 
org.apache.http in the integration unit tests
 add 56cf084  AXIS2-5959 replace org.apache.commons.httpclient with 
org.apache.http in the axis2-aar-maven-plugin

No new revisions were added by this update.

Summary of changes:
 .../axis2/mtom/EchoRawMTOMFaultReportTest.java |   3 -
 modules/tool/axis2-aar-maven-plugin/pom.xml|  24 ++--
 .../org/apache/axis2/maven2/aar/DeployAarMojo.java | 125 ++---
 pom.xml|   7 +-
 4 files changed, 102 insertions(+), 57 deletions(-)

[axis-axis2-java-core] 01/03: Merge remote-tracking branch 'origin/dependabot/maven/com.sun.xml.messaging.saaj-saaj-impl-1.5.3'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 58f9705efa9b99a4cb56297c9d57fb7c2e2ac76b
Merge: 56cf084 c91e89c
Author: robert lazarski 
AuthorDate: Wed Apr 14 07:30:29 2021 -1000

Merge remote-tracking branch 
'origin/dependabot/maven/com.sun.xml.messaging.saaj-saaj-impl-1.5.3'

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] 03/03: Merge remote-tracking branch 'origin/dependabot/maven/spring.version-5.3.6'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit fd155899131fe7c87accd97e0b4dff505318e993
Merge: ca77e2f a0b8cbd
Author: robert lazarski 
AuthorDate: Wed Apr 14 07:31:39 2021 -1000

Merge remote-tracking branch 'origin/dependabot/maven/spring.version-5.3.6'

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] 02/03: Merge remote-tracking branch 'origin/dependabot/maven/jaxbri.version-2.3.4'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit ca77e2f4fdec9e1d78cb4f0be32e1a7ac551877d
Merge: 58f9705 4c17384
Author: robert lazarski 
AuthorDate: Wed Apr 14 07:31:14 2021 -1000

Merge remote-tracking branch 'origin/dependabot/maven/jaxbri.version-2.3.4'

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (56cf084 -> fd15589)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 56cf084  AXIS2-5959 replace org.apache.commons.httpclient with 
org.apache.http in the axis2-aar-maven-plugin
 add c91e89c  Bump saaj-impl from 1.5.2 to 1.5.3
 new 58f9705  Merge remote-tracking branch 
'origin/dependabot/maven/com.sun.xml.messaging.saaj-saaj-impl-1.5.3'
 add 4c17384  Bump jaxbri.version from 2.3.3 to 2.3.4
 new ca77e2f  Merge remote-tracking branch 
'origin/dependabot/maven/jaxbri.version-2.3.4'
 add a0b8cbd  Bump spring.version from 5.3.5 to 5.3.6
 new fd15589  Merge remote-tracking branch 
'origin/dependabot/maven/spring.version-5.3.6'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[axis-axis2-java-core] branch master updated (fd15589 -> 5c4fc36)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from fd15589  Merge remote-tracking branch 
'origin/dependabot/maven/spring.version-5.3.6'
 add 5c4fc36  AXIS2-5959 remove http-hc3 that contains deps to 
commons-httpclient

No new revisions were added by this update.

Summary of changes:
 modules/transport/http-hc3/pom.xml |  91 
 .../transport/http/CommonsHTTPTransportSender.java |  28 --
 .../impl/httpclient3/AxisRequestEntityImpl.java|  59 ---
 .../httpclient3/HTTPClient3TransportSender.java|  62 ---
 .../impl/httpclient3/HTTPProxcyConfigurator.java   | 465 
 .../impl/httpclient3/HTTPProxyConfigurator.java| 463 
 .../http/impl/httpclient3/HTTPSenderImpl.java  | 106 -
 .../httpclient3/HttpTransportPropertiesImpl.java   |  90 
 .../http/impl/httpclient3/RequestImpl.java | 329 --
 .../http/security/SSLProtocolSocketFactory.java|  82 
 .../http/util/HTTPProxyConfigurationUtil.java  | 478 -
 .../CommonsHTTPTransportSenderClientSideTest.java  |  84 
 .../transport/http/HTTPClient3SenderTest.java  |  31 --
 .../http/HTTPClient3TransportSenderTest.java   |  47 --
 .../axis2/transport/http/NonProxyHostTest.java |  33 --
 .../org/apache/axis2/transport/http/axis2.xml  | 156 ---
 pom.xml|   7 -
 17 files changed, 2611 deletions(-)
 delete mode 100644 modules/transport/http-hc3/pom.xml
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/AxisRequestEntityImpl.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HttpTransportPropertiesImpl.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java
 delete mode 100644 
modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java
 delete mode 100644 
modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/CommonsHTTPTransportSenderClientSideTest.java
 delete mode 100644 
modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3SenderTest.java
 delete mode 100644 
modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/HTTPClient3TransportSenderTest.java
 delete mode 100644 
modules/transport/http-hc3/src/test/java/org/apache/axis2/transport/http/NonProxyHostTest.java
 delete mode 100644 
modules/transport/http-hc3/src/test/resources/org/apache/axis2/transport/http/axis2.xml

[axis-axis2-java-core] branch master updated (5c4fc36 -> 25abbf6)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 5c4fc36  AXIS2-5959 remove http-hc3 that contains deps to 
commons-httpclient
 add 755596d  Bump jetty.version from 9.4.39.v20210325 to 9.4.40.v20210413
 add 25abbf6  Merge remote-tracking branch 
'origin/dependabot/maven/jetty.version-9.4.40.v20210413'

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (3ff7410 -> 2daebb6)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 3ff7410  Bump groovy.version from 3.0.7 to 3.0.8
 add f463d6f  AXIS2-5959 rename some unit test files from commons-http to 
httpcomponents so it's less confusing
 add 2daebb6  AXIS2-5959 rename some unit test files from commons-http to 
httpcomponents so it's less confusing

No new revisions were added by this update.

Summary of changes:
 modules/integration/pom.xml | 6 +++---
 .../test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java | 4 ++--
 ...mons-http-enabled-axis2.xml => httpcomponents-enabled-axis2.xml} | 0
 .../test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java  | 4 ++--
 .../test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java| 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename 
modules/integration/test/org/apache/axis2/engine/{commons-http-enabled-axis2.xml
 => httpcomponents-enabled-axis2.xml} (100%)

[axis-axis2-java-core] branch master updated: AXIS2-5959 comment cleanup

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 663814a  AXIS2-5959 comment cleanup
663814a is described below

commit 663814a3317411dd99c8ef0a1788993ca13f3838
Author: robert lazarski 
AuthorDate: Tue Apr 20 07:32:50 2021 -1000

AXIS2-5959 comment cleanup
---
 .../axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
 
b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
index c90c494..f8b8df9 100644
--- 
a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
+++ 
b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
@@ -50,7 +50,7 @@ public class HTTPProxyConfigurator {
 private static Log log = LogFactory.getLog(HTTPProxyConfigurator.class);
 
 /**
- * Configure HTTP Proxy settings of commons-httpclient HostConfiguration.
+ * Configure HTTP Proxy settings of httpcomponents HostConfiguration.
  * Proxy settings can be get from axis2.xml, Java proxy settings or can be
  * override through property in message context.
  * 

[axis-axis2-java-core] branch master updated: AXIS2-5959 upgrade deps in modules/samples/book/pom.xml

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new b50d708  AXIS2-5959 upgrade deps in modules/samples/book/pom.xml
b50d708 is described below

commit b50d70889cd0e726fb02833086dda5f6f87b1625
Author: robert lazarski 
AuthorDate: Thu Apr 22 06:48:21 2021 -1000

AXIS2-5959 upgrade deps in modules/samples/book/pom.xml
---
 modules/samples/book/pom.xml | 53 +++-
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/modules/samples/book/pom.xml b/modules/samples/book/pom.xml
index cbbeb1d..0febbb8 100644
--- a/modules/samples/book/pom.xml
+++ b/modules/samples/book/pom.xml
@@ -31,42 +31,43 @@
 
 javax.servlet
 javax.servlet-api
+   3.1.0
 provided
 
 
 org.apache.axis2
 axis2-kernel
-SNAPSHOT
+1.8.0-SNAPSHOT
 
 
 org.apache.axis2
 axis2-codegen
-SNAPSHOT
+1.8.0-SNAPSHOT
 
 
 org.apache.axis2
 axis2-adb
-SNAPSHOT
+1.8.0-SNAPSHOT
 
 
 org.apache.ws.commons.axiom
 axiom-api
-SNAPSHOT
+1.3.0-SNAPSHOT
 
 
 org.apache.ws.commons.axiom
 axiom-impl
-SNAPSHOT
+1.3.0-SNAPSHOT
 
 
-org.apache.ws.commons.schema
-XmlSchema
-SNAPSHOT
+org.apache.ws.xmlschema
+xmlschema-core
+2.2.5
 
 
 org.apache.neethi
 neethi
-SNAPSHOT
+3.1.2-SNAPSHOT
 
 
 commons-logging
@@ -84,9 +85,9 @@
 1.3
 
 
-woodstox
-wstx
-asl-3.2.4
+org.codehaus.woodstox
+woodstox-core-asl
+4.4.1
 
 
 stax
@@ -111,12 +112,12 @@

org.apache.axis2
axis2-transport-http
-   SNAPSHOT
+1.8.0-SNAPSHOT


org.apache.axis2
axis2-transport-local
-   SNAPSHOT
+1.8.0-SNAPSHOT

 

@@ -130,6 +131,14 @@
 
${basedir}/src/webapp
 
 
+   
+maven-compiler-plugin
+3.8.1
+
+1.8
+1.8
+
+
 
 src/main
 src/test
@@ -153,20 +162,4 @@
 
 
 
-
-
-
-ibiblio
-ibiblio maven repository
-http://ibiblio.org/maven/
-legacy
-
-
-apache
-Apache maven repository
-http://www.apache.org/dist/java-repository/
-legacy
-
-
-
 

[axis-axis2-java-core] branch master updated (b50d708 -> 45a81da)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from b50d708  AXIS2-5959 upgrade deps in modules/samples/book/pom.xml
 add 45a81da  AXIS2-5959 upgrade deps in modules/samples/book/pom.xml

No new revisions were added by this update.

Summary of changes:
 modules/samples/book/pom.xml | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

[axis-axis2-java-core] branch master updated: AXIS2-5959 rename CommonsHTTPTransportSenderTest to HTTPClient4TransportSenderTest

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 73d03aa  AXIS2-5959 rename CommonsHTTPTransportSenderTest to 
HTTPClient4TransportSenderTest
73d03aa is described below

commit 73d03aaf3d706c9b26b41a83e34f69a3d6f79934
Author: robert lazarski 
AuthorDate: Thu Apr 22 08:34:19 2021 -1000

AXIS2-5959 rename CommonsHTTPTransportSenderTest to 
HTTPClient4TransportSenderTest
---
 .../org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java | 2 +-
 ...CommonsHTTPTransportSenderTest.java => HTTPTransportSenderTest.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
 
b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
index c4a6017..913410a 100644
--- 
a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
+++ 
b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
@@ -26,7 +26,7 @@ import 
org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSend
 import org.apache.http.client.methods.HttpGet;
 
 
-public class HTTPClient4TransportSenderTest extends 
CommonsHTTPTransportSenderTest{
+public class HTTPClient4TransportSenderTest extends HTTPTransportSenderTest{
 
 @Override
 protected TransportSender getTransportSender() {
diff --git 
a/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
 
b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java
similarity index 98%
rename from 
modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
rename to 
modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java
index e60c6af..5b88f35 100644
--- 
a/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
+++ 
b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java
@@ -54,7 +54,7 @@ import org.apache.http.ProtocolVersion;
 import org.apache.http.RequestLine;
 import org.apache.http.message.BasicRequestLine;
 
-public abstract class CommonsHTTPTransportSenderTest extends TestCase  {
+public abstract class HTTPTransportSenderTest extends TestCase  {
 
 protected abstract TransportSender getTransportSender();
 

[axis-axis2-java-core] branch master updated (bbeed54 -> 723f610)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from bbeed54  Bump checksum-maven-plugin from 1.9 to 1.10
 add 723f610  AXIS2-5959 remove axis2-transport-http-hc3 from build

No new revisions were added by this update.

Summary of changes:
 modules/distribution/pom.xml | 5 -
 modules/webapp/pom.xml   | 5 -
 2 files changed, 10 deletions(-)

[axis-axis2-java-core] 02/02: AXIS2-5998 Fix MTOM related issue

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 11f2e04c98439993e625aa01fc5c7d583e7aa847
Author: Robert Lazarski 
AuthorDate: Thu May 6 22:33:35 2021 -0400

AXIS2-5998 Fix MTOM related issue
---
 .../apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
 
b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
index 47f3a57..a89d5da 100644
--- 
a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
+++ 
b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
@@ -448,6 +448,8 @@
org.apache.axis2.context.MessageContext _returnMessageContext = 
_operationClient.getMessageContext(

org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
 org.apache.axiom.soap.SOAPEnvelope _returnEnv = 
_returnMessageContext.getEnvelope();
+_returnEnv.buildWithAttachments();
+
 
 
 

[axis-axis2-java-core] branch master updated (723f610 -> 11f2e04)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 723f610  AXIS2-5959 remove axis2-transport-http-hc3 from build
 new 6640769  release note updates
 new 11f2e04  AXIS2-5998 Fix MTOM related issue

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl| 2 ++
 src/site/markdown/release-notes/1.8.0.md| 6 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

[axis-axis2-java-core] 01/02: release note updates

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 66407693606d11ec26b6c41b4cf93d07573cb063
Author: Robert Lazarski 
AuthorDate: Thu May 6 21:59:12 2021 -0400

release note updates
---
 src/site/markdown/release-notes/1.8.0.md | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/site/markdown/release-notes/1.8.0.md 
b/src/site/markdown/release-notes/1.8.0.md
index 1a4667b..a9c8448 100644
--- a/src/site/markdown/release-notes/1.8.0.md
+++ b/src/site/markdown/release-notes/1.8.0.md
@@ -1,11 +1,9 @@
 Apache Axis2 1.8.0 Release Note
 ---
 
-*   The minimum required Java version for Axis2 has been changed to Java 7.
+*   The minimum required Java version for Axis2 has been changed to Java 8.
 
-*   The Apache Commons HttpClient 3.x based HTTP transport has been deprecated.
-If you wish to continue using this transport, add 
`axis2-transport-http-hc3`
-to your project.
+*   The Apache Commons HttpClient 3.x based HTTP transport has been removed.
 
 *   The HTTPClient 4.x based transport has been upgraded to use the APIs 
supported
 by the latest HTTPClient version.

[axis-axis2-java-core] branch master updated (a0b2f76 -> 57c32e7)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from a0b2f76  Bump jacoco-maven-plugin from 0.8.6 to 0.8.7
 new 58e171e  AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot 
be found'
 new 57c32e7  AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot 
be found'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java  | 7 +--
 .../http/src/org/apache/axis2/transport/http/AxisServlet.java  | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

[axis-axis2-java-core] 01/02: AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 58e171ee40da02adae303ab171189ceb5b82f4dc
Author: Robert Lazarski 
AuthorDate: Wed May 12 12:09:21 2021 -0400

AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'
---
 modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java  | 7 +--
 .../http/src/org/apache/axis2/transport/http/AxisServlet.java  | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java 
b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
index f096883..148470c 100644
--- a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
+++ b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
@@ -45,6 +45,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -67,7 +68,7 @@ public class DispatchPhase extends Phase {
Boolean disableAck = (Boolean) 
msgContext.getProperty(Constants.Configuration.DISABLE_RESPONSE_ACK);
if(disableAck == null) {
   disableAck = (Boolean) (msgContext.getAxisService() != null ? 
msgContext.getAxisService().getParameterValue(Constants.Configuration.DISABLE_RESPONSE_ACK)
 : null);
-   }
+   }

return disableAck;
 }
@@ -79,6 +80,8 @@ public class DispatchPhase extends Phase {
 AxisFault fault = new 
AxisFault(Messages.getMessage("servicenotfoundforepr",
 ((toEPR != null) ? 
toEPR.getAddress() : "")));
 
fault.setFaultCode(org.apache.axis2.namespace.Constants.FAULT_CLIENT);
+Integer not_found = HttpServletResponse.SC_NOT_FOUND;
+msgContext.setProperty(Constants.HTTP_RESPONSE_STATE, 
not_found.toString());
 throw fault;
 }
 
@@ -403,4 +406,4 @@ public class DispatchPhase extends Phase {
 || mepString.equals(WSDL2Constants.MEP_URI_IN_ONLY));
 }
 
-}
\ No newline at end of file
+}
diff --git 
a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java 
b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
index 1d8eed9..603ec95 100644
--- 
a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
+++ 
b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
@@ -392,9 +392,12 @@ public class AxisServlet extends HttpServlet {
 String status =
 (String) 
msgContext.getProperty(Constants.HTTP_RESPONSE_STATE);
 if (status == null) {
+log.error("processAxisFault() found null HTTP status from 
the MessageContext instance, setting HttpServletResponse status to: " + 
Constants.HTTP_RESPONSE_STATE);
 
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 } else {
+log.error("processAxisFault() found HTTP status from the 
MessageContext instance, setting HttpServletResponse status to: " + status);
 res.setStatus(Integer.parseInt(status));
+return;
 }
 
 AxisBindingOperation axisBindingOperation =

[axis-axis2-java-core] 02/02: AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 57c32e791bc248958ecd2bf67a687fbd86070f0f
Author: Robert Lazarski 
AuthorDate: Wed May 12 12:14:09 2021 -0400

AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'
---
 .../http/src/org/apache/axis2/transport/http/AxisServlet.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java 
b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
index 603ec95..c33db35 100644
--- 
a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
+++ 
b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
@@ -392,10 +392,10 @@ public class AxisServlet extends HttpServlet {
 String status =
 (String) 
msgContext.getProperty(Constants.HTTP_RESPONSE_STATE);
 if (status == null) {
-log.error("processAxisFault() found null HTTP status from 
the MessageContext instance, setting HttpServletResponse status to: " + 
Constants.HTTP_RESPONSE_STATE);
+log.error("processAxisFault() found a null HTTP status 
from the MessageContext instance, setting HttpServletResponse status to: " + 
Constants.HTTP_RESPONSE_STATE);
 
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 } else {
-log.error("processAxisFault() found HTTP status from the 
MessageContext instance, setting HttpServletResponse status to: " + status);
+log.error("processAxisFault() found an HTTP status from 
the MessageContext instance, setting HttpServletResponse status to: " + status);
 res.setStatus(Integer.parseInt(status));
 return;
 }

[axis-axis2-java-core] branch master updated: AXIS2-5999 fix unit tests

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 93d54be  AXIS2-5999 fix unit tests
93d54be is described below

commit 93d54beb5186803ea7dcb4a806c88d9ae2ea774f
Author: Robert Lazarski 
AuthorDate: Wed May 12 13:25:25 2021 -0400

AXIS2-5999 fix unit tests
---
 .../transport/http/src/org/apache/axis2/transport/http/HTTPSender.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java 
b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
index 0465705..04c7443 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
@@ -204,7 +204,7 @@ public abstract class HTTPSender {
 processResponse = true;
 fault = false;
 } else if (statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR
-   || statusCode == HttpStatus.SC_BAD_REQUEST) {
+   || statusCode == HttpStatus.SC_BAD_REQUEST || 
statusCode == HttpStatus.SC_NOT_FOUND) {
 processResponse = true;
 fault = true;
 } else {

[axis-axis2-java-core] branch master updated (93d54be -> c7337a0)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 93d54be  AXIS2-5999 fix unit tests
 add 3fa3348  Bump wsimport-maven-plugin from 0.2.1 to 0.2.2
 add c7337a0  Merge pull request #156 from 
apache/dependabot/maven/com.github.veithen.maven-wsimport-maven-plugin-0.2.2

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated: AP-6003 Add Moshi support for JSON

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 9dc3bf8  AP-6003 Add Moshi support for JSON
9dc3bf8 is described below

commit 9dc3bf8bd2689295476c68936ad7069181f455b4
Author: Robert Lazarski 
AuthorDate: Thu Jun 17 20:24:29 2021 -0400

AP-6003 Add Moshi support for JSON
---
 modules/json/src/org/apache/axis2/json/moshi/JsonBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/json/src/org/apache/axis2/json/moshi/JsonBuilder.java 
b/modules/json/src/org/apache/axis2/json/moshi/JsonBuilder.java
index 06c6bd1..9a76f00 100644
--- a/modules/json/src/org/apache/axis2/json/moshi/JsonBuilder.java
+++ b/modules/json/src/org/apache/axis2/json/moshi/JsonBuilder.java
@@ -48,7 +48,7 @@ public class JsonBuilder implements Builder {
 if (inputStream != null) {
 try {
 charSetEncoding = (String) 
messageContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
-if (charSetEncoding != null && 
charSetEncoding.indexOf("UTF-8") != -1) {
+if (charSetEncoding != null && 
charSetEncoding.indexOf("UTF-8") == -1) {
 log.warn("JsonBuilder.processDocument() detected encoding 
that is not UTF-8: " +charSetEncoding+ " , Moshi JsonReader internally invokes 
new JsonUtf8Reader()");
 }
 BufferedSource source = Okio.buffer(Okio.source(inputStream));

[axis-axis2-java-core] branch master updated: AP-6003 fix Moshi unit tests

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 012ffc1  AP-6003 fix Moshi unit tests
012ffc1 is described below

commit 012ffc1290511b3bc8d6175c6411d7e52a90e490
Author: Robert Lazarski 
AuthorDate: Fri Jun 18 04:31:44 2021 -1000

AP-6003 fix Moshi unit tests
---
 .../test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java 
b/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
index 8d2a2f3..6ac0824 100644
--- 
a/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
+++ 
b/modules/json/test/org/apache/axis2/json/moshi/rpc/JSONRPCIntegrationTest.java
@@ -33,7 +33,9 @@ public class JSONRPCIntegrationTest {
 public void testJsonRpcMessageReceiver() throws Exception {
 String jsonRequest = 
"{\"echoPerson\":[{\"arg0\":{\"name\":\"Simon\",\"age\":\"35\",\"gender\":\"male\"}}]}";
 String echoPersonUrl = server.getEndpoint("JSONPOJOService") + 
"echoPerson";
-String expectedResponse = 
"{\"response\":{\"name\":\"Simon\",\"age\":\"35\",\"gender\":\"male\"}}";
+   // moshi uses alphabetical order, not field declaration order like gson
+// String expectedResponse = 
"{\"response\":{\"name\":\"Simon\",\"age\":\"35\",\"gender\":\"male\"}}";
+String expectedResponse = 
"{\"response\":{\"age\":\"35\",\"gender\":\"male\",\"name\":\"Simon\"}}";
 String response = UtilTest.post(jsonRequest, echoPersonUrl);
 Assert.assertNotNull(response);
 Assert.assertEquals(expectedResponse , response);

[axis-axis2-java-core] branch master updated: AP-6003 fix Moshi unit tests

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new ad92e7d  AP-6003 fix Moshi unit tests
ad92e7d is described below

commit ad92e7df2b05e423d8231bb6b0875b387aebbac9
Author: Robert Lazarski 
AuthorDate: Fri Jun 18 04:35:14 2021 -1000

AP-6003 fix Moshi unit tests
---
 .../JSONPOJOService.aar/META-INF/services.xml  | 27 ++
 1 file changed, 27 insertions(+)

diff --git 
a/modules/json/test-repository/moshi/services/JSONPOJOService.aar/META-INF/services.xml
 
b/modules/json/test-repository/moshi/services/JSONPOJOService.aar/META-INF/services.xml
new file mode 100644
index 000..03340f2
--- /dev/null
+++ 
b/modules/json/test-repository/moshi/services/JSONPOJOService.aar/META-INF/services.xml
@@ -0,0 +1,27 @@
+
+
+
+POJO Service which expose to process under JSON 
requests
+
+http://www.w3.org/ns/wsdl/in-only"; 
class="org.apache.axis2.json.moshi.rpc.JsonInOnlyRPCMessageReceiver"/>
+http://www.w3.org/ns/wsdl/in-out"; 
class="org.apache.axis2.json.moshi.rpc.JsonRpcMessageReceiver"/>
+
+org.apache.axis2.json.moshi.rpc.JSONPOJOService
+

[axis-axis2-java-core] branch master updated: AP-6003 create org.apache.axis2.json.factory and use it for gson and moshi

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 31a0571  AP-6003 create org.apache.axis2.json.factory and use it for 
gson and moshi
31a0571 is described below

commit 31a057183d33de7faab4b5ad168d24b9c4fb718b
Author: Robert Lazarski 
AuthorDate: Fri Jun 18 05:01:45 2021 -1000

AP-6003 create org.apache.axis2.json.factory and use it for gson and moshi
---
 .../axis2/json/{gson => }/factory/JSONType.java|   2 +-
 .../json/{moshi => }/factory/JsonConstant.java |   2 +-
 .../axis2/json/{gson => }/factory/JsonObject.java  |   2 +-
 .../axis2/json/{gson => }/factory/XmlNode.java |   2 +-
 .../json/{gson => }/factory/XmlNodeGenerator.java  |   2 +-
 .../axis2/json/gson/GsonXMLStreamReader.java   |  10 +-
 .../axis2/json/gson/GsonXMLStreamWriter.java   |  10 +-
 .../apache/axis2/json/gson/JSONMessageHandler.java |   2 +-
 .../org/apache/axis2/json/gson/JsonBuilder.java|   2 +-
 .../org/apache/axis2/json/gson/JsonFormatter.java  |   2 +-
 .../axis2/json/gson/factory/JsonConstant.java  |  42 -
 .../gson/rpc/JsonInOnlyRPCMessageReceiver.java |   2 +-
 .../json/gson/rpc/JsonRpcMessageReceiver.java  |   2 +-
 .../axis2/json/moshi/JSONMessageHandler.java   |   2 +-
 .../org/apache/axis2/json/moshi/JsonBuilder.java   |   2 +-
 .../org/apache/axis2/json/moshi/JsonFormatter.java |   2 +-
 .../axis2/json/moshi/MoshiXMLStreamReader.java |  10 +-
 .../axis2/json/moshi/MoshiXMLStreamWriter.java |  10 +-
 .../apache/axis2/json/moshi/factory/JSONType.java  |  27 ---
 .../axis2/json/moshi/factory/JsonObject.java   |  51 -
 .../apache/axis2/json/moshi/factory/XmlNode.java   |  71 ---
 .../axis2/json/moshi/factory/XmlNodeGenerator.java | 206 -
 .../moshi/rpc/JsonInOnlyRPCMessageReceiver.java|   2 +-
 .../json/moshi/rpc/JsonRpcMessageReceiver.java |   2 +-
 .../{gson => }/factory/XmlNodeGeneratorTest.java   |   2 +-
 .../axis2/json/gson/JSONMessageHandlerTest.java|   2 +-
 .../apache/axis2/json/gson/JsonBuilderTest.java|   2 +-
 .../apache/axis2/json/gson/JsonFormatterTest.java  |   2 +-
 .../axis2/json/moshi/JSONMessageHandlerTest.java   |   2 +-
 .../apache/axis2/json/moshi/JsonBuilderTest.java   |   2 +-
 .../apache/axis2/json/moshi/JsonFormatterTest.java |   2 +-
 .../json/moshi/factory/XmlNodeGeneratorTest.java   | 107 ---
 32 files changed, 42 insertions(+), 546 deletions(-)

diff --git a/modules/json/src/org/apache/axis2/json/gson/factory/JSONType.java 
b/modules/json/src/org/apache/axis2/json/factory/JSONType.java
similarity index 95%
rename from modules/json/src/org/apache/axis2/json/gson/factory/JSONType.java
rename to modules/json/src/org/apache/axis2/json/factory/JSONType.java
index b9ad859..8ecfe3e 100644
--- a/modules/json/src/org/apache/axis2/json/gson/factory/JSONType.java
+++ b/modules/json/src/org/apache/axis2/json/factory/JSONType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.json.gson.factory;
+package org.apache.axis2.json.factory;
 
 public enum JSONType {
 ARRAY,
diff --git 
a/modules/json/src/org/apache/axis2/json/moshi/factory/JsonConstant.java 
b/modules/json/src/org/apache/axis2/json/factory/JsonConstant.java
similarity index 96%
rename from 
modules/json/src/org/apache/axis2/json/moshi/factory/JsonConstant.java
rename to modules/json/src/org/apache/axis2/json/factory/JsonConstant.java
index 3f887b4..9effd08 100644
--- a/modules/json/src/org/apache/axis2/json/moshi/factory/JsonConstant.java
+++ b/modules/json/src/org/apache/axis2/json/factory/JsonConstant.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.json.moshi.factory;
+package org.apache.axis2.json.factory;
 
 
 public class JsonConstant {
diff --git 
a/modules/json/src/org/apache/axis2/json/gson/factory/JsonObject.java 
b/modules/json/src/org/apache/axis2/json/factory/JsonObject.java
similarity index 97%
rename from modules/json/src/org/apache/axis2/json/gson/factory/JsonObject.java
rename to modules/json/src/org/apache/axis2/json/factory/JsonObject.java
index d3d1c05..d65ea52 100644
--- a/modules/json/src/org/apache/axis2/json/gson/factory/JsonObject.java
+++ b/modules/json/src/org/apache/axis2/json/factory/JsonObject.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.json.gson.factory;
+package org.apache.axis2.json.factory;
 
 
 public class JsonObject {
diff --git a/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java 
b/modules/json/src/org/apache/axis2/json/factory/XmlNode.java
similarity index 97%
rename from modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
rename to modules/json/src/org/apache/axis2/json/factory/XmlNode.java
index fc2d3c9..a2e6d1d 100644
--- a/modules/j

[axis-axis2-java-core] branch master updated (31a0571 -> d269308)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 31a0571  AP-6003 create org.apache.axis2.json.factory and use it for 
gson and moshi
 add 66ec45a  Bump moshi-adapters from 1.11.0 to 1.12.0
 add d269308  Merge pull request #177 from 
apache/dependabot/maven/com.squareup.moshi-moshi-adapters-1.12.0

No new revisions were added by this update.

Summary of changes:
 modules/json/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated: bump another moshi dep to latest, that dependabot missed

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 3b9bcdf  bump another moshi dep to latest, that dependabot missed
3b9bcdf is described below

commit 3b9bcdf9ad8183bea9018c79a462ccbaadd3a24c
Author: Robert Lazarski 
AuthorDate: Fri Jun 18 11:43:50 2021 -0400

bump another moshi dep to latest, that dependabot missed
---
 modules/json/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 367afd7..a662603 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -70,7 +70,7 @@
 
 com.squareup.moshi
 moshi
-1.11.0
+1.12.0
 
 
 com.squareup.moshi

[axis-axis2-java-core] 01/01: Merge pull request #176 from apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 07e77802c51390649d3fdc4a8b17acc3fd28e12f
Merge: 3b9bcdf aa14e21
Author: robertlazarski <58150512+robertlazar...@users.noreply.github.com>
AuthorDate: Fri Jun 18 05:46:26 2021 -1000

Merge pull request #176 from 
apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0

Bump moshi from 1.11.0 to 1.12.0

[axis-axis2-java-core] branch master updated (3b9bcdf -> 07e7780)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 3b9bcdf  bump another moshi dep to latest, that dependabot missed
 add aa14e21  Bump moshi from 1.11.0 to 1.12.0
 new 07e7780  Merge pull request #176 from 
apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[axis-axis2-java-core] branch master updated (07e7780 -> d292b02)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 07e7780  Merge pull request #176 from 
apache/dependabot/maven/com.squareup.moshi-moshi-1.12.0
 add aa4f87a  Bump jetty.version from 9.4.41.v20210516 to 9.4.42.v20210604
 add d292b02  Merge pull request #167 from 
apache/dependabot/maven/jetty.version-9.4.42.v20210604

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated: AXIS2-5807 remove class reference that doesn't exist, org.apache.axis2.corba.receivers.CorbaInOutAsyncMessageReceiver

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 90494aa  AXIS2-5807 remove class reference that doesn't exist, 
org.apache.axis2.corba.receivers.CorbaInOutAsyncMessageReceiver
90494aa is described below

commit 90494aabd51436b83ded291875d8e890ae52d0f7
Author: Robert Lazarski 
AuthorDate: Sat Jun 19 05:24:20 2021 -1000

AXIS2-5807 remove class reference that doesn't exist, 
org.apache.axis2.corba.receivers.CorbaInOutAsyncMessageReceiver
---
 modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java 
b/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
index 08230cb..2dccd5e 100644
--- a/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
+++ b/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
@@ -272,8 +272,6 @@ public class CorbaDeployer extends AbstractDeployer 
implements DeploymentConstan
 loadMessageReceiver(loader, 
"org.apache.axis2.corba.receivers.CorbaInOnlyMessageReceiver"));
 service.addMessageReceiver("http://www.w3.org/ns/wsdl/in-out";,
 loadMessageReceiver(loader, 
"org.apache.axis2.corba.receivers.CorbaMessageReceiver"));
-service.addMessageReceiver("http://www.w3.org/ns/wsdl/in-opt-out";,
-loadMessageReceiver(loader, 
"org.apache.axis2.corba.receivers.CorbaInOutAsyncMessageReceiver"));
 
 if (messageReceiver != null) {
 HashMap mrs = processMessageReceivers(loader, messageReceiver);

[axis-axis2-java-core] branch master updated: update broken link in release docs

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 0d382eb  update broken link in release docs
0d382eb is described below

commit 0d382eb7579f27c107071c1d1f8a706a80355635
Author: Robert Lazarski 
AuthorDate: Fri Jul 9 06:21:43 2021 -1000

update broken link in release docs
---
 src/site/markdown/release-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/markdown/release-process.md 
b/src/site/markdown/release-process.md
index 770c716..42d4ace 100644
--- a/src/site/markdown/release-process.md
+++ b/src/site/markdown/release-process.md
@@ -204,7 +204,7 @@ In order to prepare the release artifacts for vote, execute 
the following steps:
 If the vote passes, execute the following steps:
 
 1.  Promote the artifacts in the staging repository. See
-
[here](https://docs.sonatype.org/display/Repository/Releasing+a+Staging+Repository)
+
[here](https://central.sonatype.org/publish/release/#close-and-drop-or-release-your-staging-repository)
 for detailed instructions for this step.
 
 2.  Publish the distributions:

[axis-axis2-java-core] branch master updated (0d382eb -> 3f1eb9f)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 0d382eb  update broken link in release docs
 add 3f1eb9f  in prep for the next release, don't use snapshot versions of 
Apache ws-* projects

No new revisions were added by this update.

Summary of changes:
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[axis-axis2-java-core] 01/01: Merge pull request #193 from apache/dependabot/maven/commons-io-commons-io-2.11.0

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 5766b43d4fbcb1c70ef53440c97ce47460c840ce
Merge: 3f1eb9f c612600
Author: robertlazarski <58150512+robertlazar...@users.noreply.github.com>
AuthorDate: Wed Jul 14 08:23:15 2021 -1000

Merge pull request #193 from 
apache/dependabot/maven/commons-io-commons-io-2.11.0

Bump commons-io from 2.10.0 to 2.11.0

 modules/samples/transport/jms-sample/jmsService/pom.xml | 2 +-
 pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[axis-axis2-java-core] branch master updated (3f1eb9f -> 5766b43)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 3f1eb9f  in prep for the next release, don't use snapshot versions of 
Apache ws-* projects
 add c612600  Bump commons-io from 2.10.0 to 2.11.0
 new 5766b43  Merge pull request #193 from 
apache/dependabot/maven/commons-io-commons-io-2.11.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 modules/samples/transport/jms-sample/jmsService/pom.xml | 2 +-
 pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[axis-axis2-java-core] branch master updated (5766b43 -> 157c069)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 5766b43  Merge pull request #193 from 
apache/dependabot/maven/commons-io-commons-io-2.11.0
 add ad80767  Bump spring.version from 5.3.8 to 5.3.9
 add 157c069  Merge pull request #191 from 
apache/dependabot/maven/spring.version-5.3.9

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (157c069 -> 973f271)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 157c069  Merge pull request #191 from 
apache/dependabot/maven/spring.version-5.3.9
 add 410eeeb  Bump ant.version from 1.10.10 to 1.10.11
 add 973f271  Merge pull request #190 from 
apache/dependabot/maven/ant.version-1.10.11

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (973f271 -> 0cd4745)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 973f271  Merge pull request #190 from 
apache/dependabot/maven/ant.version-1.10.11
 add 439c8ea  Bump jetty.version from 9.4.42.v20210604 to 9.4.43.v20210629
 add 0cd4745  Merge pull request #187 from 
apache/dependabot/maven/jetty.version-9.4.43.v20210629

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (0cd4745 -> eff21e5)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 0cd4745  Merge pull request #187 from 
apache/dependabot/maven/jetty.version-9.4.43.v20210629
 add 09801e8  Bump checksum-maven-plugin from 1.10 to 1.11
 add eff21e5  Merge pull request #186 from 
apache/dependabot/maven/net.nicoulaj.maven.plugins-checksum-maven-plugin-1.11

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] 01/01: Merge pull request #185 from apache/dependabot/maven/tomcat.version-10.0.8

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 57337aaaf6747359a7b58086d74f85ec8d972bb9
Merge: eff21e5 7768932
Author: robertlazarski <58150512+robertlazar...@users.noreply.github.com>
AuthorDate: Wed Jul 14 08:26:47 2021 -1000

Merge pull request #185 from apache/dependabot/maven/tomcat.version-10.0.8

Bump tomcat.version from 10.0.7 to 10.0.8

 modules/clustering/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (eff21e5 -> 57337aa)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from eff21e5  Merge pull request #186 from 
apache/dependabot/maven/net.nicoulaj.maven.plugins-checksum-maven-plugin-1.11
 add 7768932  Bump tomcat.version from 10.0.7 to 10.0.8
 new 57337aa  Merge pull request #185 from 
apache/dependabot/maven/tomcat.version-10.0.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 modules/clustering/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (57337aa -> d647847)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 57337aa  Merge pull request #185 from 
apache/dependabot/maven/tomcat.version-10.0.8
 add 01c25cb  Bump aspectj.version from 1.9.6 to 1.9.7
 add d647847  Merge pull request #184 from 
apache/dependabot/maven/aspectj.version-1.9.7

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (d647847 -> c0e4c80)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from d647847  Merge pull request #184 from 
apache/dependabot/maven/aspectj.version-1.9.7
 add 04c6a63  Bump mockito-core from 3.11.1 to 3.11.2
 add c0e4c80  Merge pull request #183 from 
apache/dependabot/maven/org.mockito-mockito-core-3.11.2

No new revisions were added by this update.

Summary of changes:
 modules/jaxws/pom.xml | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[axis-axis2-java-core] branch master updated (c0e4c80 -> 4921530)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from c0e4c80  Merge pull request #183 from 
apache/dependabot/maven/org.mockito-mockito-core-3.11.2
 add 554a533  Bump org.apache.felix.framework from 7.0.0 to 7.0.1
 add 4921530  Merge pull request #182 from 
apache/dependabot/maven/org.apache.felix-org.apache.felix.framework-7.0.1

No new revisions were added by this update.

Summary of changes:
 modules/osgi-tests/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[axis-axis2-java-core] branch master updated (4921530 -> 2cbed4f)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from 4921530  Merge pull request #182 from 
apache/dependabot/maven/org.apache.felix-org.apache.felix.framework-7.0.1
 add e338d5e  use HTML encoding on JSON return strings ... starting with 
the GSON implementation
 add 2cbed4f  add legal/owasp-java-encoder-LICENSE.txt which is BSD clause 2

No new revisions were added by this update.

Summary of changes:
 legal/owasp-java-encoder-LICENSE.txt   | 33 ++
 modules/json/pom.xml   |  5 
 .../org/apache/axis2/json/gson/JsonFormatter.java  |  6 +++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 legal/owasp-java-encoder-LICENSE.txt

[axis-axis2-java-core] branch master updated: JSON, make sure the messageName that starts the JSON String passed in via the client matches the Axis2 server operation name defined in the service class

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 620d35f  JSON, make sure the messageName that starts the JSON String 
passed in via the client matches the Axis2 server operation name defined in the 
service class
620d35f is described below

commit 620d35fd7e6e5926a2089212b189de7cfd325f2b
Author: Robert Lazarski 
AuthorDate: Sun Jul 18 17:12:03 2021 -0400

JSON, make sure the messageName that starts the JSON String passed in via 
the client matches the Axis2 server operation name defined in the service class
---
 .../src/org/apache/axis2/json/gson/GsonXMLStreamReader.java |  1 +
 .../src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java |  5 +
 .../src/org/apache/axis2/json/gson/JSONMessageHandler.java  | 13 ++---
 .../json/src/org/apache/axis2/json/gson/JsonBuilder.java|  1 +
 .../json/src/org/apache/axis2/json/gson/JsonFormatter.java  |  1 +
 .../axis2/json/gson/rpc/JsonInOnlyRPCMessageReceiver.java   |  1 +
 .../json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java  |  7 +++
 .../src/org/apache/axis2/json/moshi/JSONMessageHandler.java | 11 ---
 .../json/src/org/apache/axis2/json/moshi/JsonBuilder.java   |  1 +
 .../json/src/org/apache/axis2/json/moshi/JsonFormatter.java |  1 +
 .../org/apache/axis2/json/moshi/MoshiXMLStreamReader.java   |  1 +
 .../org/apache/axis2/json/moshi/MoshiXMLStreamWriter.java   |  1 +
 .../axis2/json/moshi/rpc/JsonInOnlyRPCMessageReceiver.java  |  1 +
 .../json/src/org/apache/axis2/json/moshi/rpc/JsonUtils.java |  4 
 .../dispatchers/RequestURIBasedOperationDispatcher.java |  2 +-
 15 files changed, 36 insertions(+), 15 deletions(-)

diff --git 
a/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java 
b/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
index 3823546..9184ce6 100644
--- a/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
+++ b/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
@@ -133,6 +133,7 @@ public class GsonXMLStreamReader implements XMLStreamReader 
{
 newNodeMap.put(elementQname, mainXmlNode);
 configContext.setProperty(JsonConstant.XMLNODES, newNodeMap);
 }
+log.debug("GsonXMLStreamReader.process() completed");
 isProcessed = true;
 }
 
diff --git 
a/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java 
b/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
index 95646b1..2890a90 100644
--- a/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
+++ b/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
@@ -26,6 +26,8 @@ import org.apache.axis2.json.factory.JsonConstant;
 import org.apache.axis2.json.factory.JsonObject;
 import org.apache.axis2.json.factory.XmlNode;
 import org.apache.axis2.json.factory.XmlNodeGenerator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.ws.commons.schema.XmlSchema;
 
 import javax.xml.namespace.NamespaceContext;
@@ -43,6 +45,8 @@ import java.util.Stack;
 
 public class GsonXMLStreamWriter implements XMLStreamWriter {
 
+private static final Log log = 
LogFactory.getLog(GsonXMLStreamWriter.class);
+
 private JsonWriter jsonWriter;
 
 /**
@@ -125,6 +129,7 @@ public class GsonXMLStreamWriter implements XMLStreamWriter 
{
 }
 isProcessed = true;
 this.jsonWriter.beginObject();
+log.debug("GsonXMLStreamWriter.process() completed");
 }
 
 
diff --git 
a/modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java 
b/modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java
index 4a75d95..7cee12a 100644
--- a/modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java
+++ b/modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java
@@ -65,12 +65,15 @@ public class JSONMessageHandler extends AbstractHandler {
 public InvocationResponse invoke(MessageContext msgContext) throws 
AxisFault {
 AxisOperation axisOperation = msgContext.getAxisOperation();
 if (axisOperation != null) {
+log.debug("Axis operation has been found from the MessageContext, 
proceeding with the JSON request");
 MessageReceiver messageReceiver = 
axisOperation.getMessageReceiver();
 if (messageReceiver instanceof JsonRpcMessageReceiver || 
messageReceiver instanceof JsonInOnlyRPCMessageReceiver) {
 // do not need to parse XMLSchema list, as  this message 
receiver will not use GsonXMLStreamReader  to read the inputStream.
 } else {
+log.debug("JSON MessageReceiver found, proceeding with the 
JSON request");
 

[axis-axis2-java-core] branch master updated: use HTML encoding on JSON return strings ... starting with the GSON implementation

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new f767197  use HTML encoding on JSON return strings ... starting with 
the GSON implementation
f767197 is described below

commit f767197673a67d3355ed2a4f856e52b26c1d82ec
Author: Robert Lazarski 
AuthorDate: Sun Jul 18 17:37:51 2021 -0400

use HTML encoding on JSON return strings ... starting with the GSON 
implementation
---
 .../axis2/json/gson/JsonHtmlXssSerializer.java | 39 ++
 1 file changed, 39 insertions(+)

diff --git 
a/modules/json/src/org/apache/axis2/json/gson/JsonHtmlXssSerializer.java 
b/modules/json/src/org/apache/axis2/json/gson/JsonHtmlXssSerializer.java
new file mode 100644
index 000..619c1ae
--- /dev/null
+++ b/modules/json/src/org/apache/axis2/json/gson/JsonHtmlXssSerializer.java
@@ -0,0 +1,39 @@
+/*
+ * 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.axis2.json.gson;
+
+import org.owasp.encoder.Encode;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+
+public class JsonHtmlXssSerializer implements JsonSerializer {
+
+   @Override
+   public JsonElement serialize(String src, Type typeOfSrc,
+   JsonSerializationContext context) {
+
+   return new JsonPrimitive(Encode.forHtmlContent(src));
+
+   }
+}

[axis-axis2-java-core] branch master updated: use HTML encoding on JSON return strings, with the Moshi implementation also

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new a0c5e60  use HTML encoding on JSON return strings, with the Moshi 
implementation also
a0c5e60 is described below

commit a0c5e6040ef9e87d050da6237852e034548d5cb4
Author: Robert Lazarski 
AuthorDate: Sun Jul 18 18:30:43 2021 -0400

use HTML encoding on JSON return strings, with the Moshi implementation also
---
 .../org/apache/axis2/json/moshi/JsonFormatter.java |  2 +-
 .../axis2/json/moshi/JsonHtmlXssSerializer.java| 48 ++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java 
b/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java
index 5785849..941451e 100644
--- a/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java
+++ b/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java
@@ -60,7 +60,7 @@ public class JsonFormatter implements MessageFormatter {
 String msg;
 
 try {
-Moshi moshi = new Moshi.Builder().add(Date.class, new 
Rfc3339DateJsonAdapter()).build();
+Moshi moshi = new Moshi.Builder().add(String.class, new 
JsonHtmlXssSerializer()).add(Date.class, new Rfc3339DateJsonAdapter()).build();
 JsonAdapter adapter = moshi.adapter(Object.class);
 BufferedSink sink = Okio.buffer(Okio.sink(outputStream));
 jsonWriter = JsonWriter.of(sink);
diff --git 
a/modules/json/src/org/apache/axis2/json/moshi/JsonHtmlXssSerializer.java 
b/modules/json/src/org/apache/axis2/json/moshi/JsonHtmlXssSerializer.java
new file mode 100644
index 000..241a96e
--- /dev/null
+++ b/modules/json/src/org/apache/axis2/json/moshi/JsonHtmlXssSerializer.java
@@ -0,0 +1,48 @@
+/*
+ * 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.axis2.json.moshi;
+
+import com.squareup.moshi.JsonAdapter;
+import com.squareup.moshi.JsonReader;
+import com.squareup.moshi.JsonWriter;
+import java.io.IOException;
+
+import org.owasp.encoder.Encode;
+
+public final class JsonHtmlXssSerializer extends JsonAdapter {
+
+@Override
+public synchronized String fromJson(JsonReader reader) throws IOException {
+if (reader.peek() == JsonReader.Token.NULL) {
+return reader.nextNull();
+}
+String string = reader.nextString();
+return string;
+}
+  
+@Override
+public synchronized void toJson(JsonWriter writer, String value) throws 
IOException {
+if (value == null) {
+writer.nullValue();
+} else {
+writer.value(Encode.forHtmlContent(value));
+}
+}
+}

[axis-axis2-java-core] branch master updated (a0c5e60 -> 1a2ada5)

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git.


from a0c5e60  use HTML encoding on JSON return strings, with the Moshi 
implementation also
 add 1a2ada5  AXIS2-6006, json-springboot-userguide first commit

No new revisions were added by this update.

Summary of changes:
 .../org/apache/axis2/json/gson/JsonFormatter.java  |   2 +-
 ...HtmlXssSerializer.java => JsonHtmlEncoder.java} |   2 +-
 .../org/apache/axis2/json/moshi/JsonFormatter.java |   2 +-
 ...HtmlXssSerializer.java => JsonHtmlEncoder.java} |   2 +-
 modules/samples/userguide/README.txt   |   5 +-
 .../userguide/src/userguide/springbootdemo/pom.xml | 405 
 .../springbootdemo/resources-axis2/conf/axis2.xml  | 539 +
 .../login_tokenizer_resources/services.xml |  33 ++
 .../test_service_resources/services.xml|  33 ++
 .../userguide/springboot/Axis2Application.java | 468 ++
 .../configuration/Axis2WebAppInitializer.java  |  72 +++
 .../hibernate/dao/SpringSecurityDAOImpl.java   | 115 +
 .../requestactivity/Axis2UserDetails.java  |  64 +++
 .../security/webservices/BadRequestMatcher.java| 258 ++
 .../webservices/HTTPPostOnlyRejectionFilter.java   |  89 
 .../webservices/JWTAuthenticationFilter.java   | 136 ++
 .../webservices/JWTAuthenticationProvider.java | 108 +
 .../JWTAuthenticationSuccessHandler.java}  |  26 +-
 .../webservices/JWTAuthenticationToken.java}   |  35 +-
 .../JWTTokenAuthenticationException.java}  |  23 +-
 .../webservices/JWTTokenMalformedException.java}   |  25 +-
 .../webservices/JWTTokenMissingException.java} |  23 +-
 .../security/webservices/JWTUserDTO.java}  |  42 +-
 .../springboot/security/webservices/LoginDTO.java  | 105 
 .../RequestAndResponseValidatorFilter.java | 200 
 .../webservices/RestAuthenticationEntryPoint.java  |  39 ++
 .../security/webservices/WSLoginFilter.java|  93 
 .../security/webservices/WSSecUtils.java   |  83 
 .../springboot/webservices/TestwsRequest.java} |  37 +-
 .../springboot/webservices/TestwsResponse.java}|  43 +-
 .../springboot/webservices/TestwsService.java  |  71 +++
 .../webservices/secure/LoginTokenizerRequest.java} |  49 +-
 .../secure/LoginTokenizerResponse.java}|  50 +-
 .../webservices/secure/LoginTokenizerService.java  | 238 +
 .../src/main/resources/ESAPI.properties| 461 ++
 .../src/main/resources/application.properties  |   2 +
 .../main/resources/esapi-java-logging.properties   |   6 +
 .../springbootdemo/src/main/resources/log4j2.xml   |  40 ++
 .../webapp/WEB-INF/jboss-deployment-structure.xml  |  13 +
 .../src/main/webapp/WEB-INF/jboss-web.xml  |  10 +
 src/site/xdoc/docs/json-springboot-userguide.html  | 104 
 src/site/xdoc/docs/userguide.xml   |   6 +-
 42 files changed, 4000 insertions(+), 157 deletions(-)
 copy modules/json/src/org/apache/axis2/json/gson/{JsonHtmlXssSerializer.java 
=> JsonHtmlEncoder.java} (94%)
 copy modules/json/src/org/apache/axis2/json/moshi/{JsonHtmlXssSerializer.java 
=> JsonHtmlEncoder.java} (95%)
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/pom.xml
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml
 create mode 100755 
modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_tokenizer_resources/services.xml
 create mode 100755 
modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/test_service_resources/services.xml
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/Axis2Application.java
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/configuration/Axis2WebAppInitializer.java
 create mode 100755 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/hibernate/dao/SpringSecurityDAOImpl.java
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/requestactivity/Axis2UserDetails.java
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/security/webservices/BadRequestMatcher.java
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/security/webservices/HTTPPostOnlyRejectionFilter.java
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/security/webservices/JWTAuthenticationFilter.java
 create mode 100644 
modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguid

[axis-axis2-java-core] branch master updated: AXIS2-6006, json-springboot-userguide completed first pass

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 28c9cbe  AXIS2-6006, json-springboot-userguide completed first pass
28c9cbe is described below

commit 28c9cbe82fc9fb1070527bd716d5c12ae67013ef
Author: Robert Lazarski 
AuthorDate: Tue Jul 27 14:46:24 2021 -0400

AXIS2-6006, json-springboot-userguide completed first pass
---
 .../userguide/src/userguide/springbootdemo/pom.xml |   8 +-
 .../services.xml   |   6 +-
 .../test_service_resources/services.xml|   2 +-
 .../userguide/springboot/Axis2Application.java |  16 +-
 ...oginTokenizerRequest.java => LoginRequest.java} |   6 +-
 ...inTokenizerResponse.java => LoginResponse.java} |   6 +-
 ...oginTokenizerService.java => LoginService.java} |  16 +-
 src/site/xdoc/docs/json-springboot-userguide.html  | 179 +
 8 files changed, 180 insertions(+), 59 deletions(-)

diff --git a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml 
b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml
index 85b9037..731fdec 100644
--- a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml
+++ b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml
@@ -340,8 +340,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -352,8 +352,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git 
a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_tokenizer_resources/services.xml
 
b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_resources/services.xml
similarity index 89%
rename from 
modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_tokenizer_resources/services.xml
rename to 
modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_resources/services.xml
index 952ac49..64812c7 100755
--- 
a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_tokenizer_resources/services.xml
+++ 
b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/login_resources/services.xml
@@ -16,12 +16,12 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
+
 
-Alpha Theory Login Tokenizer Resources
+Login Resources
 
 org.apache.axis2.extensions.spring.receivers.SpringServletContextObjectSupplier
-loginTokenizerService
+loginService
 
 
 http://www.w3.org/ns/wsdl/in-out";
diff --git 
a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/test_service_resources/services.xml
 
b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/test_service_resources/services.xml
index 055789d..6a202ff 100755
--- 
a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/test_service_resources/services.xml
+++ 
b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/test_service_resources/services.xml
@@ -18,7 +18,7 @@
   -->
 
 
-Alpha Theory testws Resources
+testws Resources
 
 org.apache.axis2.extensions.spring.receivers.SpringServletContextObjectSupplier
 testwsService
diff --git 
a/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/Axis2Application.java
 
b/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/Axis2Application.java
index 38b19d9..7aefd00 100644
--- 
a/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/Axis2Application.java
+++ 
b/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/Axis2Application.java
@@ -122,7 +122,7 @@ public class Axis2Application extends 
SpringBootServletInitializer {
 public boolean matches(HttpServletRequest request) {
 String logPrefix = "AnonRequestMatcher.matches , ";
 boolean result = request.getRequestURI().contains(
-"/services/loginTokenizerService");
+"/services/loginService");
 logger.

[axis-axis2-java-core] branch master updated: AXIS2-6006, json-springboot-userguide completed

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new 2d93b3d  AXIS2-6006, json-springboot-userguide completed
2d93b3d is described below

commit 2d93b3da68efd0439e5aac16970442d0a682e165
Author: Robert Lazarski 
AuthorDate: Wed Jul 28 04:19:33 2021 -1000

AXIS2-6006, json-springboot-userguide completed
---
 src/site/xdoc/docs/json-springboot-userguide.html | 225 --
 1 file changed, 225 deletions(-)

diff --git a/src/site/xdoc/docs/json-springboot-userguide.html 
b/src/site/xdoc/docs/json-springboot-userguide.html
deleted file mode 100644
index 527aa2b..000
--- a/src/site/xdoc/docs/json-springboot-userguide.html
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
-
-
-  
-  Apache Axis2 JSON and REST with Spring Boot User's Guide
-
-
-
-
-
-Apache Axis2 JSON and REST with Spring Boot User's 
Guide
-
-This guide will help you get started with Axis2 and JSON via REST, using 
-Spring Security with Spring Boot!  It gives a detailed description on how to 
write 
-JSON based REST Web services and also Web service clients via JSON and Curl, 
how to 
-write a custom login, and how to use them in a token based Web service that 
also helps 
-prevent cross site scripting (XSS). 
-
-
-
-Introduction
-
-This user guide is written based on the Axis2 Standard Binary
-Distribution. The Standard Binary Distribution can be directly downloaded or built using
-the Source Distribution. If
-you choose the latter, then the Installation
-Guide will instruct you on how to build Axis2 Standard Binary
-Distribution using the source.
-
-The source code for this guide provides a pom.xml for an entire demo 
application built by maven.
-
-
-Please note that Axis2 is an open-source effort. If you feel the code
-could use some new features or fixes, please get involved and lend us a hand!
-The Axis developer community welcomes your participation.
-
-Let us know what you think! Send your feedback to "mailto:java-u...@axis.apache.org?subject=[Axis2]";>java-u...@axis.apache.org".
-(Subscription details are available on the Axis2 
site.) Kindly
-prefix the subject of the mail with [Axis2].
-
-Getting Started
-
-This user guide explains how to write and deploy a
-new JSON and REST based Web Service using Axis2, and how to write a Web 
Service client 
-using JSON with Curl.
-
-
-All the sample code mentioned in this guide is located in
-the "samples/userguide/src/springbootdemo" directory of Axis2 standard binary
-distribution.
-
-This quide supplies a pom.xml for building an exploded WAR with Spring Boot - 
-however this WAR does not have an embedded web server such as Tomcat. 
-
-
-The testing was carried out on Wildfly, by installing the WAR in its app 
server. 
-
-Please deploy the result of the maven build via 'mvn clean install', 
axis2-json-api.war, into your servlet container and ensure that it installs 
without any errors.
-
-Creating a New Web Service
-
-
-Areas out of scope for this guide are JWT and JWE for token generation and 
validation, 
-since they require elliptic curve cryptography. A sample token that is not 
meant for 
-production is generated in this demo - with the intent that the following 
standards
-should be used in its place. This demo merely shows a place to implement these
-standards.
-
-
-https://datatracker.ietf.org/doc/html/rfc7519
-https://datatracker.ietf.org/doc/html/rfc7516
-
-
-Tip: com.nimbusds is recommended as an open-source Java implementation of 
these 
-standards, for both token generation and validation.
-
-
-DB operations are also out of scope. There is a minimal DAO layer for 
authentication. 
-Very limited credential validation is done. 
-
-
-The NoOpPasswordEncoder Spring class included in this guide is meant for demos
-and testing only. Do not use this code as is in production.
-
-
-This guide provides two JSON based web services, LoginService and 
TestwsService.
-
-
-The login, if successful, will return a simple token not meant for anything 
beyond demos.
-The intent of this guide is to show a place that the JWT and JWE standards can 
be 
-implemented.
-
-
-Axis2 JSON support is via POJO Objects. LoginRequest and LoginResponse are 
coded in the LoginService as the names would indicate. 
-
-
-Also provided is a test service, TestwsService. It includes two POJO Objects 
as would
-be expected, TestwsRequest and TestwsResponse. This service attempts to return 
-a String with some Javascript, that is HTML encoded by Axis2 and thereby
-eliminating the possibility of a Javascript engine executing the response i.e. 
a 
-reflected XSS attack. 
-
-
-Concerning Spring Security and Spring Boot, the Axis2Application class that 
-extends SpringBootServletInitializer as typica

[axis-axis2-java-core] branch master updated: AXIS2-6007 update copyrights from 1999-2006

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
 new af8de5b  AXIS2-6007 update copyrights from 1999-2006
af8de5b is described below

commit af8de5baf7a3403de1637a519493747350fc92c7
Author: Robert Lazarski 
AuthorDate: Wed Jul 28 04:53:17 2021 -1000

AXIS2-6007 update copyrights from 1999-2006
---
 modules/webapp/src/main/webapp/WEB-INF/include/footer.inc| 2 +-
 modules/webapp/src/main/webapp/axis2-web/Error/GenError.html | 2 +-
 modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp  | 2 +-
 modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/webapp/src/main/webapp/WEB-INF/include/footer.inc 
b/modules/webapp/src/main/webapp/WEB-INF/include/footer.inc
index da9e51d..de42cb3 100644
--- a/modules/webapp/src/main/webapp/WEB-INF/include/footer.inc
+++ b/modules/webapp/src/main/webapp/WEB-INF/include/footer.inc
@@ -31,7 +31,7 @@



-   Copyright © 1999-2006, The Apache 
Software FoundationLicensed under the http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0.
+   Copyright © 1999-2021, The Apache 
Software FoundationLicensed under the http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0.



diff --git a/modules/webapp/src/main/webapp/axis2-web/Error/GenError.html 
b/modules/webapp/src/main/webapp/axis2-web/Error/GenError.html
index 748fbb2..de5355d 100644
--- a/modules/webapp/src/main/webapp/axis2-web/Error/GenError.html
+++ b/modules/webapp/src/main/webapp/axis2-web/Error/GenError.html
@@ -41,4 +41,4 @@

 
  
-
\ No newline at end of file
+
diff --git a/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp 
b/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp
index b57fc76..c64576b 100644
--- a/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp
+++ b/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp
@@ -51,7 +51,7 @@
 
   
   
-Copyright © 1999-2006, The Apache Software 
FoundationLicensed under the Copyright © 1999-2021, The Apache Software 
FoundationLicensed under the http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0.
   
 
diff --git a/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp 
b/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp
index 696c95f..886f55d 100644
--- a/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp
+++ b/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp
@@ -52,7 +52,7 @@
 
   
   
-Copyright © 1999-2006, The Apache 
Software FoundationLicensed under the Copyright © 1999-2021, The Apache 
Software FoundationLicensed under the http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0.
   
 

[axis-axis2-java-core] 01/01: Merge pull request #194 from apache/dependabot/maven/slf4j.version-1.7.32

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 5d1ea2432c8aac36e1b6068c7bcbbff981323566
Merge: af8de5b b104c47
Author: robertlazarski <58150512+robertlazar...@users.noreply.github.com>
AuthorDate: Wed Jul 28 04:56:04 2021 -1000

Merge pull request #194 from apache/dependabot/maven/slf4j.version-1.7.32

Bump slf4j.version from 1.7.31 to 1.7.32

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)