svn commit: r1054944 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
Author: ruwan
Date: Tue Jan 4 09:46:27 2011
New Revision: 1054944
URL: http://svn.apache.org/viewvc?rev=1054944&view=rev
Log:
Fixing minor typos
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java?rev=1054944&r1=1054943&r2=1054944&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
Tue Jan 4 09:46:27 2011
@@ -23,6 +23,7 @@ package org.apache.axis2;
/**
* Class Constants
*/
+...@suppresswarnings({"UnusedDeclaration"})
public class Constants extends org.apache.axis2.namespace.Constants {
/**
@@ -76,14 +77,16 @@ public class Constants extends org.apach
/**
- * To chenge the conetext path from axis2/service to something else
+ * To change the context path from axis2/service to something else
*/
public static final String PARAM_CONTEXT_ROOT = "contextRoot";
/**
- * To chenage the service path to somthing else
+ * To change the service path to something else
*/
public static final String PARAM_SERVICE_PATH = "servicePath";
-//Parameter name for transport session managemntt
+/**
+ * Parameter name for transport session management
+ */
public static final String MANAGE_TRANSPORT_SESSION =
"manageTransportSession";
public static final String HTTP_RESPONSE_STATE =
"axis2.http.response.state";
@@ -288,7 +291,7 @@ public class Constants extends org.apach
public static final String JAXWS_OUTBOUND_SOAP_HEADERS =
"jaxws.binding.soap.headers.outbound";
public static final String JAXWS_INBOUND_SOAP_HEADERS =
"jaxws.binding.soap.headers.inbound";
-// If the JAXWS WebMethod throws an exception on the server, the exception
is
+// If the JAX-WS WebMethod throws an exception on the server, the
exception is
// stored on the server outbound MessageContext. This is the key to
access that Throwable object.
public static final String JAXWS_WEBMETHOD_EXCEPTION =
"jaxws.outbound.response.webmethod.exception";
@@ -301,7 +304,7 @@ public class Constants extends org.apach
public static final String MODULE_VERSION ="version";
/**
- * Following constant are used for JTA transaction supporyt in Axis2
+ * Following constant are used for JTA transaction support in Axis2
*/
public static final String USER_TRANSACTION = "UserTransaction";
public static final String TRANSACTION_MANAGER = "TransactionManager";
@@ -427,12 +430,12 @@ public class Constants extends org.apach
/**
* If this is set to a Boolean 'true' value, then
RequestResponseTransport instances will
* not be signalled by the Dispatch phase. This is useful for modules
that add wish to
- * send extra messages in the backchannel.
+ * send extra messages in the back-channel.
*/
public static final String DISABLE_RESPONSE_ACK = "DisableResponseAck";
/**
- * This constant is used to add an deployment life cycle listner to
Axis2
+ * This constant is used to add an deployment life cycle listener to
Axis2
*/
public static final String DEPLOYMENT_LIFE_CYCLE_LISTENER =
"deploymentLifeCycleListener";
svn commit: r1054950 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl: DefaultSchemaGenerator.java TypeTable.java
Author: amilas
Date: Tue Jan 4 10:06:59 2011
New Revision: 1054950
URL: http://svn.apache.org/viewvc?rev=1054950&view=rev
Log:
use a map to keep the element qname and class name to support inheritance. see
the issue AXIS2-4818
Modified:
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/TypeTable.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1054950&r1=1054949&r2=1054950&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Tue Jan 4 10:06:59 2011
@@ -168,9 +168,24 @@ public class DefaultSchemaGenerator impl
if ((generateWrappedArrayTypes != null) &&
JavaUtils.isTrue(generateWrappedArrayTypes.getValue())){
isGenerateWrappedArrayTypes = true;
}
+
+Parameter extraClassesParam = service.getParameter("extraClass");
+if (extraClassesParam != null){
+String extraClassesString = (String)
extraClassesParam.getValue();
+String[] extraClassesArray = extraClassesString.split(",");
+if (this.extraClasses == null){
+this.extraClasses = new ArrayList();
+}
+
+for (String extraClass : extraClassesArray){
+this.extraClasses.add(extraClass);
+}
+}
}
+
+
}
//This will locad the custom schema file and add that into the schema map
@@ -569,6 +584,8 @@ public class DefaultSchemaGenerator impl
// adding this type's package to the table, to support inheritance.
typeTable.addComplexSchema(getQualifiedName(javaType.getPackage()),
eltOuter.getQName());
+typeTable.addClassNameForQName(eltOuter.getQName(), name);
+
BeanExcludeInfo beanExcludeInfo = null;
if (service.getExcludeInfo() != null) {
beanExcludeInfo =
service.getExcludeInfo().getBeanExcludeInfoForClass(getClassName(javaType));
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1054950&r1=1054949&r2=1054950&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Tue Jan 4 10:06:59 2011
@@ -28,6 +28,7 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
public class TypeTable {
@@ -36,10 +37,16 @@ public class TypeTable {
private HashMap complexTypeMap;
+/**
+ * this map is used to keep the class names with the Qnames.
+ */
+private Map qNameToClassMap;
+
public TypeTable() {
//complex type table is resetted every time this is
//instantiated
complexTypeMap = new HashMap();
+this.qNameToClassMap = new HashMap();
}
/* statically populate the simple type map - this is not likely to
@@ -188,6 +195,14 @@ public class TypeTable {
return (QName) complexTypeMap.get(name);
}
+public String getClassNameForQName(QName qname) {
+return this.qNameToClassMap.get(qname);
+}
+
+public void addClassNameForQName(QName qname, String className) {
+this.qNameToClassMap.put(qname, className);
+}
+
/**
* Get the qname for a type
* first try the simple types if not try the complex types
svn commit: r1054953 - in /axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui: JavaWSDLOutputLocationPage.java OutputPage.java
Author: ruwan
Date: Tue Jan 4 10:09:35 2011
New Revision: 1054953
URL: http://svn.apache.org/viewvc?rev=1054953&view=rev
Log:
Fixing the issue AXIS2-4008, committing Harshana's patch
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java?rev=1054953&r1=1054952&r2=1054953&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java
Tue Jan 4 10:09:35 2011
@@ -20,6 +20,7 @@
package org.apache.axis2.tool.codegen.eclipse.ui;
import org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Path;
@@ -42,6 +43,10 @@ import java.io.File;
public class JavaWSDLOutputLocationPage extends AbstractWizardPage {
+ private static final String EMPTY_STRING = "";
+
+ private static final int ECLIPSE_PROJECT_NAME_SEGMENT_INDEX = 0;
+
private Text outputFolderTextBox;
private Text outputFileNameTextBox;
@@ -52,39 +57,46 @@ public class JavaWSDLOutputLocationPage
private boolean workspaceSaveOption = false;
- /**
-* @param pageName
-*/
public JavaWSDLOutputLocationPage() {
super("page6");
}
- /* (non-Javadoc)
-* @see
org.apache.axis2.tool.codegen.eclipse.ui.AbstractWizardPage#initializeDefaultSettings()
+ /*
+* (non-Javadoc)
+*
+* @see org.apache.axis2.tool.codegen.eclipse.ui.AbstractWizardPage#
+* initializeDefaultSettings()
*/
protected void initializeDefaultSettings() {
- settings.put(PREF_JAVA_OUTPUT_WSDL_LOCATION, "");
+ settings.put(PREF_JAVA_OUTPUT_WSDL_LOCATION, EMPTY_STRING);
settings.put(JAVA_OUTPUT_WSDL_NAME, "services.wsdl");
settings.put(PREF_JAVA_OUTPUT_FILESYATEM, true);
settings.put(PREF_JAVA_OUTPUT_WORKSPACE, false);
}
- /* (non-Javadoc)
-* @see
org.apache.axis2.tool.codegen.eclipse.ui.AbstractWizardPage#getPageType()
+ /*
+* (non-Javadoc)
+*
+* @see
+*
org.apache.axis2.tool.codegen.eclipse.ui.AbstractWizardPage#getPageType()
*/
public int getPageType() {
return JAVA_2_WSDL_TYPE;
}
- /* (non-Javadoc)
-* @see
org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+ /*
+* (non-Javadoc)
+*
+* @see
+*
org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
+* .Composite)
*/
public void createControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
layout.numColumns = 3;
- //layout.verticalSpacing = 9;
+ // layout.verticalSpacing = 9;
container.setLayout(layout);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -137,7 +149,7 @@ public class JavaWSDLOutputLocationPage
gd = new GridData(GridData.FILL_HORIZONTAL);
outputFolderTextBox = new Text(container, SWT.BORDER);
outputFolderTextBox.setLayoutData(gd);
- outputFolderTextBox.setText("");
+ outputFolderTextBox.setText(EMPTY_STRING);
outputFolderTextBox.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
handleFolderTextChange();
@@ -195,7 +207,7 @@ public class JavaWSDLOutputLocationPage
private void handleFolderTextChange() {
String outputFolder = outputFolderTextBox.getText();
settings.put(PREF_JAVA_OUTPUT_WSDL_LOCATION, outputFolder);
- if ("".equals(outputFolder.trim())) {
+ if (EMPTY_STRING.equals(ou
svn commit: r1054954 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: amilas
Date: Tue Jan 4 10:17:07 2011
New Revision: 1054954
URL: http://svn.apache.org/viewvc?rev=1054954&view=rev
Log:
getting the type from the xsi:type attribute and process correctly. sending the
java class name with the xml request is not an inter operable method. see
AXIS2-4818
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1054954&r1=1054953&r2=1054954&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Tue Jan 4 10:17:07 2011
@@ -41,13 +41,7 @@ import java.util.TreeMap;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.*;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -333,12 +327,38 @@ public class BeanUtil {
// to support polymorphism in POJO approach.
// Retrieve the type name of the instance from the 'type' attribute
// and retrieve the class.
-String instanceTypeName = beanElement.getAttributeValue(new
QName("type"));
-if ((instanceTypeName != null) && (!beanClass.isArray())) {
-try {
-beanClass = Loader.loadClass(beanClass.getClassLoader(),
instanceTypeName);
-} catch (ClassNotFoundException ce) {
-throw AxisFault.makeFault(ce);
+
+String instanceTypeName = beanElement.getAttributeValue(new
QName(Constants.XSI_NAMESPACE, "type"));
+if (instanceTypeName != null) {
+MessageContext messageContext =
MessageContext.getCurrentMessageContext();
+// we can have this support only at the server side. we need
to find the axisservice
+// to get the type table.
+if (messageContext != null) {
+AxisService axisService = messageContext.getAxisService();
+QName typeQName = null;
+if (instanceTypeName.indexOf(":") > -1) {
+String prefix = instanceTypeName.substring(0,
instanceTypeName.indexOf(":"));
+for (Iterator namespaceIter =
beanElement.getAllDeclaredNamespaces(); namespaceIter.hasNext();) {
+OMNamespace omNamespace = (OMNamespace)
namespaceIter.next();
+if (omNamespace.getPrefix().equals(prefix)) {
+typeQName = new
QName(omNamespace.getNamespaceURI(),
instanceTypeName.substring(instanceTypeName.indexOf(":") + 1));
+}
+}
+} else {
+typeQName = new QName(instanceTypeName);
+}
+
+TypeTable typeTable = axisService.getTypeTable();
+String className =
typeTable.getClassNameForQName(typeQName);
+if (className != null) {
+try {
+beanClass =
Loader.loadClass(beanClass.getClassLoader(), className);
+} catch (ClassNotFoundException ce) {
+throw AxisFault.makeFault(ce);
+}
+} else {
+throw new AxisFault("Unknow type " + typeQName);
+}
}
}
svn commit: r1055001 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa
Author: shankar Date: Tue Jan 4 12:46:46 2011 New Revision: 1055001 URL: http://svn.apache.org/viewvc?rev=1055001&view=rev Log: Reverting version numbers and fixing branch svn url Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_5_x/pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 4 12:46:46 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue Jan 4 12:46:46 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 4 12:46:46 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml Tue Jan 4 12:46:46 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan 4 12:46:46 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff ===
svn commit: r1055016 - in /axis/axis2/java/rampart/trunk: modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml pom.xml
Author: shankar Date: Tue Jan 4 12:51:21 2011 New Revision: 1055016 URL: http://svn.apache.org/viewvc?rev=1055016&view=rev Log: fixing svn url Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/trunk/pom.xml Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1055016&r1=1055015&r2=1055016&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Tue Jan 4 12:51:21 2011 @@ -37,11 +37,11 @@ Rampart - Mar - scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk - scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk - https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1055016&r1=1055015&r2=1055016&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Tue Jan 4 12:51:21 2011 @@ -38,10 +38,10 @@ Rampart - Trust-Mar - scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk - scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java - https://svn.apache.org/repos/asf/webservices/rampart/trunk/java + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk +http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk Modified: axis/axis2/java/rampart/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1055016&r1=1055015&r2=1055016&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Tue Jan 4 12:51:21 2011 @@ -106,12 +106,12 @@ - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk - https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk +http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk
svn commit: r1055042 - /axis/axis2/java/rampart/tags/vv1.5.1/
Author: shankar Date: Tue Jan 4 14:07:11 2011 New Revision: 1055042 URL: http://svn.apache.org/viewvc?rev=1055042&view=rev Log: Removing unwanted tag Removed: axis/axis2/java/rampart/tags/vv1.5.1/
svn commit: r1055044 - /axis/axis2/java/rampart/tags/v1.5.1/
Author: shankar Date: Tue Jan 4 14:07:48 2011 New Revision: 1055044 URL: http://svn.apache.org/viewvc?rev=1055044&view=rev Log: Removing 1.5.1 tag to recreate it Removed: axis/axis2/java/rampart/tags/v1.5.1/
svn commit: r1055048 - in /axis/axis2/java/rampart/branches/1_5_x/release-docs: ChangeLog.txt NOTICE.txt README.txt
Author: shankar Date: Tue Jan 4 14:13:09 2011 New Revision: 1055048 URL: http://svn.apache.org/viewvc?rev=1055048&view=rev Log: Changing release dates Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt?rev=1055048&r1=1055047&r2=1055048&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt (original) +++ axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt Tue Jan 4 14:13:09 2011 @@ -1,7 +1,7 @@ This file contains a listing of all Jira issues that have been closed for a given release. -Release 1.5.1 - 23 Dec 2010 +Release 1.5.1 - 04 Jan 2011 === ** Bug Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt?rev=1055048&r1=1055047&r2=1055048&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt (original) +++ axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt Tue Jan 4 14:13:09 2011 @@ -1,5 +1,5 @@ Apache Rampart -Copyright 2010 The Apache Software Foundation +Copyright 2011 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt?rev=1055048&r1=1055047&r2=1055048&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt (original) +++ axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt Tue Jan 4 14:13:09 2011 @@ -1,5 +1,5 @@ == -Apache Rampart-1.5.1 build (Dec 23, 2010) +Apache Rampart-1.5.1 build (Jan 04, 2011) http://axis.apache.org/axis2/java/rampart --
svn commit: r1055058 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa
Author: shankar Date: Tue Jan 4 14:35:22 2011 New Revision: 1055058 URL: http://svn.apache.org/viewvc?rev=1055058&view=rev Log: [maven-release-plugin] prepare release v1.5.1 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_5_x/pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 4 14:35:22 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1-SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue Jan 4 14:35:22 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.1-SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 4 14:35:22 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1-SNAPSHOT +1.5.1 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml Tue Jan 4 14:35:22 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1-SNAPSHOT +1.5.1 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan 4 14:35:22 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.1-SNAPSHOT +1.5.1 ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 - http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x + http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff
svn commit: r1055060 - /axis/axis2/java/rampart/tags/v1.5.1/
Author: shankar Date: Tue Jan 4 14:35:36 2011 New Revision: 1055060 URL: http://svn.apache.org/viewvc?rev=1055060&view=rev Log: [maven-scm] copy for tag v1.5.1 Added: axis/axis2/java/rampart/tags/v1.5.1/ - copied from r1055058, axis/axis2/java/rampart/branches/1_5_x/
svn commit: r1055061 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa
Author: shankar Date: Tue Jan 4 14:35:48 2011 New Revision: 1055061 URL: http://svn.apache.org/viewvc?rev=1055061&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_5_x/pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 4 14:35:48 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue Jan 4 14:35:48 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 4 14:35:48 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml Tue Jan 4 14:35:48 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan 4 14:35:48 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff
svn commit: r1055120 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Author: azeez
Date: Tue Jan 4 17:56:00 2011
New Revision: 1055120
URL: http://svn.apache.org/viewvc?rev=1055120&view=rev
Log:
When enableMTOM is set to true on the server side, Axis2 sends an invalid
response. The root cause is the Content-Type which is correctly set by the
MessageFormatters being overridden by some code in the AxisServlet. Removing
this bit of code which blindly sets the Content-Type.
For more details see:
http://markmail.org/message/jrxjexqwi6oicvat?q=list:org.apache.ws.axis-dev
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java?rev=1055120&r1=1055119&r2=1055120&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Tue Jan 4 17:56:00 2011
@@ -159,9 +159,7 @@ public class AxisServlet extends HttpSer
.getProperty(RequestResponseTransport.TRANSPORT_CONTROL))
.awaitResponse();
}
-response.setContentType("text/xml; charset="
-+ msgContext
-
.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
+
// if data has not been sent back and this is not a signal
response
if (!TransportUtils.isResponseWritten(msgContext)
&& (((RequestResponseTransport)
svn commit: r1055301 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
Author: ruwan
Date: Wed Jan 5 05:54:22 2011
New Revision: 1055301
URL: http://svn.apache.org/viewvc?rev=1055301&view=rev
Log:
Fixing the issue AXIS2-4150, committing for Chamith
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?rev=1055301&r1=1055300&r2=1055301&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
Wed Jan 5 05:54:22 2011
@@ -233,7 +233,7 @@ public class AxisBindingOperation extend
// Add the input element
AxisBindingMessage inMessage = (AxisBindingMessage) this
-
.getChild(WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
+ .getChild(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inMessage != null) {
bindingOpElement.addChild(inMessage.toWSDL20(wsdl, tns,
wsoap,
whttp, namespaceMap));
@@ -241,7 +241,7 @@ public class AxisBindingOperation extend
// Add the output element
AxisBindingMessage outMessage = (AxisBindingMessage) this
-
.getChild(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
+
.getChild(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outMessage != null) {
bindingOpElement.addChild(outMessage.toWSDL20(wsdl,
tns, wsoap,
whttp, namespaceMap));
svn commit: r1055302 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: amilas
Date: Wed Jan 5 05:55:47 2011
New Revision: 1055302
URL: http://svn.apache.org/viewvc?rev=1055302&view=rev
Log:
use the efficient resolve Qname method
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1055302&r1=1055301&r2=1055302&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Wed Jan 5 05:55:47 2011
@@ -335,19 +335,7 @@ public class BeanUtil {
// to get the type table.
if (messageContext != null) {
AxisService axisService = messageContext.getAxisService();
-QName typeQName = null;
-if (instanceTypeName.indexOf(":") > -1) {
-String prefix = instanceTypeName.substring(0,
instanceTypeName.indexOf(":"));
-for (Iterator namespaceIter =
beanElement.getAllDeclaredNamespaces(); namespaceIter.hasNext();) {
-OMNamespace omNamespace = (OMNamespace)
namespaceIter.next();
-if (omNamespace.getPrefix().equals(prefix)) {
-typeQName = new
QName(omNamespace.getNamespaceURI(),
instanceTypeName.substring(instanceTypeName.indexOf(":") + 1));
-}
-}
-} else {
-typeQName = new QName(instanceTypeName);
-}
-
+QName typeQName =
beanElement.resolveQName(instanceTypeName);
TypeTable typeTable = axisService.getTypeTable();
String className =
typeTable.getClassNameForQName(typeQName);
if (className != null) {
svn commit: r1055310 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
Author: amilas
Date: Wed Jan 5 06:45:27 2011
New Revision: 1055310
URL: http://svn.apache.org/viewvc?rev=1055310&view=rev
Log:
fixing the issue AXIS2-3397
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1055310&r1=1055309&r2=1055310&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
Wed Jan 5 06:45:27 2011
@@ -31,6 +31,8 @@ import javax.activation.DataHandler;
import javax.xml.namespace.QName;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.net.URI;
+import java.net.URISyntaxException;
public class SimpleTypeMapper {
@@ -45,6 +47,7 @@ public class SimpleTypeMapper {
private static final String W_FLOAT = "java.lang.Float";
private static final String W_CALENDAR = "java.util.Calendar";
private static final String W_DATE = "java.util.Date";
+private static final String W_URI = URI.class.getName();
private static final String INT = "int";
private static final String BOOLEAN = "boolean";
private static final String BYTE = "byte";
@@ -141,8 +144,13 @@ public class SimpleTypeMapper {
}
else if(name.equals(YEAR_MONTH)) {
return new org.apache.axis2.databinding.types.YearMonth(text);
-}
-else {
+} else if(name.equals(W_URI)) {
+try {
+return new URI(text);
+} catch (URISyntaxException e) {
+throw new RuntimeException(" Invalid URI " + text, e);
+}
+} else {
return null;
}
}
@@ -253,7 +261,12 @@ public class SimpleTypeMapper {
return true;
} else if (objClassName.equals(W_DATE)) {
return true;
-} /*
+} else if (objClassName.equals(W_URI)) {
+return true;
+}
+
+
+/*
* consider BigDecimal, BigInteger, Day, Duration, Month
* MonthDay, Time, Year, YearMonth as simple type
*/
@@ -301,6 +314,8 @@ public class SimpleTypeMapper {
}
}
return zulu.format(obj);
+} else if (obj instanceof URI){
+return obj.toString();
}
return obj.toString();
}
svn commit: r1055338 - in /axis/axis2/java/core/trunk/modules: integration/test/org/apache/axis2/engine/ kernel/src/org/apache/axis2/context/ kernel/src/org/apache/axis2/description/ kernel/src/org/ap
Author: hemapani
Date: Wed Jan 5 07:48:44 2011
New Revision: 1055338
URL: http://svn.apache.org/viewvc?rev=1055338&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4196
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java?rev=1055338&r1=1055337&r2=1055338&view=diff
==
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
Wed Jan 5 07:48:44 2011
@@ -56,7 +56,7 @@ public class MessageContextChangeTest ex
new FieldDescription("java.lang.String", "TRANSPORT_SUCCEED"),
new FieldDescription("java.lang.String",
"DEFAULT_CHAR_SET_ENCODING"),
new FieldDescription("int", "FLOW"),
-new FieldDescription("java.lang.String", "TRANSPORT_NON_BLOCKING"),
+new FieldDescription("java.lang.String",
"CLIENT_API_NON_BLOCKING"),
new FieldDescription("java.lang.String",
"DISABLE_ASYNC_CALLBACK_ON_TRANSPORT_ERROR"),
new FieldDescription("boolean", "processingFault"),
new FieldDescription("boolean", "paused"),
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1055338&r1=1055337&r2=1055338&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
Wed Jan 5 07:48:44 2011
@@ -235,11 +235,15 @@ public class MessageContext extends Abst
public int FLOW = IN_FLOW;
/**
- * To invoke fireAndforget method we have to hand over transport sending
logic to a thread
- * other wise user has to wait till it get transport response (in the case
of HTTP its HTTP
- * 202)
+ * To invoke fireAndforget method we have to hand over transport sending
logic to a thread
+ * other wise user has to wait till it get transport response (in the
case of HTTP its HTTP
+ * 202)
+ * 202). This was eariler named TRANSPORT_NON_BLOCKING, but that name is
wrong as transport non blocking is NIO,
+ * which has nothing to do with this property. See
https://issues.apache.org/jira/browse/AXIS2-4196.
+ * Renaming this to CLIENT_API_NON_BLOCKING instead.
+ *
*/
-public static final String TRANSPORT_NON_BLOCKING = "transportNonBlocking";
+public static final String CLIENT_API_NON_BLOCKING =
"ClientApiNonBlocking";
/**
* This property allows someone (e.g. RM) to disable an async callback from
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=1055338&r1=1055337&r2=1055338&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
Wed Jan 5 07:48:44 2011
@@ -307,7 +307,7 @@ class OutInAxisOperationClient extends O
}
//if we don't do this , this guy will wait till it gets HTTP 202 in
the HTTP case
-mc.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.TRUE);
+mc.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.TRUE);
mc.getConfigurationContext().registerOperationContext(mc.getMessageID(), oc);
AxisEngine.send(mc);
if (internalCallback != null) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL:
http://svn.apache.org/viewvc/ax
