svn commit: r1199107 - /axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml
Author: nadiramra Date: Tue Nov 8 04:58:20 2011 New Revision: 1199107 URL: http://svn.apache.org/viewvc?rev=1199107&view=rev Log: minor spelling errors Modified: axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml 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=1199107&r1=1199106&r2=1199107&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 Tue Nov 8 04:58:20 2011 @@ -45,10 +45,7 @@ configuration). This document explains t -Global Configuration - - Writing axis2.xml - +Global Configuration (axis2.xml) All the configurations that require starting Axis2 are obtained from axis2.xml. The way to specify them is extremely simple and easy. The document @@ -291,10 +288,7 @@ and it should be noted that the Implemen AxisObserver interface, and the class has to be available in the classpath. -Service Configuration - - Writing services.xml - +Service Configuration (services.xml) The description of services are specified using services.xml. Each service archive file needs to have a services.xml in order to be a valid @@ -302,7 +296,11 @@ service and it should be available in th file(aar) which should be located in AXIS2_HOME/repository/services in standalone use. In war distribution this will be axis2/WEB-INF/services inside the servlet container. A very simple services.xml is shown below: -<service name="name of the service" scope="name of the scope" class="full qualifide name the service lifecycle class" targetNamespace="target namespase for the service"> + +<service name="name of the service" scope="name of the scope" +class="fully qualified name the service lifecycle class" +targetNamespace="target namespace for the service"> + <Description> The description of the service </Description> <transports> @@ -323,7 +321,8 @@ inside the servlet container. A very sim <module ref=" a module name "/> <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> </operation> -</service> +</service> + name: The service name will be the name of the archive file if the .aar file contains only one service, or else the name of the service will be the name given by the name attribute. @@ -366,10 +365,12 @@ has to add the "operation" tag and overr you do not have a service class, then all the operations the user wants to expose by the service has to be indicated in the services.xml. It is specified as follows: -<operation name="echoString"> -<module ref=" a module name "/> -<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> -</operation> + +<operation name="echoString"> + <module ref=" a module name "/> + <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> +</operation> + The only compulsory attribute here is "name", which represents the operation name that is going to be exposed. Any operation can contain module references as well as any number of parameters. The most interesting thing is @@ -379,10 +380,7 @@ corresponding operation. If you do not s default message receiver will perform the operation. -Module Configuration - - Writing module.xml - +Module Configuration (module.xml) The description of the module is specified using the module.xml. Each module archive file needs to have a module.xml in order to be a valid module, @@ -392,7 +390,8 @@ In war distribution this will be axis2/W A very simple module.xml is shown below: -<module class="org.apache.module.Module1Impl"> + +<module class="org.apache.module.Module1Impl"> <InFlow> . . @@ -416,7 +415,8 @@ In war distribution this will be axis2/W <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> <parameter name="para1" locked="xsd:true">10</parameter> </operation> -</module> +</module> + class: (Optional attribute) Indicates the module implementation class. A module may or may not contain a module implementation class since the module can also be a collection of handlers. If a module
svn commit: r1199848 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: deployment/ServiceBuilder.java description/AxisService.java engine/DispatchPhase.java
Author: nadiramra
Date: Wed Nov 9 17:01:45 2011
New Revision: 1199848
URL: http://svn.apache.org/viewvc?rev=1199848&view=rev
Log:
AXIS2-4440 excludeOperations with static WSDL does not work
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
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=1199848&r1=1199847&r2=1199848&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
Wed Nov 9 17:01:45 2011
@@ -409,6 +409,7 @@ public class ServiceBuilder extends Desc
for (String opName : excludeops) {
service.removeOperation(new QName(opName));
+ service.addExcludeOperationName(opName);
}
// Need to call the same logic towice
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1199848&r1=1199847&r2=1199848&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
Wed Nov 9 17:01:45 2011
@@ -256,8 +256,11 @@ public class AxisService extends AxisDes
private CopyOnWriteArrayList
messageContextListeners =
new CopyOnWriteArrayList();
-// names list keep to preserve the parameter order
-private List operationsNameList;
+// names list keep to preserve the parameter order
+private List operationsNameList;
+
+// Excluded operations name list to know which operations to exclude.
+private List excludeOperationsNameList;
private String[] eprs;
private boolean customWsdl = false;
@@ -325,6 +328,7 @@ public class AxisService extends AxisDes
super();
this.operationsAliasesMap = new HashMap();
this.invalidOperationsAliases = new ArrayList();
+ this.excludeOperationsNameList = new ArrayList();
moduleConfigmap = new HashMap();
// by default service scope is for the request
scope = Constants.SCOPE_REQUEST;
@@ -597,6 +601,36 @@ public class AxisService extends AxisDes
moduleRefs.add(moduleref);
}
+/**
+ * Adds operation name to exclude list.
+ *
+ * @param operation operation name to add to exclude list
+ *
+ */
+public void addExcludeOperationName(String operation){
+excludeOperationsNameList.add(operation);
+}
+
+/**
+ * Removes operation name from exclude list.
+ *
+ * @param operation operation name to remove from exclude list
+ *
+ */
+public void removeExcludeOperationName(String operation){
+excludeOperationsNameList.remove(operation);
+}
+
+/**
+ * Returns whether operation name is in exclude list.
+ *
+ * @param operation name to check if operation is in the exlude list.
+ * @return boolean indicating whether operation name is in exlude list.
+ */
+public boolean isExcludedOperation(String operation){
+return excludeOperationsNameList.contains(operation);
+}
+
/*
* (non-Javadoc)
*
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?rev=1199848&r1=1199847&r2=1199848&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
Wed Nov 9 17:01:45 2011
@@ -83,6 +83,21 @@ public class DispatchPhase extends Phase
AxisService service = msgContext.getAxisService();
AxisOperation operation = msgContext.getAxisOperation();
+
svn commit: r1291601 - in /axis/axis2/java/core/trunk: modules/java2wsdl/src/org/apache/ws/java2wsdl/ modules/kernel/src/org/apache/axis2/description/ src/site/xdoc/docs/
Author: nadiramra
Date: Tue Feb 21 05:14:52 2012
New Revision: 1291601
URL: http://svn.apache.org/viewvc?rev=1291601&view=rev
Log:
AXIS2-4692 Java2WSDL not generating location HTTPS
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
axis/axis2/java/core/trunk/src/site/xdoc/docs/reference.xml
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?rev=1291601&r1=1291600&r2=1291601&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Tue Feb 21 05:14:52 2012
@@ -54,7 +54,7 @@ public class Java2WSDL {
System.out.println(" -o output
directory");
System.out.println(" -of output
file name for the WSDL");
System.out.println(" -sn service
name");
-System.out.println(" -laddress
of the port for the WSDL");
+System.out.println(" -l location
URIs, comma-delimited");
System.out.println(" -cp list of
classpath entries - (urls)");
System.out.println(" -tn target
namespace for service");
System.out.println(" -tptarget
namespace prefix for service");
@@ -73,8 +73,8 @@ public class Java2WSDL {
System.out.println(" -wv <1.1/2.0> wsdl
version - defaults to 1.1 if not specified");
System.out.println(" -dlbgenerate
schemas conforming to doc/lit/bare style");
System.out.println(" -dnedisallow
nillable elements in the generated schema");
-System.out.println(" -disableSOAP11 disable
binding generation for SOAP11");
-System.out.println(" -disableSOAP12 disable
binding generation for SOAP12");
+System.out.println(" -disableSOAP11 disable
binding generation for SOAP 1.1");
+System.out.println(" -disableSOAP12 disable
binding generation for SOAP 1.2");
System.out.println(" -disableRESTdisable
binding generation for REST");
System.out.println(" -mpn change
the part name of the generated wsdl messages");
System.out.println(" -ptn port
Type name of the WSDL");
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=1291601&r1=1291600&r2=1291601&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Tue Feb 21 05:14:52 2012
@@ -340,6 +340,7 @@ public class Java2WSDLBuilder implements
AxisService2WSDL11 g = new
AxisService2WSDL11(axisService);
g.setStyle(this.style);
g.setUse(this.use);
+ g.setCheckIfEndPointActive(false);
OMElement wsdlElement = g.generateOM();
if (!isPretty()) {
wsdlElement.serialize(out);
@@ -348,6 +349,7 @@ public class Java2WSDLBuilder implements
}
} else {
AxisService2WSDL20 g = new
AxisService2WSDL20(axisService);
+ g.setCheckIfEndPointActive(false);
OMElement wsdlElement = g.generateOM();
if (!isPretty()) {
wsdlElement.serialize(out);
@@ -476,16 +478,23 @@ public class Java2WSDLBuilder implements
this.wsdlVersion = wsdlVersion;
}
- private void setServiceEPR
svn commit: r1291976 - in /axis/axis2/java/core/trunk: modules/java2wsdl/src/org/apache/ws/java2wsdl/ modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/ modules/kernel/src/org/apache/axis2/descripti
Author: nadiramra
Date: Tue Feb 21 20:06:30 2012
New Revision: 1291976
URL: http://svn.apache.org/viewvc?rev=1291976&view=rev
Log:
AXIS2-3300 minOccurs="0" always generated by Java2WSDL
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
axis/axis2/java/core/trunk/src/site/xdoc/docs/reference.xml
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?rev=1291976&r1=1291975&r2=1291976&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Tue Feb 21 20:06:30 2012
@@ -73,14 +73,15 @@ public class Java2WSDL {
System.out.println(" -wv <1.1/2.0> wsdl
version - defaults to 1.1 if not specified");
System.out.println(" -dlbgenerate
schemas conforming to doc/lit/bare style");
System.out.println(" -dnedisallow
nillable elements in the generated schema");
+System.out.println(" -doedisallow
optional elements in the generated schema");
System.out.println(" -disableSOAP11 disable
binding generation for SOAP 1.1");
System.out.println(" -disableSOAP12 disable
binding generation for SOAP 1.2");
System.out.println(" -disableRESTdisable
binding generation for REST");
System.out.println(" -mpn change
the part name of the generated wsdl messages");
System.out.println(" -ptn port
Type name of the WSDL");
-System.out.println(" -soap11BindingName soap11
binding name of the WSDL");
-System.out.println(" -soap12BindingName soap 12
binding name of the WSDL");
-System.out.println(" -restBindingNamerest
binding name of the WSDL");
+System.out.println(" -soap11BindingName SOAP 1.1
binding name");
+System.out.println(" -soap12BindingName SOAP 1.2
binding name");
+System.out.println(" -restBindingName REST
binding name");
System.out.println(" -res Adds a
suffix to the request elemment");
System.out.println(" -datCreates
a named complex type for the annonymous complex type");
System.exit(0);
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=1291976&r1=1291975&r2=1291976&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Tue Feb 21 20:06:30 2012
@@ -69,6 +69,7 @@ public class Java2WSDLBuilder implements
private String locationUri;
private ArrayList extraClasses;
private boolean nillableElementsAllowed = true;
+private boolean optionalElementsAllowed = true;
private String nsGenClassName = null;
private Map pkg2nsMap = null;
@@ -267,6 +268,10 @@ public class Java2WSDLBuilder implements
service.addParameter(Java2WSDLConstants.DISALLOW_NILLABLE_ELEMENTS_OPTION_LONG,
"true");
}
+if (!optionalElementsAllowed) {
+
service.addParameter(Java2WSDLConstants.DISALLOW_OPTIONAL_ELEMENTS_OPTION_LONG,
"true");
+}
+
if (messagePartName != null){
service.addParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LON
