svn commit: r1071949 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Author: amilas
Date: Fri Feb 18 10:41:40 2011
New Revision: 1071949
URL: http://svn.apache.org/viewvc?rev=1071949&view=rev
Log:
ignoring the elements without a type and minoccurs zero
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1071949&r1=1071948&r2=1071949&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Fri Feb 18 10:41:40 2011
@@ -139,6 +139,10 @@ public class BuilderUtil {
while (iterator.hasNext()) {
XmlSchemaElement innerElement =
(XmlSchemaElement)iterator.next();
QName qName = innerElement.getQName();
+// ignoring the elements without proper type and
minoccurs zero
+if ((innerElement.getSchemaType() == null) &&
(innerElement.getMinOccurs() == 0)){
+continue;
+}
if (qName == null &&
innerElement.getSchemaTypeName()
.equals(org.apache.ws.commons.schema.constants.Constants.XSD_ANYTYPE)) {
createSOAPMessageWithoutSchema(soapFactory,
bodyFirstChild,
svn commit: r1071959 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Author: amilas
Date: Fri Feb 18 10:58:08 2011
New Revision: 1071959
URL: http://svn.apache.org/viewvc?rev=1071959&view=rev
Log:
applied the patch for AXIS2-4956
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1071959&r1=1071958&r2=1071959&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Fri Feb 18 10:58:08 2011
@@ -275,19 +275,53 @@ public class AxisService2WSDL11 implemen
}
// generate fault Messages
- ArrayList faultyMessages =
axisOperation.getFaultMessages();
+ ArrayList faultyMessages =
this.extractWSDL11FaultMessages(axisOperation);
if (faultyMessages != null) {
-for (Object faultyMessage : faultyMessages) {
-AxisMessage axisMessage = (AxisMessage)faultyMessage;
-String name = axisMessage.getName();
+for (AxisMessage faultyMessage : faultyMessages) {
+String name = faultyMessage.getName();
if (faultMessageNames.add(name)) {
-writeMessage(axisMessage, fac, defintions);
-generateHeaderMessages(axisMessage, fac, defintions);
+writeMessage(faultyMessage, fac, defintions);
+generateHeaderMessages(faultyMessage, fac, defintions);
}
}
}
}
}
+
+ /**
+* Checks if the given MEP is supported for containing fault messages.
+*/
+ private boolean isWSDL11FaultyMessagesValidForMEP(String mepURI) {
+ return !(WSDL2Constants.MEP_URI_IN_ONLY.equals(mepURI) ||
+
WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI));
+ }
+
+ /**
+* Return the fault messages only if it's not an in-only operation.
+* For WSDL11 generation, the fault messages must be not present in the
operation,
+* as mentioned in http://www.w3.org/TR/wsdl#_one-way.
+*/
+ private ArrayList extractWSDL11FaultMessages(AxisOperation
axisOperation) {
+ String mepURI = axisOperation.getMessageExchangePattern();
+ if (this.isWSDL11FaultyMessagesValidForMEP(mepURI)) {
+ return axisOperation.getFaultMessages();
+ } else {
+ return new ArrayList();
+ }
+ }
+
+ /**
+* @see AxisService2WSDL11#extractWSDL11FaultMessages(AxisOperation)
+*/
+ private ArrayList extractWSDL11FaultMessages(
+ AxisBindingOperation axisBindingOperation) {
+ String mepURI =
axisBindingOperation.getAxisOperation().getMessageExchangePattern();
+ if (this.isWSDL11FaultyMessagesValidForMEP(mepURI)) {
+ return axisBindingOperation.getFaults();
+ } else {
+ return new ArrayList();
+ }
+ }
private void generateHeaderMessages(AxisMessage axismessage, OMFactory
fac,
OMElement defintions) {
@@ -421,21 +455,20 @@ public class AxisService2WSDL11 implemen
}
// generate fault Messages
- ArrayList faultMessages =
axisOperation.getFaultMessages();
+ ArrayList faultMessages =
this.extractWSDL11FaultMessages(axisOperation);
if (faultMessages != null) {
-for (Object faultMessage : faultMessages) {
-AxisMessage faultyMessage = (AxisMessage)faultMessage;
+for (AxisMessage faultMessage : faultMessages) {
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
wsdl);
-
WSDLSerializationUtil.addWSDLDocumentationElement(faultyMessage,
+
WSDLSerializationUtil.addWSDLDocumentationElement(faultMessage,
fault,
fac,
wsdl);
fault.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
- + ":" +
faultyM
svn commit: r1072072 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Author: veithen
Date: Fri Feb 18 17:22:37 2011
New Revision: 1072072
URL: http://svn.apache.org/viewvc?rev=1072072&view=rev
Log:
Reverted r1071949 because that change causes test failures in axis2-integration.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1072072&r1=1072071&r2=1072072&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Fri Feb 18 17:22:37 2011
@@ -139,10 +139,6 @@ public class BuilderUtil {
while (iterator.hasNext()) {
XmlSchemaElement innerElement =
(XmlSchemaElement)iterator.next();
QName qName = innerElement.getQName();
-// ignoring the elements without proper type and
minoccurs zero
-if ((innerElement.getSchemaType() == null) &&
(innerElement.getMinOccurs() == 0)){
-continue;
-}
if (qName == null &&
innerElement.getSchemaTypeName()
.equals(org.apache.ws.commons.schema.constants.Constants.XSD_ANYTYPE)) {
createSOAPMessageWithoutSchema(soapFactory,
bodyFirstChild,
svn commit: r1072077 - in /axis/axis2/java/core/trunk: modules/parent/pom.xml pom.xml
Author: veithen Date: Fri Feb 18 17:29:32 2011 New Revision: 1072077 URL: http://svn.apache.org/viewvc?rev=1072077&view=rev Log: Applied r1071883 also to the trunk and removed a pluginManagement entry that becomes obsolete after upgrading the org.apache:apache parent POM. Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml axis/axis2/java/core/trunk/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=1072077&r1=1072076&r2=1072077&view=diff == --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Fri Feb 18 17:29:32 2011 @@ -23,7 +23,7 @@ org.apache apache -7 +8 4.0.0 org.apache.axis2 @@ -1035,12 +1035,6 @@ 1.2 - -org.apache.maven.plugins -maven-gpg-plugin -1.1 - - org.apache.felix maven-bundle-plugin 2.1.0 Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1072077&r1=1072076&r2=1072077&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Fri Feb 18 17:29:32 2011 @@ -23,7 +23,7 @@ org.apache apache -7 +8 4.0.0 org.apache.axis2 @@ -559,12 +559,6 @@ - -org.apache.maven.plugins -maven-gpg-plugin -1.1 - - maven-javadoc-plugin 2.7
svn commit: r1072166 - in /axis/axis2/java/core/trunk: ./ modules/adb-codegen/test-resources/testsuite/ modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ modules/kernel/src/org/apach
Author: veithen
Date: Fri Feb 18 21:55:13 2011
New Revision: 1072166
URL: http://svn.apache.org/viewvc?rev=1072166&view=rev
Log:
Wiped the svn:mergeinfo properties from the trunk. They were only relevant for
tracking merges from the 1.5 branch to the trunk. However we are no longer
going to do that (all merges should go from the trunk to the
release/maintenance branch).
Modified:
axis/axis2/java/core/trunk/ (props changed)
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/attribute.xsd
(props changed)
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
(props changed)
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
(props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (props
changed)
axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
(props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
(props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
(props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
(props changed)
axis/axis2/java/core/trunk/modules/transport/http/pom.xml (props changed)
axis/axis2/java/core/trunk/modules/transport/http/src/ (props changed)
axis/axis2/java/core/trunk/modules/transport/local/ (props changed)
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/
(props changed)
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/
(props changed)
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
(props changed)
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/trunk/
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/attribute.xsd
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/trunk/modules/
svn commit: r1072176 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/test-resources/testsuite/ modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ modules/kernel/src/or
Author: veithen
Date: Fri Feb 18 22:27:23 2011
New Revision: 1072176
URL: http://svn.apache.org/viewvc?rev=1072176&view=rev
Log:
Removed the svn:mergeinfo properties that were copied over from the trunk when
the 1.6 branch was created.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/attribute.xsd
(props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
(props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml
(props changed)
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
(props changed)
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
(props changed)
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
(props changed)
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
(props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml (props
changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/1_6/modules/transport/local/ (props changed)
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/
(props changed)
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/
(props changed)
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/1_6/
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/attribute.xsd
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
('svn:mergeinfo' removed)
Propchange:
axis/axis2/java/core/branches/1_6/modules/kernel/sr
svn commit: r1072177 - in /axis/axis2/java/core/branches/1_6: ./ modules/parent/pom.xml pom.xml
Author: veithen Date: Fri Feb 18 22:29:22 2011 New Revision: 1072177 URL: http://svn.apache.org/viewvc?rev=1072177&view=rev Log: Merged r1072077 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/parent/pom.xml axis/axis2/java/core/branches/1_6/pom.xml Propchange: axis/axis2/java/core/branches/1_6/ -- svn:mergeinfo = /axis/axis2/java/core/trunk:1072077 Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1072177&r1=1072176&r2=1072177&view=diff == --- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Fri Feb 18 22:29:22 2011 @@ -1031,12 +1031,6 @@ 1.2 - -org.apache.maven.plugins -maven-gpg-plugin -1.1 - - org.apache.felix maven-bundle-plugin 2.1.0 Modified: axis/axis2/java/core/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1072177&r1=1072176&r2=1072177&view=diff == --- axis/axis2/java/core/branches/1_6/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/pom.xml Fri Feb 18 22:29:22 2011 @@ -559,12 +559,6 @@ - -org.apache.maven.plugins -maven-gpg-plugin -1.1 - - maven-javadoc-plugin 2.7
svn commit: r1072178 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen
Date: Fri Feb 18 22:37:27 2011
New Revision: 1072178
URL: http://svn.apache.org/viewvc?rev=1072178&view=rev
Log:
Replaced tabs by spaces.
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=1072178&r1=1072177&r2=1072178&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Fri Feb 18 22:37:27 2011
@@ -102,7 +102,7 @@
nandana AT apache.org
-
+
Thilina Buddhika
thilinamb
thilinamb AT apache.org
@@ -250,7 +250,7 @@
xmlsec
${xmlsec.version}
-
+
org.opensaml
opensaml1
1.1
@@ -377,7 +377,7 @@
modules/documentation
modules/distribution
-
+
maven-assembly-plugin
@@ -422,7 +422,7 @@
1.2.12-SNAPSHOT
1.5.12-SNAPSHOT
- 1.4.2
+1.4.2
1.1
140
@@ -437,7 +437,7 @@
-
+
apache.snapshots.https
${distMgmtSnapshotsName}
svn commit: r1072180 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen Date: Fri Feb 18 22:40:26 2011 New Revision: 1072180 URL: http://svn.apache.org/viewvc?rev=1072180&view=rev Log: Added an 'everything' profile that includes all modules. 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=1072180&r1=1072179&r2=1072180&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Fri Feb 18 22:40:26 2011 @@ -400,6 +400,16 @@ + + + +everything + +modules/documentation +modules/distribution + +
svn commit: r1072182 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen Date: Fri Feb 18 22:47:06 2011 New Revision: 1072182 URL: http://svn.apache.org/viewvc?rev=1072182&view=rev Log: Set autoVersionSubmodules=true; submodules always have the same version as the root POM. 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=1072182&r1=1072181&r2=1072182&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Fri Feb 18 22:47:06 2011 @@ -171,6 +171,16 @@ + + + +maven-release-plugin + +true + + + +
svn commit: r1072187 - /axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
Author: veithen
Date: Fri Feb 18 23:06:08 2011
New Revision: 1072187
URL: http://svn.apache.org/viewvc?rev=1072187&view=rev
Log:
Applied r1054918 also to the trunk (was applied only to the 1_5_x branch).
Modified:
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1072187&r1=1072186&r2=1072187&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Fri Feb 18
23:06:08 2011
@@ -102,13 +102,13 @@
org.apache.rampart
rampart
-${rampart.mar.version}
+${pom.version}
mar
org.apache.rampart
rahas
-${rahas.mar.version}
+${pom.version}
mar
svn commit: r1072188 - /axis/axis2/java/rampart/branches/1_5_x/
Author: veithen Date: Fri Feb 18 23:09:06 2011 New Revision: 1072188 URL: http://svn.apache.org/viewvc?rev=1072188&view=rev Log: Updated svn:mergeinfo on the 1.5 branch. Modified: axis/axis2/java/rampart/branches/1_5_x/ (props changed) Propchange: axis/axis2/java/rampart/branches/1_5_x/ -- svn:mergeinfo = /axis/axis2/java/rampart/trunk:1072187
svn commit: r1072189 [1/3] - in /axis/axis2/java/rampart/trunk: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart-
Author: veithen
Date: Fri Feb 18 23:12:17 2011
New Revision: 1072189
URL: http://svn.apache.org/viewvc?rev=1072189&view=rev
Log:
[maven-release-plugin] prepare branch 1_6
Modified:
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
axis/axis2/java/rampart/trunk/modules/documentation/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1072189&r1=1072188&r2=1072189&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Fri Feb 18
23:12:17 2011
@@ -1,141 +1,133 @@
-
-
-
-
-
-http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
-
-org.apache.rampart
-rampart-project
-SNAPSHOT
-../../pom.xml
-
-4.0.0
-rampart-dist
-pom
-Rampart - Distribution
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.1
-
-
-build-javadoc
-package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-run
-
-
-
-
-
-org.apache.maven.plugins
-maven-assembly-plugin
-
-
-distribution-package
-package
-
-single
-
-
-
-bin.xml
-src.xml
-
-
-
-
-
-
-
-
-
-
-org.apache.rampart
-rampart
-${pom.version}
-mar
-
-
-org.apache.rampart
-rahas
-${pom.version}
-mar
-
-
-org.apache.rampart
-rampart-core
-${pom.version}
-
-
-org.apache.rampart
-rampart-policy
-${pom.version}
-
-
-org.apache.rampart
-rampart-trust
-${pom.version}
-
-
-bouncycastle
-bcprov-jdk14
-${bcprov.jdk14.version}
-
-
-bouncycastle
-bcprov-jdk15
-${bcprov.jdk15.version}
-
-
-
+
+
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+
+org.apache.rampart
+rampart-project
+1.6-SNAPSHOT
+../../pom.xml
+
+4.0.0
+rampart-dist
+pom
+Rampart - Distribution
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+1.1
+
+
+build-javadoc
+package
+
+
+
+
+
+
+
+
+
+
+
svn commit: r1072190 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart
Author: veithen Date: Fri Feb 18 23:12:35 2011 New Revision: 1072190 URL: http://svn.apache.org/viewvc?rev=1072190&view=rev Log: [maven-release-plugin] copy for branch 1_6 Added: axis/axis2/java/rampart/branches/1_6/ - copied from r1072188, axis/axis2/java/rampart/trunk/ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_6/pom.xml - copied unchanged from r1072189, axis/axis2/java/rampart/trunk/pom.xml
svn commit: r1072191 - in /axis/axis2/java/rampart/trunk: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart-policy
Author: veithen Date: Fri Feb 18 23:12:49 2011 New Revision: 1072191 URL: http://svn.apache.org/viewvc?rev=1072191&view=rev Log: [maven-release-plugin] prepare release 1_6 Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml axis/axis2/java/rampart/trunk/modules/documentation/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml axis/axis2/java/rampart/trunk/pom.xml Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1072191&r1=1072190&r2=1072191&view=diff == --- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Fri Feb 18 23:12:49 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.7-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/trunk/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/pom.xml?rev=1072191&r1=1072190&r2=1072191&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/pom.xml Fri Feb 18 23:12:49 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.7-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1072191&r1=1072190&r2=1072191&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Fri Feb 18 23:12:49 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.7-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1072191&r1=1072190&r2=1072191&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Fri Feb 18 23:12:49 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.7-SNAPSHOT ../../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=1072191&r1=1072190&r2=1072191&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Fri Feb 18 23:12:49 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.7-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 + 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/branches/1_6 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk - http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml?rev=1072191&r1=1072190&r2=1072191&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml Fri Feb 18 23:12:49 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -
svn commit: r1072205 - /axis/axis2/java/rampart/branches/1_6/pom.xml
Author: veithen
Date: Fri Feb 18 23:57:27 2011
New Revision: 1072205
URL: http://svn.apache.org/viewvc?rev=1072205&view=rev
Log:
Updated dependency versions on the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/pom.xml
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1072205&r1=1072204&r2=1072205&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Fri Feb 18 23:57:27 2011
@@ -436,10 +436,10 @@
${pom.version}
${pom.version}
-SNAPSHOT
-1.2.12-SNAPSHOT
+1.6.0-SNAPSHOT
+1.2.11
-1.5.12-SNAPSHOT
+1.5.11
1.4.2
1.1
svn commit: r1072255 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Author: amilas
Date: Sat Feb 19 05:16:35 2011
New Revision: 1072255
URL: http://svn.apache.org/viewvc?rev=1072255&view=rev
Log:
fixing the issue with earlier patch. it should be
innerElement.getSchemaTypeName(). if this is null it anyway casue a null
pointer exception. now all the tests passed
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1072255&r1=1072254&r2=1072255&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Sat Feb 19 05:16:35 2011
@@ -139,6 +139,10 @@ public class BuilderUtil {
while (iterator.hasNext()) {
XmlSchemaElement innerElement =
(XmlSchemaElement)iterator.next();
QName qName = innerElement.getQName();
+// ignoring the elements without proper type and
minoccurs zero
+if ((innerElement.getSchemaTypeName() == null) &&
(innerElement.getMinOccurs() == 0)){
+continue;
+}
if (qName == null &&
innerElement.getSchemaTypeName()
.equals(org.apache.ws.commons.schema.constants.Constants.XSD_ANYTYPE)) {
createSOAPMessageWithoutSchema(soapFactory,
bodyFirstChild,
