You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2014/11/14 11:42:21 UTC
[2/2] ode git commit: ODE-1021: Upgrading to axis2 1.6.2
ODE-1021: Upgrading to axis2 1.6.2
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/7b4c1a37
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/7b4c1a37
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/7b4c1a37
Branch: refs/heads/master
Commit: 7b4c1a37f19f0ab1418410f7c8429bc6255c0e31
Parents: 3a0d270
Author: sathwik <sa...@apache.org>
Authored: Fri Nov 14 16:12:02 2014 +0530
Committer: sathwik <sa...@apache.org>
Committed: Fri Nov 14 16:12:02 2014 +0530
----------------------------------------------------------------------
.../intalio/ws/timeservice/ExtensionMapper.java | 5 +-
.../com/intalio/ws/timeservice/GetCityTime.java | 216 ++++++++-----------
.../ws/timeservice/GetCityTimeResponse.java | 216 ++++++++-----------
.../com/intalio/ws/timeservice/GetUTCTime.java | 187 ++++++++--------
.../ws/timeservice/GetUTCTimeResponse.java | 216 ++++++++-----------
.../TimeServiceMessageReceiverInOut.java | 13 +-
.../ode/axis2/management/DeploymentTest.java | 2 +-
.../rampart/basic/SecuredProcessesTest.java | 1 -
.../rampart/policy/SecuredProcessesTest.java | 1 -
.../samples/policy/sample01/PWCBHandler.java | 2 +-
.../samples/policy/sample02/PWCBHandler.java | 2 +-
.../samples/policy/sample03/PWCBHandler.java | 2 +-
.../samples/policy/sample04/PWCBHandler.java | 2 +-
.../samples/policy/sample05/PWCBHandler.java | 2 +-
.../rampart/samples/sample02/PWCBHandler.java | 2 +-
.../rampart/samples/sample03/PWCBHandler.java | 2 +-
.../rampart/samples/sample04/PWCBHandler.java | 2 +-
.../rampart/samples/sample05/PWCBHandler.java | 2 +-
.../rampart/samples/sample06/PWCBHandler.java | 2 +-
.../rampart/samples/sample07/PWCBHandler.java | 2 +-
.../rampart/samples/sample08/PWCBHandler.java | 2 +-
.../rampart/samples/sample09/PWCBHandler.java | 2 +-
.../rampart/samples/sample10/PWCBHandler.java | 2 +-
.../secured-processes/sample08-client.axis2 | 2 +-
.../secured-processes/sample09-client.axis2 | 5 +-
.../secured-processes/sample09-service.xml | 5 +-
.../secured-services/sample08.axis2 | 2 +-
.../secured-services/sample09.axis2 | 5 +-
.../secured-services/services/sample09.aar | Bin 13330 -> 15306 bytes
.../main/java/org/apache/ode/il/OMUtils.java | 31 ++-
dependencies.rb | 40 ++--
31 files changed, 439 insertions(+), 536 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/com/intalio/ws/timeservice/ExtensionMapper.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/com/intalio/ws/timeservice/ExtensionMapper.java b/axis2-war/src/test/java/com/intalio/ws/timeservice/ExtensionMapper.java
index ee56dd2..7dee7f4 100644
--- a/axis2-war/src/test/java/com/intalio/ws/timeservice/ExtensionMapper.java
+++ b/axis2-war/src/test/java/com/intalio/ws/timeservice/ExtensionMapper.java
@@ -3,13 +3,16 @@
* ExtensionMapper.java
*
* This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.6.2 Built on : Apr 17, 2012 (05:34:40 IST)
*/
+
package com.intalio.ws.timeservice;
+
/**
* ExtensionMapper class
*/
+ @SuppressWarnings({"unchecked","unused"})
public class ExtensionMapper{
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTime.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTime.java b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTime.java
index c7030c3..f6e92a8 100644
--- a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTime.java
+++ b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTime.java
@@ -3,8 +3,9 @@
* GetCityTime.java
*
* This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.6.2 Built on : Apr 17, 2012 (05:34:40 IST)
*/
+
package com.intalio.ws.timeservice;
@@ -12,6 +13,7 @@
/**
* GetCityTime bean class
*/
+ @SuppressWarnings({"unchecked","unused"})
public class GetCityTime
implements org.apache.axis2.databinding.ADBBean{
@@ -23,15 +25,6 @@
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals("http://ws.intalio.com/TimeService/")){
- return "ns1";
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
-
-
/**
* field for City
*/
@@ -44,6 +37,11 @@
* in the serialized XML
*/
protected boolean localCityTracker = false ;
+
+ public boolean isCitySpecified(){
+ return localCityTracker;
+ }
+
/**
@@ -61,14 +59,7 @@
* @param param City
*/
public void setCity(java.lang.String param){
-
- if (param != null){
- //update the setting tracker
- localCityTracker = true;
- } else {
- localCityTracker = false;
-
- }
+ localCityTracker = param != null;
this.localCity=param;
@@ -76,20 +67,6 @@
}
- /**
- * isReaderMTOMAware
- * @return true if the reader supports MTOM
- */
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
- boolean isReaderMTOMAware = false;
-
- try{
- isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
- }catch(java.lang.IllegalArgumentException e){
- isReaderMTOMAware = false;
- }
- return isReaderMTOMAware;
- }
/**
@@ -104,28 +81,20 @@
- org.apache.axiom.om.OMDataSource dataSource =
- new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
-
- public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
- GetCityTime.this.serialize(MY_QNAME,factory,xmlWriter);
- }
- };
- return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- MY_QNAME,factory,dataSource);
+ org.apache.axiom.om.OMDataSource dataSource =
+ new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
+ return factory.createOMElement(dataSource,MY_QNAME);
- }
+ }
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ javax.xml.stream.XMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
- serialize(parentQName,factory,xmlWriter,false);
+ serialize(parentQName,xmlWriter,false);
}
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+ javax.xml.stream.XMLStreamWriter xmlWriter,
boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
@@ -138,23 +107,7 @@
prefix = parentQName.getPrefix();
namespace = parentQName.getNamespaceURI();
-
- if ((namespace != null) && (namespace.trim().length() > 0)) {
- java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
- if (writerPrefix != null) {
- xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
- } else {
- if (prefix == null) {
- prefix = generatePrefix(namespace);
- }
-
- xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
- }
- } else {
- xmlWriter.writeStartElement(parentQName.getLocalPart());
- }
+ writeStartElement(prefix, namespace, parentQName.getLocalPart(), xmlWriter);
if (serializeType){
@@ -174,24 +127,8 @@
}
if (localCityTracker){
namespace = "http://ws.intalio.com/TimeService/";
- if (! namespace.equals("")) {
- prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- xmlWriter.writeStartElement(prefix,"city", namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- } else {
- xmlWriter.writeStartElement(namespace,"city");
- }
-
- } else {
- xmlWriter.writeStartElement("city");
- }
-
+ writeStartElement(null, namespace, "city", xmlWriter);
+
if (localCity==null){
// write the nil attribute
@@ -212,36 +149,58 @@
}
- /**
- * Util method to write an attribute with the ns prefix
- */
- private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (xmlWriter.getPrefix(namespace) == null) {
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- }
+ private static java.lang.String generatePrefix(java.lang.String namespace) {
+ if(namespace.equals("http://ws.intalio.com/TimeService/")){
+ return "ns1";
+ }
+ return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ }
- xmlWriter.writeAttribute(namespace,attName,attValue);
+ /**
+ * Utility method to write an element start tag.
+ */
+ private void writeStartElement(java.lang.String prefix, java.lang.String namespace, java.lang.String localPart,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+ if (writerPrefix != null) {
+ xmlWriter.writeStartElement(namespace, localPart);
+ } else {
+ if (namespace.length() == 0) {
+ prefix = "";
+ } else if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ }
- }
+ xmlWriter.writeStartElement(prefix, localPart, namespace);
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ }
+
+ /**
+ * Util method to write an attribute with the ns prefix
+ */
+ private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (xmlWriter.getPrefix(namespace) == null) {
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
/**
- * Util method to write an attribute without the ns prefix
- */
- private void writeAttribute(java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (namespace.equals(""))
- {
- xmlWriter.writeAttribute(attName,attValue);
- }
- else
- {
- registerPrefix(xmlWriter, namespace);
- xmlWriter.writeAttribute(namespace,attName,attValue);
- }
- }
+ * Util method to write an attribute without the ns prefix
+ */
+ private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (namespace.equals("")) {
+ xmlWriter.writeAttribute(attName,attValue);
+ } else {
+ registerPrefix(xmlWriter, namespace);
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
+ }
/**
@@ -334,25 +293,26 @@
}
- /**
+ /**
* Register a namespace prefix
*/
- private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
- prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+ java.lang.String prefix = xmlWriter.getPrefix(namespace);
+ if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
}
-
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
+ prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
- return prefix;
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
}
+ return prefix;
+ }
@@ -449,7 +409,7 @@
java.util.Vector handledAttributes = new java.util.Vector();
-
+
reader.next();
@@ -458,6 +418,12 @@
if (reader.isStartElement() && new javax.xml.namespace.QName("http://ws.intalio.com/TimeService/","city").equals(reader.getName())){
+ nillableValue = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","nil");
+ if ("true".equals(nillableValue) || "1".equals(nillableValue)){
+ throw new org.apache.axis2.databinding.ADBException("The element: "+"city" +" cannot be null");
+ }
+
+
java.lang.String content = reader.getElementText();
object.setCity(
@@ -476,7 +442,7 @@
if (reader.isStartElement())
// A start element we are not expecting indicates a trailing invalid property
- throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+ throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getName());
@@ -494,4 +460,4 @@
}
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTimeResponse.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTimeResponse.java b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTimeResponse.java
index db0b013..176acc9 100644
--- a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTimeResponse.java
+++ b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetCityTimeResponse.java
@@ -3,8 +3,9 @@
* GetCityTimeResponse.java
*
* This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.6.2 Built on : Apr 17, 2012 (05:34:40 IST)
*/
+
package com.intalio.ws.timeservice;
@@ -12,6 +13,7 @@
/**
* GetCityTimeResponse bean class
*/
+ @SuppressWarnings({"unchecked","unused"})
public class GetCityTimeResponse
implements org.apache.axis2.databinding.ADBBean{
@@ -23,15 +25,6 @@
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals("http://ws.intalio.com/TimeService/")){
- return "ns1";
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
-
-
/**
* field for GetCityTimeResult
*/
@@ -44,6 +37,11 @@
* in the serialized XML
*/
protected boolean localGetCityTimeResultTracker = false ;
+
+ public boolean isGetCityTimeResultSpecified(){
+ return localGetCityTimeResultTracker;
+ }
+
/**
@@ -61,14 +59,7 @@
* @param param GetCityTimeResult
*/
public void setGetCityTimeResult(java.lang.String param){
-
- if (param != null){
- //update the setting tracker
- localGetCityTimeResultTracker = true;
- } else {
- localGetCityTimeResultTracker = false;
-
- }
+ localGetCityTimeResultTracker = param != null;
this.localGetCityTimeResult=param;
@@ -76,20 +67,6 @@
}
- /**
- * isReaderMTOMAware
- * @return true if the reader supports MTOM
- */
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
- boolean isReaderMTOMAware = false;
-
- try{
- isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
- }catch(java.lang.IllegalArgumentException e){
- isReaderMTOMAware = false;
- }
- return isReaderMTOMAware;
- }
/**
@@ -104,28 +81,20 @@
- org.apache.axiom.om.OMDataSource dataSource =
- new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
-
- public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
- GetCityTimeResponse.this.serialize(MY_QNAME,factory,xmlWriter);
- }
- };
- return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- MY_QNAME,factory,dataSource);
+ org.apache.axiom.om.OMDataSource dataSource =
+ new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
+ return factory.createOMElement(dataSource,MY_QNAME);
- }
+ }
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ javax.xml.stream.XMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
- serialize(parentQName,factory,xmlWriter,false);
+ serialize(parentQName,xmlWriter,false);
}
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+ javax.xml.stream.XMLStreamWriter xmlWriter,
boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
@@ -138,23 +107,7 @@
prefix = parentQName.getPrefix();
namespace = parentQName.getNamespaceURI();
-
- if ((namespace != null) && (namespace.trim().length() > 0)) {
- java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
- if (writerPrefix != null) {
- xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
- } else {
- if (prefix == null) {
- prefix = generatePrefix(namespace);
- }
-
- xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
- }
- } else {
- xmlWriter.writeStartElement(parentQName.getLocalPart());
- }
+ writeStartElement(prefix, namespace, parentQName.getLocalPart(), xmlWriter);
if (serializeType){
@@ -174,24 +127,8 @@
}
if (localGetCityTimeResultTracker){
namespace = "http://ws.intalio.com/TimeService/";
- if (! namespace.equals("")) {
- prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- xmlWriter.writeStartElement(prefix,"getCityTimeResult", namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- } else {
- xmlWriter.writeStartElement(namespace,"getCityTimeResult");
- }
-
- } else {
- xmlWriter.writeStartElement("getCityTimeResult");
- }
-
+ writeStartElement(null, namespace, "getCityTimeResult", xmlWriter);
+
if (localGetCityTimeResult==null){
// write the nil attribute
@@ -212,36 +149,58 @@
}
- /**
- * Util method to write an attribute with the ns prefix
- */
- private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (xmlWriter.getPrefix(namespace) == null) {
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- }
+ private static java.lang.String generatePrefix(java.lang.String namespace) {
+ if(namespace.equals("http://ws.intalio.com/TimeService/")){
+ return "ns1";
+ }
+ return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ }
- xmlWriter.writeAttribute(namespace,attName,attValue);
+ /**
+ * Utility method to write an element start tag.
+ */
+ private void writeStartElement(java.lang.String prefix, java.lang.String namespace, java.lang.String localPart,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+ if (writerPrefix != null) {
+ xmlWriter.writeStartElement(namespace, localPart);
+ } else {
+ if (namespace.length() == 0) {
+ prefix = "";
+ } else if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ }
- }
+ xmlWriter.writeStartElement(prefix, localPart, namespace);
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ }
+
+ /**
+ * Util method to write an attribute with the ns prefix
+ */
+ private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (xmlWriter.getPrefix(namespace) == null) {
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
/**
- * Util method to write an attribute without the ns prefix
- */
- private void writeAttribute(java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (namespace.equals(""))
- {
- xmlWriter.writeAttribute(attName,attValue);
- }
- else
- {
- registerPrefix(xmlWriter, namespace);
- xmlWriter.writeAttribute(namespace,attName,attValue);
- }
- }
+ * Util method to write an attribute without the ns prefix
+ */
+ private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (namespace.equals("")) {
+ xmlWriter.writeAttribute(attName,attValue);
+ } else {
+ registerPrefix(xmlWriter, namespace);
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
+ }
/**
@@ -334,25 +293,26 @@
}
- /**
+ /**
* Register a namespace prefix
*/
- private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
- prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+ java.lang.String prefix = xmlWriter.getPrefix(namespace);
+ if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
}
-
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
+ prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
- return prefix;
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
}
+ return prefix;
+ }
@@ -449,7 +409,7 @@
java.util.Vector handledAttributes = new java.util.Vector();
-
+
reader.next();
@@ -458,6 +418,12 @@
if (reader.isStartElement() && new javax.xml.namespace.QName("http://ws.intalio.com/TimeService/","getCityTimeResult").equals(reader.getName())){
+ nillableValue = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","nil");
+ if ("true".equals(nillableValue) || "1".equals(nillableValue)){
+ throw new org.apache.axis2.databinding.ADBException("The element: "+"getCityTimeResult" +" cannot be null");
+ }
+
+
java.lang.String content = reader.getElementText();
object.setGetCityTimeResult(
@@ -476,7 +442,7 @@
if (reader.isStartElement())
// A start element we are not expecting indicates a trailing invalid property
- throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+ throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getName());
@@ -494,4 +460,4 @@
}
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTime.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTime.java b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTime.java
index 8509707..c5204fc 100644
--- a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTime.java
+++ b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTime.java
@@ -3,8 +3,9 @@
* GetUTCTime.java
*
* This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.6.2 Built on : Apr 17, 2012 (05:34:40 IST)
*/
+
package com.intalio.ws.timeservice;
@@ -12,6 +13,7 @@
/**
* GetUTCTime bean class
*/
+ @SuppressWarnings({"unchecked","unused"})
public class GetUTCTime
implements org.apache.axis2.databinding.ADBBean{
@@ -23,15 +25,6 @@
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals("http://ws.intalio.com/TimeService/")){
- return "ns1";
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
-
-
/**
* field for GetUTCTime
*/
@@ -62,20 +55,6 @@
}
- /**
- * isReaderMTOMAware
- * @return true if the reader supports MTOM
- */
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
- boolean isReaderMTOMAware = false;
-
- try{
- isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
- }catch(java.lang.IllegalArgumentException e){
- isReaderMTOMAware = false;
- }
- return isReaderMTOMAware;
- }
/**
@@ -90,28 +69,20 @@
- org.apache.axiom.om.OMDataSource dataSource =
- new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
-
- public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
- GetUTCTime.this.serialize(MY_QNAME,factory,xmlWriter);
- }
- };
- return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- MY_QNAME,factory,dataSource);
+ org.apache.axiom.om.OMDataSource dataSource =
+ new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
+ return factory.createOMElement(dataSource,MY_QNAME);
- }
+ }
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ javax.xml.stream.XMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
- serialize(parentQName,factory,xmlWriter,false);
+ serialize(parentQName,xmlWriter,false);
}
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+ javax.xml.stream.XMLStreamWriter xmlWriter,
boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
@@ -119,25 +90,9 @@
//We can safely assume an element has only one type associated with it
java.lang.String namespace = "http://ws.intalio.com/TimeService/";
- java.lang.String localName = "getUTCTime";
+ java.lang.String _localName = "getUTCTime";
- if (! namespace.equals("")) {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- xmlWriter.writeStartElement(prefix, localName, namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- } else {
- xmlWriter.writeStartElement(namespace, localName);
- }
-
- } else {
- xmlWriter.writeStartElement(localName);
- }
+ writeStartElement(null, namespace, _localName, xmlWriter);
// add the type details if this is used in a simple type
if (serializeType){
@@ -155,7 +110,7 @@
if (localGetUTCTime==null){
- throw new org.apache.axis2.databinding.ADBException("Value cannot be null !!");
+ throw new org.apache.axis2.databinding.ADBException("getUTCTime cannot be null !!");
}else{
@@ -164,41 +119,62 @@
}
xmlWriter.writeEndElement();
-
}
- /**
- * Util method to write an attribute with the ns prefix
- */
- private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (xmlWriter.getPrefix(namespace) == null) {
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- }
+ private static java.lang.String generatePrefix(java.lang.String namespace) {
+ if(namespace.equals("http://ws.intalio.com/TimeService/")){
+ return "ns1";
+ }
+ return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ }
- xmlWriter.writeAttribute(namespace,attName,attValue);
+ /**
+ * Utility method to write an element start tag.
+ */
+ private void writeStartElement(java.lang.String prefix, java.lang.String namespace, java.lang.String localPart,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+ if (writerPrefix != null) {
+ xmlWriter.writeStartElement(namespace, localPart);
+ } else {
+ if (namespace.length() == 0) {
+ prefix = "";
+ } else if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ }
- }
+ xmlWriter.writeStartElement(prefix, localPart, namespace);
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ }
+
+ /**
+ * Util method to write an attribute with the ns prefix
+ */
+ private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (xmlWriter.getPrefix(namespace) == null) {
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
/**
- * Util method to write an attribute without the ns prefix
- */
- private void writeAttribute(java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (namespace.equals(""))
- {
- xmlWriter.writeAttribute(attName,attValue);
- }
- else
- {
- registerPrefix(xmlWriter, namespace);
- xmlWriter.writeAttribute(namespace,attName,attValue);
- }
- }
+ * Util method to write an attribute without the ns prefix
+ */
+ private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (namespace.equals("")) {
+ xmlWriter.writeAttribute(attName,attValue);
+ } else {
+ registerPrefix(xmlWriter, namespace);
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
+ }
/**
@@ -291,25 +267,26 @@
}
- /**
+ /**
* Register a namespace prefix
*/
- private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
- prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+ java.lang.String prefix = xmlWriter.getPrefix(namespace);
+ if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
}
-
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
+ prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
- return prefix;
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
}
+ return prefix;
+ }
@@ -371,12 +348,18 @@
java.util.Vector handledAttributes = new java.util.Vector();
-
+
while(!reader.isEndElement()) {
if (reader.isStartElement() ){
if (reader.isStartElement() && new javax.xml.namespace.QName("http://ws.intalio.com/TimeService/","getUTCTime").equals(reader.getName())){
+ nillableValue = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","nil");
+ if ("true".equals(nillableValue) || "1".equals(nillableValue)){
+ throw new org.apache.axis2.databinding.ADBException("The element: "+"getUTCTime" +" cannot be null");
+ }
+
+
java.lang.String content = reader.getElementText();
object.setGetUTCTime(
@@ -386,7 +369,7 @@
else{
// A start element we are not expecting indicates an invalid parameter was passed
- throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+ throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getName());
}
} else {
@@ -410,4 +393,4 @@
}
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTimeResponse.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTimeResponse.java b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTimeResponse.java
index 99f4eff..84193b7 100644
--- a/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTimeResponse.java
+++ b/axis2-war/src/test/java/com/intalio/ws/timeservice/GetUTCTimeResponse.java
@@ -3,8 +3,9 @@
* GetUTCTimeResponse.java
*
* This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT)
+ * by the Apache Axis2 version: 1.6.2 Built on : Apr 17, 2012 (05:34:40 IST)
*/
+
package com.intalio.ws.timeservice;
@@ -12,6 +13,7 @@
/**
* GetUTCTimeResponse bean class
*/
+ @SuppressWarnings({"unchecked","unused"})
public class GetUTCTimeResponse
implements org.apache.axis2.databinding.ADBBean{
@@ -23,15 +25,6 @@
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals("http://ws.intalio.com/TimeService/")){
- return "ns1";
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
-
-
/**
* field for GetUTCTimeResult
*/
@@ -44,6 +37,11 @@
* in the serialized XML
*/
protected boolean localGetUTCTimeResultTracker = false ;
+
+ public boolean isGetUTCTimeResultSpecified(){
+ return localGetUTCTimeResultTracker;
+ }
+
/**
@@ -61,14 +59,7 @@
* @param param GetUTCTimeResult
*/
public void setGetUTCTimeResult(java.lang.String param){
-
- if (param != null){
- //update the setting tracker
- localGetUTCTimeResultTracker = true;
- } else {
- localGetUTCTimeResultTracker = false;
-
- }
+ localGetUTCTimeResultTracker = param != null;
this.localGetUTCTimeResult=param;
@@ -76,20 +67,6 @@
}
- /**
- * isReaderMTOMAware
- * @return true if the reader supports MTOM
- */
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
- boolean isReaderMTOMAware = false;
-
- try{
- isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
- }catch(java.lang.IllegalArgumentException e){
- isReaderMTOMAware = false;
- }
- return isReaderMTOMAware;
- }
/**
@@ -104,28 +81,20 @@
- org.apache.axiom.om.OMDataSource dataSource =
- new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
-
- public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
- GetUTCTimeResponse.this.serialize(MY_QNAME,factory,xmlWriter);
- }
- };
- return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- MY_QNAME,factory,dataSource);
+ org.apache.axiom.om.OMDataSource dataSource =
+ new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
+ return factory.createOMElement(dataSource,MY_QNAME);
- }
+ }
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ javax.xml.stream.XMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
- serialize(parentQName,factory,xmlWriter,false);
+ serialize(parentQName,xmlWriter,false);
}
public void serialize(final javax.xml.namespace.QName parentQName,
- final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+ javax.xml.stream.XMLStreamWriter xmlWriter,
boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
@@ -138,23 +107,7 @@
prefix = parentQName.getPrefix();
namespace = parentQName.getNamespaceURI();
-
- if ((namespace != null) && (namespace.trim().length() > 0)) {
- java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
- if (writerPrefix != null) {
- xmlWriter.writeStartElement(namespace, parentQName.getLocalPart());
- } else {
- if (prefix == null) {
- prefix = generatePrefix(namespace);
- }
-
- xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
- }
- } else {
- xmlWriter.writeStartElement(parentQName.getLocalPart());
- }
+ writeStartElement(prefix, namespace, parentQName.getLocalPart(), xmlWriter);
if (serializeType){
@@ -174,24 +127,8 @@
}
if (localGetUTCTimeResultTracker){
namespace = "http://ws.intalio.com/TimeService/";
- if (! namespace.equals("")) {
- prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- xmlWriter.writeStartElement(prefix,"getUTCTimeResult", namespace);
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- } else {
- xmlWriter.writeStartElement(namespace,"getUTCTimeResult");
- }
-
- } else {
- xmlWriter.writeStartElement("getUTCTimeResult");
- }
-
+ writeStartElement(null, namespace, "getUTCTimeResult", xmlWriter);
+
if (localGetUTCTimeResult==null){
// write the nil attribute
@@ -212,36 +149,58 @@
}
- /**
- * Util method to write an attribute with the ns prefix
- */
- private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (xmlWriter.getPrefix(namespace) == null) {
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- }
+ private static java.lang.String generatePrefix(java.lang.String namespace) {
+ if(namespace.equals("http://ws.intalio.com/TimeService/")){
+ return "ns1";
+ }
+ return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ }
- xmlWriter.writeAttribute(namespace,attName,attValue);
+ /**
+ * Utility method to write an element start tag.
+ */
+ private void writeStartElement(java.lang.String prefix, java.lang.String namespace, java.lang.String localPart,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+ if (writerPrefix != null) {
+ xmlWriter.writeStartElement(namespace, localPart);
+ } else {
+ if (namespace.length() == 0) {
+ prefix = "";
+ } else if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ }
- }
+ xmlWriter.writeStartElement(prefix, localPart, namespace);
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ }
+
+ /**
+ * Util method to write an attribute with the ns prefix
+ */
+ private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (xmlWriter.getPrefix(namespace) == null) {
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
/**
- * Util method to write an attribute without the ns prefix
- */
- private void writeAttribute(java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (namespace.equals(""))
- {
- xmlWriter.writeAttribute(attName,attValue);
- }
- else
- {
- registerPrefix(xmlWriter, namespace);
- xmlWriter.writeAttribute(namespace,attName,attValue);
- }
- }
+ * Util method to write an attribute without the ns prefix
+ */
+ private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (namespace.equals("")) {
+ xmlWriter.writeAttribute(attName,attValue);
+ } else {
+ registerPrefix(xmlWriter, namespace);
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
+ }
/**
@@ -334,25 +293,26 @@
}
- /**
+ /**
* Register a namespace prefix
*/
- private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
- prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+ java.lang.String prefix = xmlWriter.getPrefix(namespace);
+ if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
}
-
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
+ prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
- return prefix;
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
}
+ return prefix;
+ }
@@ -449,7 +409,7 @@
java.util.Vector handledAttributes = new java.util.Vector();
-
+
reader.next();
@@ -458,6 +418,12 @@
if (reader.isStartElement() && new javax.xml.namespace.QName("http://ws.intalio.com/TimeService/","getUTCTimeResult").equals(reader.getName())){
+ nillableValue = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","nil");
+ if ("true".equals(nillableValue) || "1".equals(nillableValue)){
+ throw new org.apache.axis2.databinding.ADBException("The element: "+"getUTCTimeResult" +" cannot be null");
+ }
+
+
java.lang.String content = reader.getElementText();
object.setGetUTCTimeResult(
@@ -476,7 +442,7 @@
if (reader.isStartElement())
// A start element we are not expecting indicates a trailing invalid property
- throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName());
+ throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getName());
@@ -494,4 +460,4 @@
}
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/com/intalio/ws/timeservice/TimeServiceMessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/com/intalio/ws/timeservice/TimeServiceMessageReceiverInOut.java b/axis2-war/src/test/java/com/intalio/ws/timeservice/TimeServiceMessageReceiverInOut.java
index 8032d92..c2ed368 100644
--- a/axis2-war/src/test/java/com/intalio/ws/timeservice/TimeServiceMessageReceiverInOut.java
+++ b/axis2-war/src/test/java/com/intalio/ws/timeservice/TimeServiceMessageReceiverInOut.java
@@ -3,7 +3,7 @@
* TimeServiceMessageReceiverInOut.java
*
* This file was auto-generated from WSDL
- * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:00 EDT)
+ * by the Apache Axis2 version: 1.6.2 Built on : Apr 17, 2012 (05:33:49 IST)
*/
package com.intalio.ws.timeservice;
@@ -34,6 +34,7 @@
java.lang.String methodName;
if((op.getName() != null) && ((methodName = org.apache.axis2.util.JavaUtils.xmlNameToJavaIdentifier(op.getName().getLocalPart())) != null)){
+
if("getCityTime".equals(methodName)){
@@ -51,7 +52,8 @@
skel.getCityTime(wrappedParam)
;
- envelope = toEnvelope(getSOAPFactory(msgContext), getCityTimeResponse1, false);
+ envelope = toEnvelope(getSOAPFactory(msgContext), getCityTimeResponse1, false, new javax.xml.namespace.QName("http://ws.intalio.com/TimeService/",
+ "getCityTime"));
} else
if("getUTCTime".equals(methodName)){
@@ -69,7 +71,8 @@
skel.getUTCTime(wrappedParam)
;
- envelope = toEnvelope(getSOAPFactory(msgContext), getUTCTimeResponse3, false);
+ envelope = toEnvelope(getSOAPFactory(msgContext), getUTCTimeResponse3, false, new javax.xml.namespace.QName("http://ws.intalio.com/TimeService/",
+ "getUTCTime"));
} else {
throw new java.lang.RuntimeException("method not found");
@@ -141,7 +144,7 @@
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.intalio.ws.timeservice.GetCityTimeResponse param, boolean optimizeContent)
+ private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.intalio.ws.timeservice.GetCityTimeResponse param, boolean optimizeContent, javax.xml.namespace.QName methodQName)
throws org.apache.axis2.AxisFault{
try{
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
@@ -160,7 +163,7 @@
return wrappedElement;
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.intalio.ws.timeservice.GetUTCTimeResponse param, boolean optimizeContent)
+ private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.intalio.ws.timeservice.GetUTCTimeResponse param, boolean optimizeContent, javax.xml.namespace.QName methodQName)
throws org.apache.axis2.AxisFault{
try{
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
index e0af2e9..37bb43a 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
@@ -56,7 +56,7 @@ public class DeploymentTest extends Axis2TestBase {
// Setup and tear down are doing ost of the job here, just checking in the middle
// Check deployment
- OMElement listRoot = _client.buildMessage("listProcesses", new String[0], new String[0]);
+ OMElement listRoot = _client.buildMessage("listProcesses", new String[] {"filter", "orderKeys"}, new String[] {"", ""});
OMElement result = sendToPM(listRoot);
// look for DynPartnerMain-xxx
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
index bf99584..c710b07 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
@@ -96,7 +96,6 @@ public class SecuredProcessesTest extends Axis2TestBase {
String response = DOMUtils.domToString(OMUtils.toDOM(responseElement));
System.out.println(response);
- System.out.println(response);
assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello " + bundleName + "!"));
} finally {
server.undeployProcess(bundleName);
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
index 9535b3a..d7dcf1d 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
@@ -107,7 +107,6 @@ public class SecuredProcessesTest extends Axis2TestBase {
String response = DOMUtils.domToString(OMUtils.toDOM(responseElement));
System.out.println(response);
- System.out.println(response);
assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello " + bundleName + "!"));
} finally {
server.undeployProcess(bundleName);
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample01/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample01/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample01/PWCBHandler.java
index 553ef4d..6917041 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample01/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample01/PWCBHandler.java
@@ -52,7 +52,7 @@ public class PWCBHandler implements CallbackHandler {
//When the server side need to authenticate the user
WSPasswordCallback pwcb = (WSPasswordCallback) callbacks[i];
if (pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN) {
- if (pwcb.getIdentifer().equals("alice") && pwcb.getPassword().equals("bobPW")) {
+ if (pwcb.getIdentifier().equals("alice") && pwcb.getPassword().equals("bobPW")) {
return;
} else {
throw new UnsupportedCallbackException(callbacks[i], "check failed");
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample02/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample02/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample02/PWCBHandler.java
index 4330202..8782159 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample02/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample02/PWCBHandler.java
@@ -49,7 +49,7 @@ public class PWCBHandler implements CallbackHandler {
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample03/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample03/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample03/PWCBHandler.java
index e27a691..9e41792 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample03/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample03/PWCBHandler.java
@@ -49,7 +49,7 @@ public class PWCBHandler implements CallbackHandler {
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample04/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample04/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample04/PWCBHandler.java
index ca3817c..fe6b215 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample04/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample04/PWCBHandler.java
@@ -49,7 +49,7 @@ public class PWCBHandler implements CallbackHandler {
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample05/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample05/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample05/PWCBHandler.java
index ac54044..a18f31e 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample05/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/policy/sample05/PWCBHandler.java
@@ -49,7 +49,7 @@ public class PWCBHandler implements CallbackHandler {
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample02/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample02/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample02/PWCBHandler.java
index 641cce1..1f76983 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample02/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample02/PWCBHandler.java
@@ -49,7 +49,7 @@ public class PWCBHandler implements CallbackHandler {
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("bob".equals(id)) {
pwcb.setPassword("bobPW");
}
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample03/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample03/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample03/PWCBHandler.java
index f0f9592..129ece3 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample03/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample03/PWCBHandler.java
@@ -53,7 +53,7 @@ public class PWCBHandler implements CallbackHandler {
//When the server side need to authenticate the user
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
if (pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN) {
- if(pwcb.getIdentifer().equals("bob") && pwcb.getPassword().equals("bobPW")) {
+ if(pwcb.getIdentifier().equals("bob") && pwcb.getPassword().equals("bobPW")) {
//If authentication successful, simply return
return;
} else {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample04/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample04/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample04/PWCBHandler.java
index f012f88..597aa8c 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample04/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample04/PWCBHandler.java
@@ -50,7 +50,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample05/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample05/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample05/PWCBHandler.java
index 10c7f54..a8e5fed 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample05/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample05/PWCBHandler.java
@@ -50,7 +50,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample06/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample06/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample06/PWCBHandler.java
index 5469fe5..40c8e67 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample06/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample06/PWCBHandler.java
@@ -50,7 +50,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample07/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample07/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample07/PWCBHandler.java
index 5d196ec..206f04e 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample07/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample07/PWCBHandler.java
@@ -50,7 +50,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample08/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample08/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample08/PWCBHandler.java
index 8d729a6..f1f2b7a 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample08/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample08/PWCBHandler.java
@@ -50,7 +50,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
index ff4c8ca..0fc470b 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
@@ -60,7 +60,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback) callbacks[i];
- if (pwcb.getUsage() == WSPasswordCallback.KEY_NAME) {
+ if (pwcb.getUsage() == WSPasswordCallback.SECRET_KEY) {
pwcb.setKey(key);
}
}
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/java/org/apache/rampart/samples/sample10/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample10/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample10/PWCBHandler.java
index ba534c1..1210dd1 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample10/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample10/PWCBHandler.java
@@ -50,7 +50,7 @@ public class PWCBHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
index 77372d9..4d4d095 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
@@ -25,7 +25,7 @@
<parameter name="OutflowSecurity">
<action>
- <items>Timestamp Signature NoSerialization</items>
+ <items>Timestamp Signature</items>
<user>client</user>
<passwordCallbackClass>org.apache.rampart.samples.sample08.PWCBHandler</passwordCallbackClass>
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
index 8de65db..4a2bbbf 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
@@ -26,9 +26,9 @@
<items>Encrypt</items>
<user>client</user>
<encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
- <EmbeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</EmbeddedKeyCallbackClass>
+ <embeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</embeddedKeyCallbackClass>
<encryptionPropFile>TestRampartBasic/secured-processes/client.properties</encryptionPropFile>
- <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+ <embeddedKeyName>SessionKey</embeddedKeyName>
</action>
</parameter>
@@ -37,6 +37,7 @@
<items>Encrypt</items>
<passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass>
<decryptionPropFile>TestRampartBasic/secured-processes/client.properties</decryptionPropFile>
+ <isBSPCompliant>false</isBSPCompliant>
</action>
</parameter>