(axis-axis2-java-core) branch master updated: Change some logging statements from warn to debug in the new enableJSONOnly=true related code
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 5f9c419b62 Change some logging statements from warn to debug in the
new enableJSONOnly=true related code
5f9c419b62 is described below
commit 5f9c419b62ac608fb5c9a322870ebce5916d0c6c
Author: Robert Lazarski
AuthorDate: Thu Aug 1 08:59:31 2024 -1000
Change some logging statements from warn to debug in the new
enableJSONOnly=true related code
---
modules/kernel/src/org/apache/axis2/deployment/util/Utils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
b/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
index fac2f5fb6d..0bc1ae9e89 100644
--- a/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
+++ b/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
@@ -406,7 +406,7 @@ public class Utils {
}
String enableJSONOnly = (String)
axisConfig.getParameterValue("enableJSONOnly");
if (enableJSONOnly !=null && enableJSONOnly.equalsIgnoreCase("true")) {
-log.warn("on enableJSONOnly: " +enableJSONOnly+ " starting
fillAxisService(), serviceClass.name: " + serviceClass.getName());
+log.debug("on enableJSONOnly: " +enableJSONOnly+ " starting
fillAxisService(), serviceClass.name: " + serviceClass.getName());
List serviceMethods = new ArrayList();
Map uniqueMethods = new LinkedHashMap();
for (Method method : serviceClass.getMethods()) {
@@ -426,7 +426,7 @@ public class Utils {
if (axisOperation == null) {
axisOperation = getAxisOperationForJmethod(method);
axisService.addOperation(axisOperation);
-log.warn("on methodName: " +methodName+ " ,
enableJSONOnly: " +enableJSONOnly+ " , axisOperation added to service: "
+axisService.getName());
+log.debug("on methodName: " +methodName+ " ,
enableJSONOnly: " +enableJSONOnly+ " , axisOperation added to service: "
+axisService.getName());
}
// by now axis operation should be assigned but we better
recheck & add the paramether
if (axisOperation != null) {
@@ -471,7 +471,7 @@ public class Utils {
axisService.addOperation(operation);
axisService.addJSONMessageNameToOperationMapping(opName,
operation);
}
-log.warn("fillAxisService() completed on enableJSONOnly=true ,
axisService name: " + axisService.getName());
+log.debug("fillAxisService() completed on enableJSONOnly=true ,
axisService name: " + axisService.getName());
return;
}
(axis-axis2-java-core) 02/02: remove an unneeded class from the springbootdemo axis2.xml
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 18b4cf9bf5af6b138651a23572bc5615d70dcc59 Author: Robert Lazarski AuthorDate: Thu Aug 1 17:54:05 2024 -0400 remove an unneeded class from the springbootdemo axis2.xml --- .../src/userguide/springbootdemo/resources-axis2/conf/axis2.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml index 3b22530667..201b2926ee 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml +++ b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml @@ -111,8 +111,6 @@ -
(axis-axis2-java-core) 01/02: More logging cleanup in the new enableJSONOnly=true related code
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 1387c92256f62a0b0369436d8ccc19b7e626fe65
Author: Robert Lazarski
AuthorDate: Thu Aug 1 17:51:14 2024 -0400
More logging cleanup in the new enableJSONOnly=true related code
---
modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java | 6 +++---
.../json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java| 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
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 f7bfadea3d..9a5e72732f 100644
--- a/modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java
+++ b/modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java
@@ -97,7 +97,7 @@ public class JSONMessageHandler extends AbstractHandler {
} else {
String enableJSONOnly = (String)
msgContext.getAxisService().getParameterValue("enableJSONOnly");
if (enableJSONOnly !=null &&
enableJSONOnly.equalsIgnoreCase("true")) {
-log.warn("On enableJSONOnly=true Axis operation is null on
JSON request, message hasn't been dispatched to an operation, proceeding on
JSON message name discovery and AxisOperation mapping");
+log.debug("On enableJSONOnly=true Axis operation is null on
JSON request, message hasn't been dispatched to an operation, proceeding on
JSON message name discovery and AxisOperation mapping");
try{
Object tempObj =
msgContext.getProperty(JsonConstant.IS_JSON_STREAM);
if (tempObj != null) {
@@ -112,7 +112,7 @@ public class JSONMessageHandler extends AbstractHandler {
log.error("JSONMessageHandler can't find
messageName: " +messageName);
throw new IOException("Bad Request");
} else {
-log.warn("JSONMessageHandler found
messageName: " +messageName);
+log.debug("JSONMessageHandler found
messageName: " +messageName);
msgContext.setProperty("jsonMessageName",
messageName);
}
}
@@ -121,7 +121,7 @@ public class JSONMessageHandler extends AbstractHandler {
log.error("JSONMessageHandler error: " +e.getMessage());
}
} else {
-log.warn("On enableJSONOnly=false Axis operation is null,
ignore it");
+log.debug("On enableJSONOnly=false Axis operation is null,
ignore it");
}
}
return InvocationResponse.CONTINUE;
diff --git
a/modules/json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java
b/modules/json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java
index 815a647109..fdacd5da8e 100644
--- a/modules/json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java
+++ b/modules/json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java
@@ -97,7 +97,7 @@ public class JSONMessageHandler extends AbstractHandler {
} else {
String enableJSONOnly = (String)
msgContext.getAxisService().getParameterValue("enableJSONOnly");
if (enableJSONOnly !=null &&
enableJSONOnly.equalsIgnoreCase("true")) {
-log.warn("On enableJSONOnly=true Axis operation is null on
JSON request, message hasn't been dispatched to an operation, proceeding on
JSON message name discovery and AxisOperation mapping");
+log.debug("On enableJSONOnly=true Axis operation is null on
JSON request, message hasn't been dispatched to an operation, proceeding on
JSON message name discovery and AxisOperation mapping");
try{
Object tempObj =
msgContext.getProperty(JsonConstant.IS_JSON_STREAM);
if (tempObj != null) {
@@ -112,7 +112,7 @@ public class JSONMessageHandler extends AbstractHandler {
log.error("JSONMessageHandler can't find
messageName: " +messageName);
throw new IOException("Bad Request");
} else {
-log.warn("JSONMessageHandler found
messageName: " +messageName);
+log.debug("JSONMessageHandler found
messageName: " +messageName);
msgContext.setProperty("jsonMessageName",
messageName);
}
}
@@ -121,7 +121,7 @@ public class JSONMessageHandler extends AbstractHandler {
log.error("JSONMessageHandler error: " +e.getMessage());
}
} else {
-log.warn("On enableJSONOnly=false Axis operat
(axis-axis2-java-core) branch master updated (5f9c419b62 -> 18b4cf9bf5)
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 5f9c419b62 Change some logging statements from warn to debug in the new enableJSONOnly=true related code new 1387c92256 More logging cleanup in the new enableJSONOnly=true related code new 18b4cf9bf5 remove an unneeded class from the springbootdemo axis2.xml 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/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java | 6 +++--- .../json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java| 6 +++--- .../src/userguide/springbootdemo/resources-axis2/conf/axis2.xml | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)
(axis-axis2-java-core) branch master updated: update spring boot demo code for jakarta and Wildfly 32
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 3006bdaf73 update spring boot demo code for jakarta and Wildfly 32 3006bdaf73 is described below commit 3006bdaf732920780d46e7a6ccb7aa41c4db8df6 Author: Robert Lazarski AuthorDate: Thu Aug 1 20:47:46 2024 -1000 update spring boot demo code for jakarta and Wildfly 32 --- .../userguide/src/userguide/springbootdemo/pom.xml | 123 - .../springbootdemo/resources-axis2/conf/axis2.xml | 9 ++ .../userguide/springboot/Axis2Application.java | 51 - .../configuration/Axis2WebAppInitializer.java | 4 +- .../security/webservices/BadRequestMatcher.java| 4 +- .../webservices/HTTPPostOnlyRejectionFilter.java | 8 +- .../webservices/JWTAuthenticationFilter.java | 8 +- .../JWTAuthenticationSuccessHandler.java | 4 +- .../RequestAndResponseValidatorFilter.java | 37 +++ .../webservices/RestAuthenticationEntryPoint.java | 4 +- .../security/webservices/WSLoginFilter.java| 12 +- .../webservices/secure/LoginService.java | 2 +- .../main/resources/esapi-java-logging.properties | 6 - .../webapp/WEB-INF/jboss-deployment-structure.xml | 11 +- .../apache/axis2/transport/http/AxisServlet.java | 2 +- src/site/xdoc/docs/json-springboot-userguide.xml | 5 +- 16 files changed, 157 insertions(+), 133 deletions(-) diff --git a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml index 8b8a5238f6..00027132ad 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo/pom.xml +++ b/modules/samples/userguide/src/userguide/springbootdemo/pom.xml @@ -33,15 +33,15 @@ org.springframework.boot spring-boot-starter-parent -2.7.0 +3.3.2 UTF-8 UTF-8 -1.8 -2.6.4 +17 +3.3.2 @@ -61,27 +61,32 @@ org.apache.commons commons-lang3 -3.12.0 - - -com.sun.mail -jakarta.mail -1.6.7 +3.15.0 jakarta.activation jakarta.activation-api -1.2.1 +2.1.2 + + +org.eclipse.angus +angus-activation +2.0.2 org.glassfish.jaxb jaxb-runtime -2.3.6 +4.0.3 + + +org.glassfish.jaxb +jaxb-xjc +4.0.3 jakarta.xml.bind jakarta.xml.bind-api -2.3.3 +4.0.1 org.springframework.boot @@ -90,7 +95,7 @@ org.apache.logging.log4j log4j-jul -2.17.2 +2.23.1 org.springframework.boot @@ -129,17 +134,18 @@ jakarta.servlet jakarta.servlet-api -6.0.0 + 6.1.0 +provided org.springframework.boot spring-boot-starter-security -2.7.0 +3.3.2 commons-io commons-io -2.11.0 +2.16.0 commons-codec @@ -157,10 +163,15 @@ 1.7 + +org.apache.commons +commons-fileupload2-core +2.0.0-M2 + -commons-fileupload -commons-fileupload -1.5 +org.apache.commons +commons-fileupload2-jakarta-servlet6 +2.0.0-M2 org.apache.geronimo.specs @@ -175,52 +186,52 @@ org.apache.axis2 axis2-kernel - 1.8.1 + 1.8.3-SNAPSHOT org.apache.axis2 axis2-transport-http - 1.8.1 + 1.8.3-SNAPSHOT org.apache.axis2 axis2-transport-local - 1.8.1 + 1.8.3-SNAPSHOT org.apache.axis2 axis2-json - 1.8.1 + 1.8.3-SNAPSHOT org.apache.axis2 axis2-ant-plugin - 1.8.1 + 1.8.3-SNAPSHOT org.apache.axis2 axis2-adb - 1.8.1 + 1.8.3-SNAPSHOT org.apache.axis2 axis2-java2wsdl - 1.8.1 + 1.8.3-SNAPSH
