You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/09/10 21:03:34 UTC
svn commit: r1807970 - in /axis/axis2/java/core/trunk:
modules/kernel/src/org/apache/axis2/deployment/
modules/samples/json/src/META-INF/ src/site/xdoc/docs/
systests/webapp-tests/src/test/java/org/apache/axis2/webapp/
Author: veithen
Date: Sun Sep 10 21:03:34 2017
New Revision: 1807970
URL: http://svn.apache.org/viewvc?rev=1807970&view=rev
Log:
AXIS2-5884: Allow both 'description' and 'Description' in service.xml and module.xml files.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
axis/axis2/java/core/trunk/modules/samples/json/src/META-INF/services.xml
axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml
axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java Sun Sep 10 21:03:34 2017
@@ -95,7 +95,9 @@ public interface DeploymentConstants {
String TAG_EXTRACT_SERVICE_ARCHIVE = "extractServiceArchive";
String TAG_DISPATCH_ORDER = "dispatchOrder";
String TAG_DISPATCHER = "dispatcher";
- String TAG_DESCRIPTION = "Description";
+ String TAG_DESCRIPTION = "description";
+ // Alternate description tag; see AXIS2-5884
+ String TAG_DESCRIPTION_ALT = "Description";
String TAG_CLASS_NAME = "class";
String TAG_LIST_ID = "listId";
String TAG_EXCLUDE_PROPERTIES= "excludeProperties";
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Sun Sep 10 21:03:34 2017
@@ -148,7 +148,9 @@ public class ModuleBuilder extends Descr
// Process service description
OMElement descriptionElement =
moduleElement.getFirstChildWithName(new QName(TAG_DESCRIPTION));
-
+ if (descriptionElement == null) {
+ descriptionElement = moduleElement.getFirstChildWithName(new QName(TAG_DESCRIPTION_ALT));
+ }
if (descriptionElement != null) {
OMElement descriptionValue = descriptionElement.getFirstElement();
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Sun Sep 10 21:03:34 2017
@@ -152,6 +152,9 @@ public class ServiceBuilder extends Desc
// process service description
OMElement descriptionElement = service_element
.getFirstChildWithName(new QName(TAG_DESCRIPTION));
+ if (descriptionElement == null) {
+ descriptionElement = service_element.getFirstChildWithName(new QName(TAG_DESCRIPTION_ALT));
+ }
if (descriptionElement != null) {
OMElement descriptionValue = descriptionElement
.getFirstElement();
Modified: axis/axis2/java/core/trunk/modules/samples/json/src/META-INF/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/json/src/META-INF/services.xml?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/json/src/META-INF/services.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/json/src/META-INF/services.xml Sun Sep 10 21:03:34 2017
@@ -1,7 +1,7 @@
<service name="JsonService">
- <Description>
+ <description>
This is a sample service to test json implementation
- </Description>
+ </description>
<messageReceivers>
<messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
class="org.apache.axis2.json.gson.rpc.JsonRpcMessageReceiver" />
@@ -9,4 +9,4 @@
class="org.apache.axis2.json.gson.rpc.JsonInOnlyRPCMessageReceiver"/>
</messageReceivers>
<parameter name="ServiceClass" locked="false">sample.json.service.JsonService</parameter>
-</service>
\ No newline at end of file
+</service>
Modified: axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml (original)
+++ axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml Sun Sep 10 21:03:34 2017
@@ -301,7 +301,7 @@ inside the servlet container. A very sim
class="fully qualified name the service lifecycle class"
targetNamespace="target namespace for the service">
- <Description> The description of the service </Description>
+ <description> The description of the service </description>
<transports>
<transport>HTTP</transport>
Modified: axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java (original)
+++ axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java Sun Sep 10 21:03:34 2017
@@ -41,6 +41,7 @@ public class AxisAdminServletITCase {
public void testAvailableServices() {
tester.clickLinkWithText("Available Services");
tester.assertMatch("Service EPR : http://localhost:[0-9]+/axis2/services/Version");
+ tester.assertTextPresent("Service Description : This service is to get the running Axis version");
}
/**
Modified: axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java?rev=1807970&r1=1807969&r2=1807970&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java (original)
+++ axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java Sun Sep 10 21:03:34 2017
@@ -30,6 +30,7 @@ public class AxisServletITCase {
tester.beginAt("/");
tester.clickLinkWithExactText("Services");
tester.assertLinkPresentWithExactText("Version");
+ tester.assertTextPresent("Service Description : This service is to get the running Axis version");
}
/**