svn commit: r1174567 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java adb/src/org/apache/axis2/databinding/utils/BeanUtil.java kernel/sr
Author: sagara
Date: Fri Sep 23 07:37:31 2011
New Revision: 1174567
URL: http://svn.apache.org/viewvc?rev=1174567&view=rev
Log:
Fixed AXIS2-5151.
Supported to use Date objects with xs:type attributes in Object Arrays , Object
Collections and Object Maps.
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.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=1174567&r1=1174566&r2=1174567&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
Fri Sep 23 07:37:31 2011
@@ -31,6 +31,7 @@ import org.apache.axis2.description.Axis
import org.w3c.dom.Document;
import javax.activation.DataHandler;
+import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -234,7 +235,7 @@ public class SimpleTypeMapper {
return false;
}
String objClassName = obj.getClass().getName();
-return obj instanceof Calendar || obj instanceof Date ||
isSimpleType(objClassName);
+return obj instanceof Calendar || obj instanceof Date || obj
instanceof XMLGregorianCalendar || isSimpleType(objClassName);
}
public static boolean isSimpleType(Class obj) {
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=1174567&r1=1174566&r2=1174567&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
Fri Sep 23 07:37:31 2011
@@ -66,7 +66,6 @@ import org.apache.axis2.databinding.type
import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
import org.apache.axis2.deployment.util.BeanExcludeInfo;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.Loader;
@@ -1311,10 +1310,6 @@ public class BeanUtil {
element.declareNamespace(xsdNS);
QName xsdType = typeTable.getSchemaTypeName(resObject.getClass()
.getName());
-if (xsdType == null && resObject instanceof XMLGregorianCalendar) {
-xsdType = new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "date",
-"xs");
-}
String attrValue = xsdType.getPrefix() + ":" +
xsdType.getLocalPart();
element.addAttribute(Constants.XSI_TYPE_ATTRIBUTE, attrValue,
xsiNS);
}
@@ -1731,10 +1726,6 @@ public class BeanUtil {
if (SimpleTypeMapper.isSimpleType(value)) {
omValue.addChild(fac.createOMText(SimpleTypeMapper
.getStringValue(value)));
-} else if (value instanceof XMLGregorianCalendar) {
-omValue.addChild(fac
-.createOMText(((XMLGregorianCalendar) value)
-.toXMLFormat()));
} else {
QName name;
if(elementFormDefault) {
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=1174567&r1=1174566&r2=1174567&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
Fri Sep 23 07:37:31 2011
@@ -160,6 +160,8 @@ public class TypeTable {
//byteArrat
simpleTypetoxsd.put("base64Binary",
new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD,
"
svn commit: r1174586 - /axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
Author: sagara
Date: Fri Sep 23 08:29:14 2011
New Revision: 1174586
URL: http://svn.apache.org/viewvc?rev=1174586&view=rev
Log:
Applied patch for SANDESHA2-209.
Modified:
axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml?rev=1174586&r1=1174585&r2=1174586&view=diff
==
--- axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml (original)
+++ axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml Fri Sep 23
08:29:14 2011
@@ -375,7 +375,7 @@ public class RMSampleService {
Add all the jar files fromAXIS2_HOME/lib directory to your
CLASSPATH.
- Put the Sandesha2 jar file (sandesha2-.jar) to your
+ Put Sandesha2-client-constants-.jar and
Sandesha2-core-.jar files to your
CLASSPATH.
Create a 'UserguidePingClient.java' file with following content.
@@ -414,7 +414,7 @@ public class UserguidePingClient {
clientOptions.setTo(new EndpointReference (toEPR));
ServiceClient serviceClient = new ServiceClient
(configContext,null);
-clientOptions.setAction("urn:wsrm:Ping");
+clientOptions.setAction("urn:ping");
serviceClient.setOptions(clientOptions);
serviceClient.engageModule(new QName ("sandesha2"));
svn commit: r1174592 - /axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
Author: sagara
Date: Fri Sep 23 08:36:51 2011
New Revision: 1174592
URL: http://svn.apache.org/viewvc?rev=1174592&view=rev
Log:
Fixed SANDESHA2-210.
Modified:
axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml?rev=1174592&r1=1174591&r2=1174592&view=diff
==
--- axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml (original)
+++ axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml Fri Sep 23
08:36:51 2011
@@ -354,6 +354,7 @@ public class RMSampleService {
client repository (from now on referred as CLIENT_REPO).
Put the configured the axis2.xml file from the previous section to the
CLIENT_REPO directory & rename it as client_axis2.xml.
+Change http port in client_axis2.xml(we need different ports to run
asynchronous invocation)
Create a directory named 'modules' under the CLIENT_REPO.
Put the Sandesha mar (sandesha2-.mar) file from the
Sandesha2 binary distribution and the addressing mar file from the Axis2
@@ -401,7 +402,7 @@ public class UserguidePingClient {
private static final String applicationNamespaceName =
"http://tempuri.org/";;
private static final String ping = "ping";
private static final String Text = "Text";
-private static String toEPR =
"http://127.0.0.1:8070/axis2/services/RMSampleService";;
+private static String toEPR =
"http://127.0.0.1:8080/axis2/services/RMSampleService";;
private static String CLIENT_REPO_PATH = "CLIENT_REPO";
@@ -501,7 +502,7 @@ public class UserguideEchoClient {
private final static String Sequence = "Sequence";
private final static String echoStringResponse = "echoStringResponse";
private final static String EchoStringReturn = "EchoStringReturn";
-private static String toEPR =
"http://127.0.0.1:8070/axis2/services/RMSampleService";;
+private static String toEPR =
"http://127.0.0.1:8080/axis2/services/RMSampleService";;
private static String CLIENT_REPO_PATH = "Full path to the Client Repo
folder";
svn commit: r1174595 - /axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml
Author: sagara Date: Fri Sep 23 08:41:42 2011 New Revision: 1174595 URL: http://svn.apache.org/viewvc?rev=1174595&view=rev Log: Fixed SANDESHA2-114. Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml?rev=1174595&r1=1174594&r2=1174595&view=diff == --- axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml (original) +++ axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml Fri Sep 23 08:41:42 2011 @@ -201,7 +201,7 @@ a Axis2 environment. Simply follow the g SANDESHA2_HOME directory and put it to the AXIS2_HOME/repository/modules directory. - Get the Sandesha2-policy-.jar file from the + Get the Sandesha2-core- .jar file from the SANDESHA2_HOME directory and put it to the AXIS2_HOME/lib directory. Build the Axis2 web application by moving to the AXIS2_HOME/webapp
svn commit: r1174618 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Author: sagara
Date: Fri Sep 23 09:37:34 2011
New Revision: 1174618
URL: http://svn.apache.org/viewvc?rev=1174618&view=rev
Log:
Applied patch for AXIS2-5153.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1174618&r1=1174617&r2=1174618&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Fri Sep 23 09:37:34 2011
@@ -82,7 +82,7 @@ public class HTTPWorker implements Worke
response.addHeader(new BasicHeader("Location", contextPath));
return;
}
-if (uri.endsWith("axis2/services/")) {
+if (uri.endsWith(contextPath)) {
String s =
HTTPTransportReceiver.getServicesHTML(configurationContext);
response.setStatus(HttpStatus.SC_OK);
response.setContentType("text/html");
svn commit: r1174622 - in /axis/axis2/java/core/branches/1_6: ./ modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Author: sagara
Date: Fri Sep 23 09:47:43 2011
New Revision: 1174622
URL: http://svn.apache.org/viewvc?rev=1174622&view=rev
Log:
Merged r1174618 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 09:47:43 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1174622&r1=1174621&r2=1174622&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Fri Sep 23 09:47:43 2011
@@ -82,7 +82,7 @@ public class HTTPWorker implements Worke
response.addHeader(new BasicHeader("Location", contextPath));
return;
}
-if (uri.endsWith("axis2/services/")) {
+if (uri.endsWith(contextPath)) {
String s =
HTTPTransportReceiver.getServicesHTML(configurationContext);
response.setStatus(HttpStatus.SC_OK);
response.setContentType("text/html");
svn commit: r1174634 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
Author: sagara Date: Fri Sep 23 10:27:15 2011 New Revision: 1174634 URL: http://svn.apache.org/viewvc?rev=1174634&view=rev Log: Applied patch for AXIS2-4740. Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties?rev=1174634&r1=1174633&r2=1174634&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties (original) +++ axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties Fri Sep 23 10:27:15 2011 @@ -72,15 +72,15 @@ wsdl2code.arg34= wsdl2code.arg35= \t\t\t -Ewdc (for xmlbeans) - Generate code with a dummy schema. if someone use this option wsdl2code.arg36= \t\t\t they have to generate the xmlbeans code seperately with the scomp command comes with the wsdl2code.arg37= \t\t\t xmlbeans distribution and replace the Axis2 generated classes with correct classes -wsdl2code.arg38= --noBuildXML Don't generate the build.xml in the output directory -wsdl2code.arg39= --noWSDL Don't generate WSDL's in the resources directory -wsdl2code.arg40= --noMessageReceiver Don't generate a MessageReceiver in the generated sources -wsdl2code.arg41= --http-proxy-host Proxy host address if you are behind a firewall -wsdl2code.arg42= --http-proxy-port Proxy port address if you are behind a firewall -wsdl2code.arg43= -ep Exclude packages - these packages are deleted after code generation -wsdl2code.arg44= -sin Skeleton interface name - used to specify a name for skeleton interface other than the default one -wsdl2code.arg45= -scn Skeleton class name - used to specify a name for skeleton class other than the default one -wsdl2code.arg46= \t\t\t -EbindingFileName (for jaxbri) - specify the file path for the episode file +wsdl2code.arg38= \t\t\t -EbindingFileName (for jaxbri) - specify the file path for the episode file +wsdl2code.arg39= --noBuildXML Don't generate the build.xml in the output directory +wsdl2code.arg40= --noWSDL Don't generate WSDL's in the resources directory +wsdl2code.arg41= --noMessageReceiver Don't generate a MessageReceiver in the generated sources +wsdl2code.arg42= --http-proxy-host Proxy host address if you are behind a firewall +wsdl2code.arg43= --http-proxy-port Proxy port address if you are behind a firewall +wsdl2code.arg44= -ep Exclude packages - these packages are deleted after code generation +wsdl2code.arg45= -sin Skeleton interface name - used to specify a name for skeleton interface other than the default one +wsdl2code.arg46= -scn Skeleton class name - used to specify a name for skeleton class other than the default one wsdl2code.arg47= -oaa -change the absolute http addresses to local file addresses generated by wsdl2java tool wsdl2code.arg48= -ebc -generated Exceptions are inherited from this exception rather than the java.lang.Exception class wsdl2code.arg49= -uon -by default the first letter of the generated method name changeed to lowercase. This option stops that and make it same as operation name
svn commit: r1174636 - /axis/axis2/java/core/trunk/modules/samples/quickstartjibx/build.xml
Author: sagara Date: Fri Sep 23 10:31:53 2011 New Revision: 1174636 URL: http://svn.apache.org/viewvc?rev=1174636&view=rev Log: Applied patch for AXIS2-5142. Modified: axis/axis2/java/core/trunk/modules/samples/quickstartjibx/build.xml Modified: axis/axis2/java/core/trunk/modules/samples/quickstartjibx/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartjibx/build.xml?rev=1174636&r1=1174635&r2=1174636&view=diff == --- axis/axis2/java/core/trunk/modules/samples/quickstartjibx/build.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/quickstartjibx/build.xml Fri Sep 23 10:31:53 2011 @@ -103,7 +103,7 @@ - +
