svn commit: r1067415 - /axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
Author: amilas
Date: Sat Feb 5 10:32:10 2011
New Revision: 1067415
URL: http://svn.apache.org/viewvc?rev=1067415&view=rev
Log:
readding the method without method name qname to support faults. faults need
toOM method
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?rev=1067415&r1=1067414&r2=1067415&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
Sat Feb 5 10:32:10 2011
@@ -83,6 +83,27 @@
}
}
+private org.apache.axiom.om.OMElement toOM( param, boolean optimizeContent)
+throws org.apache.axis2.AxisFault {
+try {
+javax.xml.bind.JAXBContext context = wsContext;
+javax.xml.bind.Marshaller marshaller =
context.createMarshaller();
+
marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+
+org.apache.axiom.om.OMFactory factory =
org.apache.axiom.om.OMAbstractFactory.getOMFactory();
+
+JaxbRIDataSource source = new JaxbRIDataSource(
.class,
+
param,
+
marshaller,
+
"",
+
"");
+org.apache.axiom.om.OMNamespace namespace =
factory.createOMNamespace("", null);
+return factory.createOMElement(source,
"", namespace);
+} catch (javax.xml.bind.JAXBException bex){
+throw org.apache.axis2.AxisFault.makeFault(bex);
+}
+}
+
private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, param, boolean optimizeContent, javax.xml.namespace.QName
methodQName)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
svn commit: r1067421 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Author: amilas
Date: Sat Feb 5 10:39:53 2011
New Revision: 1067421
URL: http://svn.apache.org/viewvc?rev=1067421&view=rev
Log:
Avoding and special behavior for exception classes at the java.lang package
such as java.lang.ClassNotFoundException
Modified:
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/TypeTable.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1067421&r1=1067420&r2=1067421&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
Sat Feb 5 10:39:53 2011
@@ -156,10 +156,18 @@ public class TypeTable {
public QName getSimpleSchemaTypeName(String typeName) {
QName qName = (QName) simpleTypetoxsd.get(typeName);
if(qName == null){
-
if((typeName.startsWith("java.lang")||typeName.startsWith("javax.")) &&
-!Exception.class.getName().equals(typeName)){
+ Class typeClass = null;
+try {
+typeClass = Class.forName(typeName);
+} catch (ClassNotFoundException e) {
+// we need to do this change only with the proper classes.
this my gives
+// the exceptions but that should be ok.
+}
+if ((typeName.startsWith("java.lang") ||
typeName.startsWith("javax.")) &&
+!Exception.class.isAssignableFrom(typeClass)) {
return ANY_TYPE;
}
+
}
return qName;
}
svn commit: r1067434 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: veithen Date: Sat Feb 5 12:52:35 2011 New Revision: 1067434 URL: http://svn.apache.org/viewvc?rev=1067434&view=rev Log: Updated Axiom snapshot version. Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1067434&r1=1067433&r2=1067434&view=diff == --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sat Feb 5 12:52:35 2011 @@ -67,7 +67,7 @@ -1.2.11-SNAPSHOT +1.2.12-SNAPSHOT 3.0.0-SNAPSHOT 1.0-SNAPSHOT
svn commit: r1067436 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen
Date: Sat Feb 5 12:55:11 2011
New Revision: 1067436
URL: http://svn.apache.org/viewvc?rev=1067436&view=rev
Log:
Updated Axiom snapshot version.
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1067436&r1=1067435&r2=1067436&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sat Feb 5 12:55:11 2011
@@ -413,7 +413,7 @@
${pom.version}
SNAPSHOT
-1.2.11-SNAPSHOT
+1.2.12-SNAPSHOT
1.5.11-SNAPSHOT
1.4.2
svn commit: r1067437 - /axis/axis2/java/sandesha/trunk/pom.xml
Author: veithen Date: Sat Feb 5 12:55:51 2011 New Revision: 1067437 URL: http://svn.apache.org/viewvc?rev=1067437&view=rev Log: Updated Axiom snapshot version. Modified: axis/axis2/java/sandesha/trunk/pom.xml Modified: axis/axis2/java/sandesha/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1067437&r1=1067436&r2=1067437&view=diff == --- axis/axis2/java/sandesha/trunk/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/pom.xml Sat Feb 5 12:55:51 2011 @@ -426,7 +426,7 @@ SNAPSHOT SNAPSHOT -1.2.11-SNAPSHOT +1.2.12-SNAPSHOT 3.0.0-SNAPSHOT 1.1.1 3.8.2
svn commit: r1067439 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Author: veithen
Date: Sat Feb 5 13:36:05 2011
New Revision: 1067439
URL: http://svn.apache.org/viewvc?rev=1067439&view=rev
Log:
Reverted r1067421 because this change is causing a build failure.
Modified:
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/TypeTable.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1067439&r1=1067438&r2=1067439&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
Sat Feb 5 13:36:05 2011
@@ -156,18 +156,10 @@ public class TypeTable {
public QName getSimpleSchemaTypeName(String typeName) {
QName qName = (QName) simpleTypetoxsd.get(typeName);
if(qName == null){
- Class typeClass = null;
-try {
-typeClass = Class.forName(typeName);
-} catch (ClassNotFoundException e) {
-// we need to do this change only with the proper classes.
this my gives
-// the exceptions but that should be ok.
-}
-if ((typeName.startsWith("java.lang") ||
typeName.startsWith("javax.")) &&
-!Exception.class.isAssignableFrom(typeClass)) {
+
if((typeName.startsWith("java.lang")||typeName.startsWith("javax.")) &&
+!Exception.class.getName().equals(typeName)){
return ANY_TYPE;
}
-
}
return qName;
}
svn commit: r1067496 - /axis/axis2/java/core/trunk/etc/doap_Axis2.rdf
Author: veithen Date: Sat Feb 5 20:01:18 2011 New Revision: 1067496 URL: http://svn.apache.org/viewvc?rev=1067496&view=rev Log: Added entry for 1.5.4 to the DOAP file. Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/etc/doap_Axis2.rdf?rev=1067496&r1=1067495&r2=1067496&view=diff == --- axis/axis2/java/core/trunk/etc/doap_Axis2.rdf (original) +++ axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Sat Feb 5 20:01:18 2011 @@ -56,6 +56,7 @@ Apache Axis22009-10-231.5.1 Apache Axis22010-09-061.5.2 Apache Axis22010-11-121.5.3 +Apache Axis22010-12-191.5.4
svn commit: r1067497 - /axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf
Author: veithen Date: Sat Feb 5 20:03:07 2011 New Revision: 1067497 URL: http://svn.apache.org/viewvc?rev=1067497&view=rev Log: Added entry for 1.4 to the DOAP file. Modified: axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf Modified: axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf?rev=1067497&r1=1067496&r2=1067497&view=diff == --- axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf (original) +++ axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf Sat Feb 5 20:03:07 2011 @@ -36,6 +36,7 @@ Java http://projects.apache.org/category/xml"/> Apache Sandesha208-10-20071.3 +Apache Sandesha219-12-20101.4 http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk"/>
svn commit: r1067601 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.j
Author: amilas
Date: Sun Feb 6 06:24:20 2011
New Revision: 1067601
URL: http://svn.apache.org/viewvc?rev=1067601&view=rev
Log:
append the operation name to the exception element. other wise if both the
exception complex type and element name in the same schema, jaxbri code
generation throws an exception
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1067601&r1=1067600&r2=1067601&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
Sun Feb 6 06:24:20 2011
@@ -174,7 +174,7 @@ public class RPCMessageReceiver extends
for (Class exceptionType : exceptionTypes){
if
(exceptionType.getName().equals(cause.getClass().getName())){
// this is an bussiness logic exception so handle it
properly
-String partQName = getSimpleClassName(exceptionType);
+String partQName = method.getName() +
getSimpleClassName(exceptionType);
TypeTable typeTable =
inMessage.getAxisService().getTypeTable();
QName elementQName =
typeTable.getQNamefortheType(partQName);
SOAPFactory fac = getSOAPFactory(inMessage);
@@ -190,8 +190,9 @@ public class RPCMessageReceiver extends
exceptionElement.addChild(innterExceptionElement);
} else {
// if it is a normal bussiness exception we need to
generate the schema assuming it is a pojo
+QName innerElementQName = new
QName(elementQName.getNamespaceURI(), getSimpleClassName(exceptionType));
XMLStreamReader xr = BeanUtil.getPullParser(cause,
-elementQName, typeTable, true, false);
+innerElementQName, typeTable, true, false);
StAXOMBuilder stAXOMBuilder = new
StAXOMBuilder(OMAbstractFactory.getOMFactory(), new StreamWrapper(xr));
OMElement documentElement =
stAXOMBuilder.getDocumentElement();
exceptionElement.addChild(documentElement);
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=1067601&r1=1067600&r2=1067601&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
Sun Feb 6 06:24:20 2011
@@ -443,7 +443,7 @@ public class DefaultSchemaGenerator impl
if (AxisFault.class.getName().equals(extype.getName())) {
continue;
}
-String partQname = getSimpleClassName(extype);
+String partQname = jMethod.getName() +
getSimpleClassName(extype);
methodSchemaType = createSchemaTypeForFault(partQname);
QName elementName =
new QName(this.schemaTargetNameSpace, partQname,
this.schema_namespace_prefix);
@@ -473,7 +473,7 @@ public class DefaultSchemaGenerator impl
continue;
}
AxisMessage faultMessage = new AxisMessage();
-faultMessage.setName(getSimpleClassName(extype));
+faultMessage.setName(jMethod.getName() +
getSimpleClassName(extype));
faultMessage.setElementQName(typeTable.getQNamefortheType(partQname));
axisOperation.setFaultMessages(faultMessage);
}
