svn commit: r1072266 - in /axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart: ./ builder/ policy/ util/
Author: thilinamb
Date: Sat Feb 19 08:18:05 2011
New Revision: 1072266
URL: http://svn.apache.org/viewvc?rev=1072266&view=rev
Log:
improving logging in Rampart Core and Rampart Policy moduels.
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1072266&r1=1072265&r2=1072266&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
Sat Feb 19 08:18:05 2011
@@ -52,6 +52,7 @@ import javax.xml.namespace.QName;
public class MessageBuilder {
private static Log log = LogFactory.getLog(MessageBuilder.class);
+private static boolean doDebug = log.isDebugEnabled();
public void build(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -135,13 +136,17 @@ public class MessageBuilder {
}
if(rpd.isTransportBinding()) {
-log.debug("Building transport binding");
-TransportBindingBuilder building = new TransportBindingBuilder();
-building.build(rmd);
+ if (doDebug) {
+ log.debug("Building transport binding");
+ }
+ TransportBindingBuilder building = new TransportBindingBuilder();
+ building.build(rmd);
} else if(rpd.isSymmetricBinding()) {
-log.debug("Building SymmetricBinding");
-SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
-builder.build(rmd);
+ if (doDebug) {
+ log.debug("Building SymmetricBinding");
+ }
+ SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
+ builder.build(rmd);
} else {
AsymmetricBindingBuilder builder = new AsymmetricBindingBuilder();
builder.build(rmd);
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1072266&r1=1072265&r2=1072266&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Sat Feb 19 08:18:05 2011
@@ -815,7 +815,9 @@ public class PolicyBasedResultsValidator
}
}
-log.debug("WSHandler: Certificate path could not be verified for
certificate with subject " + subjectString);
+if (doDebug) {
+log.debug("WSHandler: Certificate path could not be verified for
certificate with subject " + subjectString);
+}
return false;
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1072266&r1=1072265&r2=1072266&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
axis/axis2/java/rampart/
svn commit: r1072267 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: ./ builder/ policy/ util/
Author: thilinamb
Date: Sat Feb 19 08:18:32 2011
New Revision: 1072267
URL: http://svn.apache.org/viewvc?rev=1072267&view=rev
Log:
improving logging in Rampart Core and Rampart Policy moduels.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
Sat Feb 19 08:18:32 2011
@@ -52,6 +52,7 @@ import javax.xml.namespace.QName;
public class MessageBuilder {
private static Log log = LogFactory.getLog(MessageBuilder.class);
+private static boolean doDebug = log.isDebugEnabled();
public void build(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -135,13 +136,17 @@ public class MessageBuilder {
}
if(rpd.isTransportBinding()) {
-log.debug("Building transport binding");
-TransportBindingBuilder building = new TransportBindingBuilder();
-building.build(rmd);
+ if (doDebug) {
+ log.debug("Building transport binding");
+ }
+ TransportBindingBuilder building = new TransportBindingBuilder();
+ building.build(rmd);
} else if(rpd.isSymmetricBinding()) {
-log.debug("Building SymmetricBinding");
-SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
-builder.build(rmd);
+ if (doDebug) {
+ log.debug("Building SymmetricBinding");
+ }
+ SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
+ builder.build(rmd);
} else {
AsymmetricBindingBuilder builder = new AsymmetricBindingBuilder();
builder.build(rmd);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Sat Feb 19 08:18:32 2011
@@ -815,7 +815,9 @@ public class PolicyBasedResultsValidator
}
}
-log.debug("WSHandler: Certificate path could not be verified for
certificate with subject " + subjectString);
+if (doDebug) {
+log.debug("WSHandler: Certificate path could not be verified for
certificate with subject " + subjectString);
+}
return false;
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Sat Feb 19 08:18:32 2011
@@ -53,7
svn commit: r1072271 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Author: veithen
Date: Sat Feb 19 09:09:20 2011
New Revision: 1072271
URL: http://svn.apache.org/viewvc?rev=1072271&view=rev
Log:
Eliminated an illegal use of Sun specific classes discovered by Dan Kulp.
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1072271&r1=1072270&r2=1072271&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Sat Feb 19 09:09:20 2011
@@ -28,7 +28,6 @@ import org.apache.axis2.jaxws.descriptio
import org.apache.axis2.jaxws.description.builder.WebEndpointAnnot;
import org.apache.axis2.jaxws.description.builder.WebMethodAnnot;
import org.apache.axis2.jaxws.description.builder.WebResultAnnot;
-import sun.reflect.generics.reflectiveObjects.GenericArrayTypeImpl;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -39,6 +38,7 @@ import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
import javax.xml.ws.WebEndpoint;
import java.lang.reflect.Constructor;
+import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
@@ -347,7 +347,7 @@ public class JavaMethodsToMDCConverter {
mdc.setReturnType(fullType);
} else if (type instanceof Class) {
mdc.setReturnType(((Class)type).getName());
-} else if (type instanceof GenericArrayTypeImpl) {
+} else if (type instanceof GenericArrayType) {
mdc.setReturnType(type.getClass().getName());
}
}
svn commit: r1072272 - in /axis/axis2/java/core/branches/1_6: ./ modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Author: veithen
Date: Sat Feb 19 09:11:12 2011
New Revision: 1072272
URL: http://svn.apache.org/viewvc?rev=1072272&view=rev
Log:
Merged r1072271 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 09:11:12 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1072077
+/axis/axis2/java/core/trunk:1072077,1072271
Modified:
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1072272&r1=1072271&r2=1072272&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Sat Feb 19 09:11:12 2011
@@ -28,7 +28,6 @@ import org.apache.axis2.jaxws.descriptio
import org.apache.axis2.jaxws.description.builder.WebEndpointAnnot;
import org.apache.axis2.jaxws.description.builder.WebMethodAnnot;
import org.apache.axis2.jaxws.description.builder.WebResultAnnot;
-import sun.reflect.generics.reflectiveObjects.GenericArrayTypeImpl;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -39,6 +38,7 @@ import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
import javax.xml.ws.WebEndpoint;
import java.lang.reflect.Constructor;
+import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
@@ -347,7 +347,7 @@ public class JavaMethodsToMDCConverter {
mdc.setReturnType(fullType);
} else if (type instanceof Class) {
mdc.setReturnType(((Class)type).getName());
-} else if (type instanceof GenericArrayTypeImpl) {
+} else if (type instanceof GenericArrayType) {
mdc.setReturnType(type.getClass().getName());
}
}
svn commit: r1072273 - /axis/axis2/java/rampart/branches/1_6/
Author: veithen Date: Sat Feb 19 09:11:44 2011 New Revision: 1072273 URL: http://svn.apache.org/viewvc?rev=1072273&view=rev Log: Updated svn:mergeinfo on the 1.6 branch. Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) Propchange: axis/axis2/java/rampart/branches/1_6/ -- svn:mergeinfo = /axis/axis2/java/rampart/trunk:1072266
svn commit: r1072293 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/context/MessageContext.java
Author: veithen
Date: Sat Feb 19 10:15:16 2011
New Revision: 1072293
URL: http://svn.apache.org/viewvc?rev=1072293&view=rev
Log:
AXIS2-4671: Merged r1070439 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 10:15:16 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1072077,1072271
+/axis/axis2/java/core/trunk:1070439,1072077,1072271
Modified:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1072293&r1=1072292&r2=1072293&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
Sat Feb 19 10:15:16 2011
@@ -1598,6 +1598,8 @@ public class MessageContext extends Abst
AxisBindingMessage bindingMessage =
(AxisBindingMessage)
getProperty(Constants.AXIS_BINDING_MESSAGE);
+AxisBinding binding;
+
// If AxisBindingMessage is not set, try to find the binding message
from the AxisService
if (bindingMessage == null) {
bindingMessage = findBindingMessage();
@@ -1605,7 +1607,10 @@ public class MessageContext extends Abst
if (bindingMessage != null) {
return bindingMessage.getEffectivePolicy();
-// If we can't find the AxisBindingMessage, then try the AxisMessage
+// If we can't find the AxisBindingMessage, then try the
AxisBinding
+} else if ((binding = findBinding()) != null) {
+return binding.getEffectivePolicy();
+// If we can't find the AxisBindingMessage, then try the
AxisMessage
} else if (axisMessage != null) {
return axisMessage.getEffectivePolicy();
} else {
@@ -1621,6 +1626,19 @@ public class MessageContext extends Abst
}
}
+private AxisBinding findBinding() {
+if (axisService != null) {
+if (axisService.getEndpointName() != null) {
+AxisEndpoint axisEndpoint = axisService
+.getEndpoint(axisService.getEndpointName());
+if (axisEndpoint != null) {
+return axisEndpoint.getBinding();
+}
+}
+}
+return null;
+}
+
private AxisBindingMessage findBindingMessage() {
if (axisService != null && axisOperation != null ) {
if (axisService.getEndpointName() != null) {
svn commit: r1072296 - in /axis/axis2/java/core/trunk/modules: mtompolicy/src/org/apache/axis2/policy/builders/ mtompolicy/src/org/apache/axis2/policy/model/ parent/
Author: veithen
Date: Sat Feb 19 10:19:53 2011
New Revision: 1072296
URL: http://svn.apache.org/viewvc?rev=1072296&view=rev
Log:
Updated the Axis2 trunk to use Neethi 3.0.0-SNAPSHOT again, using the patch
provided by Dan Kulp.
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java?rev=1072296&r1=1072295&r2=1072296&view=diff
==
---
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
Sat Feb 19 10:19:53 2011
@@ -43,7 +43,7 @@ import javax.xml.namespace.QName;
* The builder will be picked by the
* "org.apache.neethi.AssertionBuilderFactory".
*/
-public class MTOM10AssertionBuilder implements AssertionBuilder {
+public class MTOM10AssertionBuilder implements AssertionBuilder {
private static Log log = LogFactory.getLog(MTOM10AssertionBuilder.class);
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java?rev=1072296&r1=1072295&r2=1072296&view=diff
==
---
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
Sat Feb 19 10:19:53 2011
@@ -39,7 +39,7 @@ import org.apache.neethi.builders.Assert
* "org.apache.neethi.AssertionBuilderFactory".
*/
-public class MTOM11AssertionBuilder implements AssertionBuilder{
+public class MTOM11AssertionBuilder implements AssertionBuilder {
private static Log log = LogFactory.getLog(MTOM10AssertionBuilder.class);
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java?rev=1072296&r1=1072295&r2=1072296&view=diff
==
---
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
(original)
+++
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
Sat Feb 19 10:19:53 2011
@@ -52,5 +52,8 @@ public abstract class MTOMAssertion impl
this.optional = isOptional;
}
+public boolean isIgnorable() {
+return false;
+}
}
\ No newline at end of file
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=1072296&r1=1072295&r2=1072296&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sat Feb 19 10:19:53 2011
@@ -68,8 +68,7 @@
1.2.12-SNAPSHOT
-
-2.0.4
+3.0.0-SNAPSHOT
1.0-SNAPSHOT
svn commit: r1072304 - 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: Sat Feb 19 10:49:10 2011 New Revision: 1072304 URL: http://svn.apache.org/viewvc?rev=1072304&view=rev Log: Changed the trunk version number to match the new conventions. 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=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Sat Feb 19 10:49:10 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -130,4 +130,4 @@ - \ No newline at end of file + 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=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/pom.xml Sat Feb 19 10:49:10 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.7-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -49,4 +49,4 @@ - \ No newline at end of file + 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=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Sat Feb 19 10:49:10 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7-SNAPSHOT +1.7.0-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=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sat Feb 19 10:49:10 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7-SNAPSHOT +1.7.0-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=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Sat Feb 19 10:49:10 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.7-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml 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=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml Sat Feb 19 10:49:10 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.7-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml?rev=1072304&r1=1072303&r2=1072304&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-tes
svn commit: r1072307 - 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: Sat Feb 19 10:55:15 2011 New Revision: 1072307 URL: http://svn.apache.org/viewvc?rev=1072307&view=rev Log: Changed the branch version number to match the new conventions. Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1072307&r1=1072306&r2=1072307&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Sat Feb 19 10:55:15 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -130,4 +130,4 @@ - \ No newline at end of file + Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml?rev=1072307&r1=1072306&r2=1072307&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml Sat Feb 19 10:55:15 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -49,4 +49,4 @@ - \ No newline at end of file + Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1072307&r1=1072306&r2=1072307&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml Sat Feb 19 10:55:15 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1072307&r1=1072306&r2=1072307&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml Sat Feb 19 10:55:15 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1072307&r1=1072306&r2=1072307&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Sat Feb 19 10:55:15 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml?rev=1072307&r1=1072306&r2=1072307&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml Sat Feb 19 10:55:15 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml URL: http://svn.apac
svn commit: r1072309 - in /axis/axis2/java/sandesha/trunk: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/rampart-int
Author: veithen Date: Sat Feb 19 10:56:32 2011 New Revision: 1072309 URL: http://svn.apache.org/viewvc?rev=1072309&view=rev Log: [maven-release-plugin] prepare branch 1_6 Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml axis/axis2/java/sandesha/trunk/modules/core/pom.xml axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml axis/axis2/java/sandesha/trunk/modules/interop/pom.xml axis/axis2/java/sandesha/trunk/modules/mar/pom.xml axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml axis/axis2/java/sandesha/trunk/modules/policy/pom.xml axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml axis/axis2/java/sandesha/trunk/modules/samples/pom.xml axis/axis2/java/sandesha/trunk/modules/tests/pom.xml axis/axis2/java/sandesha/trunk/pom.xml Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client/pom.xml?rev=1072309&r1=1072308&r2=1072309&view=diff == --- axis/axis2/java/sandesha/trunk/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/client/pom.xml Sat Feb 19 10:56:32 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/client - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/client - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/trunk/modules/core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/pom.xml?rev=1072309&r1=1072308&r2=1072309&view=diff == --- axis/axis2/java/sandesha/trunk/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/core/pom.xml Sat Feb 19 10:56:32 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/core - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/core - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1072309&r1=1072308&r2=1072309&view=diff == --- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Sat Feb 19 10:56:32 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/distribution - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/distribution - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1072309&r1=1072308&r2=1072309&view=diff == --- axis/axis2/java/s
svn commit: r1072310 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/ramp
Author: veithen Date: Sat Feb 19 10:56:52 2011 New Revision: 1072310 URL: http://svn.apache.org/viewvc?rev=1072310&view=rev Log: [maven-release-plugin] copy for branch 1_6 Added: axis/axis2/java/sandesha/branches/1_6/ - copied from r1072305, axis/axis2/java/sandesha/trunk/ axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/client/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/core/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/interop/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/mar/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/policy/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/samples/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/modules/tests/pom.xml axis/axis2/java/sandesha/branches/1_6/pom.xml - copied unchanged from r1072309, axis/axis2/java/sandesha/trunk/pom.xml
svn commit: r1072311 - in /axis/axis2/java/sandesha/trunk: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/rampart-int
Author: veithen Date: Sat Feb 19 10:57:09 2011 New Revision: 1072311 URL: http://svn.apache.org/viewvc?rev=1072311&view=rev Log: [maven-release-plugin] prepare release 1_6 Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml axis/axis2/java/sandesha/trunk/modules/core/pom.xml axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml axis/axis2/java/sandesha/trunk/modules/interop/pom.xml axis/axis2/java/sandesha/trunk/modules/mar/pom.xml axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml axis/axis2/java/sandesha/trunk/modules/policy/pom.xml axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml axis/axis2/java/sandesha/trunk/modules/samples/pom.xml axis/axis2/java/sandesha/trunk/modules/tests/pom.xml axis/axis2/java/sandesha/trunk/pom.xml Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client/pom.xml?rev=1072311&r1=1072310&r2=1072311&view=diff == --- axis/axis2/java/sandesha/trunk/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/client/pom.xml Sat Feb 19 10:57:09 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/client + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/client + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/trunk/modules/core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/pom.xml?rev=1072311&r1=1072310&r2=1072311&view=diff == --- axis/axis2/java/sandesha/trunk/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/core/pom.xml Sat Feb 19 10:57:09 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/core + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/core + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1072311&r1=1072310&r2=1072311&view=diff == --- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Sat Feb 19 10:57:09 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/distribution + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/distribution + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1072311&r1=1072310&r2=1072311&view=diff == --
svn commit: r1072313 - /axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
Author: veithen
Date: Sat Feb 19 11:24:41 2011
New Revision: 1072313
URL: http://svn.apache.org/viewvc?rev=1072313&view=rev
Log:
Replaced tabs by spaces.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
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=1072313&r1=1072312&r2=1072313&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 Sat Feb 19
11:24:41 2011
@@ -58,26 +58,26 @@
1.5
-
- org.apache.axis2
- axis2-mar-maven-plugin
- 1.2
- true
-
- false
- module.xml
-
-
-
+
+org.apache.axis2
+axis2-mar-maven-plugin
+1.2
+true
+
+false
+module.xml
+
+
+
-
+
org.apache.rampart
rampart-policy
${pom.version}
-
+
org.apache.rampart
rampart-trust
${pom.version}
@@ -114,7 +114,7 @@
-
+
apache.snapshots.https
${distMgmtSnapshotsName}
svn commit: r1072314 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: TokenRequestDispatcher.java client/STSClient.java impl/SAMLTokenIssuerConfig.java
Author: thilinamb
Date: Sat Feb 19 11:39:24 2011
New Revision: 1072314
URL: http://svn.apache.org/viewvc?rev=1072314&view=rev
Log:
Improving logging in Rampart-Trust module.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java?rev=1072314&r1=1072313&r2=1072314&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
Sat Feb 19 11:39:24 2011
@@ -20,7 +20,6 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.rahas.impl.SAMLTokenValidator;
public class TokenRequestDispatcher {
@@ -28,6 +27,7 @@ public class TokenRequestDispatcher {
private static Log mlog = LogFactory.getLog("org.apache.rampart.messages");
private static Log log =
LogFactory.getLog(TokenRequestDispatcher.class.getName());
+private static boolean doDebug = log.isDebugEnabled();
public TokenRequestDispatcher(TokenRequestDispatcherConfig config) throws
TrustException {
this.config = config;
@@ -59,7 +59,9 @@ public class TokenRequestDispatcher {
String tokenType = data.getTokenType();
if ((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_ISSUE).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_ISSUE).equals(reqType)) {
- log.debug("issue");
+if (doDebug) {
+log.debug("issue");
+}
TokenIssuer issuer;
if (tokenType == null || tokenType.trim().length() == 0) {
issuer = config.getDefaultIssuerInstace();
@@ -79,9 +81,11 @@ public class TokenRequestDispatcher {
return response;
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_VALIDATE).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_VALIDATE).equals(reqType)) {
- log.debug("validate");
-
-TokenValidator validator;
+if (doDebug) {
+log.debug("validate");
+}
+
+TokenValidator validator;
if (tokenType == null || tokenType.trim().length() == 0) {
validator = config.getDefaultValidatorInstance();
} else {
@@ -100,9 +104,11 @@ public class TokenRequestDispatcher {
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_RENEW).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_RENEW).equals(reqType)) {
- log.debug("renew");
-
-TokenRenewer renewer;
+if (doDebug) {
+log.debug("renew");
+}
+
+TokenRenewer renewer;
if (tokenType == null || tokenType.trim().length() == 0) {
renewer = config.getDefaultRenewerInstance();
} else {
@@ -119,7 +125,9 @@ public class TokenRequestDispatcher {
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_CANCEL).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_CANCEL).equals(reqType)) {
- log.debug("cancel");
+if (doDebug) {
+log.debug("cancel");
+}
TokenCanceler canceler = config.getDefaultCancelerInstance();
SOAPEnvelope response = canceler.cancel(data);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1072314&r1=1072313&r2=1072314&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Sat Feb 19 11
svn commit: r1072315 - in /axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas: TokenRequestDispatcher.java client/STSClient.java impl/SAMLTokenIssuerConfig.java
Author: thilinamb
Date: Sat Feb 19 11:39:43 2011
New Revision: 1072315
URL: http://svn.apache.org/viewvc?rev=1072315&view=rev
Log:
Improving logging in Rampart-Trust module.
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java?rev=1072315&r1=1072314&r2=1072315&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
Sat Feb 19 11:39:43 2011
@@ -20,7 +20,6 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.rahas.impl.SAMLTokenValidator;
public class TokenRequestDispatcher {
@@ -28,6 +27,7 @@ public class TokenRequestDispatcher {
private static Log mlog = LogFactory.getLog("org.apache.rampart.messages");
private static Log log =
LogFactory.getLog(TokenRequestDispatcher.class.getName());
+private static boolean doDebug = log.isDebugEnabled();
public TokenRequestDispatcher(TokenRequestDispatcherConfig config) throws
TrustException {
this.config = config;
@@ -59,7 +59,9 @@ public class TokenRequestDispatcher {
String tokenType = data.getTokenType();
if ((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_ISSUE).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_ISSUE).equals(reqType)) {
- log.debug("issue");
+if (doDebug) {
+log.debug("issue");
+}
TokenIssuer issuer;
if (tokenType == null || tokenType.trim().length() == 0) {
issuer = config.getDefaultIssuerInstace();
@@ -79,9 +81,11 @@ public class TokenRequestDispatcher {
return response;
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_VALIDATE).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_VALIDATE).equals(reqType)) {
- log.debug("validate");
-
-TokenValidator validator;
+if (doDebug) {
+log.debug("validate");
+}
+
+TokenValidator validator;
if (tokenType == null || tokenType.trim().length() == 0) {
validator = config.getDefaultValidatorInstance();
} else {
@@ -100,9 +104,11 @@ public class TokenRequestDispatcher {
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_RENEW).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_RENEW).equals(reqType)) {
- log.debug("renew");
-
-TokenRenewer renewer;
+if (doDebug) {
+log.debug("renew");
+}
+
+TokenRenewer renewer;
if (tokenType == null || tokenType.trim().length() == 0) {
renewer = config.getDefaultRenewerInstance();
} else {
@@ -119,7 +125,9 @@ public class TokenRequestDispatcher {
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_CANCEL).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_CANCEL).equals(reqType)) {
- log.debug("cancel");
+if (doDebug) {
+log.debug("cancel");
+}
TokenCanceler canceler = config.getDefaultCancelerInstance();
SOAPEnvelope response = canceler.cancel(data);
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1072315&r1=1072314&r2=1072315&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/ramp
svn commit: r1072316 - in /axis/axis2/java/rampart/trunk: modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml pom.xml
Author: veithen Date: Sat Feb 19 11:49:49 2011 New Revision: 1072316 URL: http://svn.apache.org/viewvc?rev=1072316&view=rev Log: Updated the MAR plugin to a more recent version and removed some unused plugin repositories. 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=1072316&r1=1072315&r2=1072316&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Sat Feb 19 11:49:49 2011 @@ -61,7 +61,6 @@ org.apache.axis2 axis2-mar-maven-plugin -1.2 true false @@ -106,36 +105,6 @@ - - -apache-m2 -Apache M2 Repository - http://people.apache.org/repo/m2-ibiblio-rsync-repository -default - -false -daily -ignore - - -true - - - -apache-snapshots -Apache Snapshots Repository -http://people.apache.org/repo/m2-snapshot-repository -default - -true -daily -ignore - - -false - - - apache.snapshots.https 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=1072316&r1=1072315&r2=1072316&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 Sat Feb 19 11:49:49 2011 @@ -61,7 +61,6 @@ org.apache.axis2 axis2-mar-maven-plugin -1.2 true false @@ -84,36 +83,6 @@ - - -apache-m2 -Apache M2 Repository - http://people.apache.org/repo/m2-ibiblio-rsync-repository -default - -false -daily -ignore - - -true - - - -apache-snapshots -Apache Snapshots Repository -http://people.apache.org/repo/m2-snapshot-repository -default - -true -daily -ignore - - -false - - - apache.snapshots.https Modified: axis/axis2/java/rampart/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1072316&r1=1072315&r2=1072316&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Sat Feb 19 11:49:49 2011 @@ -138,36 +138,6 @@ - - - - -snapshot-apache -Apache Snapshot repository -http://people.apache.org/repo/m2-snapshot-repository - -true - - -false - - - - -snapshot -Snapshot repository -http://snapshots.maven.codehaus.org/maven2 - -true - - -false - - - - - - @@ -177,6 +147,11 @@ true + +org.apache.axis2 +axis2-mar-maven-plugin +1.5.4 +
svn commit: r1072317 - /axis/axis2/java/core/branches/1_6/release-notes.html
Author: ruwan
Date: Sat Feb 19 12:07:44 2011
New Revision: 1072317
URL: http://svn.apache.org/viewvc?rev=1072317&view=rev
Log:
fixing the release notes for the 1.6 release
Modified:
axis/axis2/java/core/branches/1_6/release-notes.html
Modified: axis/axis2/java/core/branches/1_6/release-notes.html
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/release-notes.html?rev=1072317&r1=1072316&r2=1072317&view=diff
==
--- axis/axis2/java/core/branches/1_6/release-notes.html (original)
+++ axis/axis2/java/core/branches/1_6/release-notes.html Sat Feb 19 12:07:44
2011
@@ -28,7 +28,7 @@
@TODAY@
-Just over 8 months since the 1.3 release, we are very proud to
+Just over one and half years since the 1.5 release, we are very proud to
announce the release of Apache Axis2 version @axisVersion@.
Downloads are available at:
@@ -45,19 +45,14 @@ WS-Trust (Apache Rahas), WS-Reliable Mes
WS-Eventing (Apache Savan) will be available soon after the Apache Axis2
@axisVersion@ release. Please see these projects' own sites for further
information.
-Major Changes Since 1.3:
-- Support for JAXWS and JSR 181 Annotations
-- Experimental Corba Support
-- Fixed tons of small and not-so-small bugs (See list below)
-
Known Issues and Limitations in @axisVersion@ Release:
- Please see JIRA
We are striving for a simple and happy first time user experience as well as a
satisfying experienced user experience with this release. We welcome any
and all feedback at:
-axis-u...@ws.apache.org (please include "[axis2]" in the subject)
-axis-...@ws.apache.org (please include "[axis2]" in the subject)
+java-u...@axis.apache.org (please include "[axis2]" in the subject)
+java-...@axis.apache.org (please include "[axis2]" in the subject)
http://issues.apache.org/jira/browse/AXIS2
Thank you for your interest in Apache Axis2!
@@ -115,479 +110,9 @@ Tools
- Maven2 Plugins
- Web application for administering Apache Axis2
-Bugs marked as Resolved/Fixed after 1.3 Release:
-AXIS2-3757 Miss behaviour in adding handlers to the phase when the handler
has after attribute
-AXIS2-3758 REST GET invocations fail with httpLocations of the form
foo/{name} when more than one parameter is present
-AXIS2-3759 JAXWS: Out Of Memory Issues With JAXBContext
-AXIS2-3760 legal/backport-util-concurrent-LICENSE.txt is out of date
-AXIS2-3761 Generated ?wsdl2 docs are invalid when a service has more than
1 transport enabled
-AXIS2-3762 Generated ?wsdl2 docs do not contain httpLocation for
HttpBinding hence codegen for httpBinding will not work
-AXIS2-3763 Invalid soap fault
-AXIS2-3764 Attribute containing all upper case characters not included in
response
-AXIS2-3765 [REST support] when using POST with x-www-form-urlencoded data
aren't decode from url encoded
-AXIS2-3766 File setLastModified() in deployment code causes problems
-AXIS2-3767 Store UnmarshalInfo instances on AxisOperation instead of
AxisService
-AXIS2-3768 org.apache.axis2.AxisFault: Connection reset - connections are
not closing for long time
-AXIS2-3769 Use actaul message to determine the outbound wsa action
-AXIS2-3770 Wrong JAX-WS handler-chain execution
-AXIS2-3771 Rampart has dependancies to classes which was in mex-impl
-AXIS2-3772 JAXWS: CID for SWA Attachments does not comply with the WS-I
Specification Syntax
-AXIS2-3773 Support for @MTOM Threshold.
-AXIS2-3774 ?wsdl2 does not show engaged security policies
-AXIS2-3775 ?wsdl2 shows endpoints for transports that are dissabled
-AXIS2-3776 Context class loader not restored correctly
-AXIS2-3777 Handling of exceptions raised by handlers in one-way invocations
-AXIS2-3778 Problems loading RequestWrapper/ResponseWrapper etc when JAXWS
Service is deployed as a jar under servicejars
-AXIS2-3779 JAX-WS: JAXBUtils should not load classes from nested packages
-AXIS2-3780 Array of strings (or other simple types) are serialized as
xsd:list
-AXIS2-3781 Shell scripts do not tolerate AXIS2_HOME and JAVA_HOME with
spaces in paths
-AXIS2-3782 All outbound handlers are invoked when an inbound handler
throws exception or returns false
-AXIS2-3783 CLONE -Classpath/Classloader issue with packaging
-AXIS2-3784 Log.debug statement causes NullPointerException
-AXIS2-3785 Can't use SSL with scope="transportsession"
-AXIS2-3786 Invalid SOAPMessage caching in SoapMessageContext
-AXIS2-3787 MessageContext.REFERENCE_PARAMETERS property not visible in
handlers
-AXIS2-3788 WSDL2Java fails for WSDL that work for Axis2 1.3
-AXIS2-3789 Adding codegen jar to axis2.war and adding mtompolicy jar to
distribution
-AXIS2-3790 WSDL2Java throws a StackOverflowError
-AXIS2-3791 If available prefer sending [Subsubcode] as the fault code
instead of [Subcode] for SOAP 1.1 faults
-AXIS2-3792 ax
svn commit: r1072318 - /axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml
Author: ruwan
Date: Sat Feb 19 12:16:48 2011
New Revision: 1072318
URL: http://svn.apache.org/viewvc?rev=1072318&view=rev
Log:
Fixing the index page for the 1.6 release
Modified:
axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml
Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml?rev=1072318&r1=1072317&r2=1072318&view=diff
==
--- axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml (original)
+++ axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml Sat Feb 19
12:16:48 2011
@@ -35,6 +35,9 @@ here, you can visit the http://axis.apache.org/axis2/c/";>Apache Axis2/C
Web site for Axis2/C implementation information.
Apache Axis2, Axis2, Apache, the Apache feather logo, and the Apache Axis2
project logo are trademarks of The Apache Software Foundation.
+February 19, 2011 - Apache Axis2/Java Version 1.6 Released!
+1.6 is a major release of axis2 with many fixes and improvements to the
core and all it's modules
+Refer to the following filter https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&requestId=12315272";>Issues
fixed for the 1.6 release to find all the issues fixed for the 1.6
release
December 19, 2010 - Apache Axis2/Java Version 1.5.4 Released!
1.5.4 is a maintenance release that contains fixes for the following
issues:
@@ -50,7 +53,7 @@ Web site for Axis2/C implementation info
https://issues.apache.org:443/jira/browse/AXIS2-4842";>AXIS2-4842: NPE
in TempFileManager
https://issues.apache.org:443/jira/browse/AXIS2-4871";>AXIS2-4871:
Null Pointer Exception in AxisService.printXSD
https://issues.apache.org:443/jira/browse/AXIS2-4883";>AXIS2-4883:
Javadoc link broken on site and in documents distribution
-https://issues.apache.org:443/jira/browse/AXIS2-4885";>AXIS2-4885:
Unsubstituted variable ${axis2_version} in 1.5.3 site and documents
distribution
+https://issues.apache.org:443/jira/browse/AXIS2-4885";>AXIS2-4885:
Unsubstituted variable ${axis2_version} in 1.5.3 site and documents
distribution
https://issues.apache.org:443/jira/browse/AXIS2-4887";>AXIS2-4887:
TargetNameSpace required for XSD2Java
https://issues.apache.org:443/jira/browse/AXIS2-4888";>AXIS2-4888: The
org.apache.axis2:axis2 Maven artifact should not have a classifier
https://issues.apache.org:443/jira/browse/AXIS2-4889";>AXIS2-4889:
SOAPConnectionTest#testGet slows down the build
svn commit: r1072319 - /axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml
Author: ruwan Date: Sat Feb 19 12:30:04 2011 New Revision: 1072319 URL: http://svn.apache.org/viewvc?rev=1072319&view=rev Log: preparing the download page for the 1.6.0 release Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml?rev=1072319&r1=1072318&r2=1072319&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml Sat Feb 19 12:30:04 2011 @@ -76,6 +76,32 @@ Distribution +1.6.0 +19 - Feb - 2011 +1.6.0 Release (Mirrored) + +Binary Distribution +zip | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-bin.zip.md5";>MD5 | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-bin.zip.asc";>PGP + +Source Distribution +zip | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-src.zip.md5";>MD5 | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-src.zip.asc";>PGP + +WAR Distribution +zip | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-war.zip.md5";>MD5 | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-war.zip.asc";>PGP + +Documents Distribution +zip | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-docs.zip.md5";>MD5 | +http://www.apache.org/dist/axis/axis2/java/core/1.6.0/axis2-1.6.0-docs.zip.asc";>PGP + + + 1.5.4 19 - Dec - 2010 1.5.4 Release (Mirrored)
svn commit: r1072321 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/ rampart-core/src/main/java/org/apache/rampart/builder/ rampart-core/src/main/java/org/a
Author: thilinamb
Date: Sat Feb 19 13:04:52 2011
New Revision: 1072321
URL: http://svn.apache.org/viewvc?rev=1072321&view=rev
Log:
Removing unnecessary isDebugEnabled checks and using isDebugEnabled() instead
of the static variable.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
Sat Feb 19 13:04:52 2011
@@ -52,8 +52,7 @@ import javax.xml.namespace.QName;
public class MessageBuilder {
private static Log log = LogFactory.getLog(MessageBuilder.class);
-private static boolean doDebug = log.isDebugEnabled();
-
+
public void build(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -136,15 +135,11 @@ public class MessageBuilder {
}
if(rpd.isTransportBinding()) {
- if (doDebug) {
- log.debug("Building transport binding");
- }
+ log.debug("Building transport binding");
TransportBindingBuilder building = new TransportBindingBuilder();
building.build(rmd);
} else if(rpd.isSymmetricBinding()) {
- if (doDebug) {
- log.debug("Building SymmetricBinding");
- }
+ log.debug("Building SymmetricBinding");
SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
builder.build(rmd);
} else {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1072321&r1=1072320&r2=1072321&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
Sat Feb 19 13:04:52 2011
@@ -17,9 +17,15 @@
package org.apache.rampart;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.*;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFault;
+import org.apache.axiom.soap.SOAPFaultCode;
+import org.apache.axiom.soap.SOAPFaultSubCode;
+import org.apache.axiom.soap.SOAPFaultValue;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
@@ -32,18 +38,21 @@ import org.apache.rampart.policy.Rampart
import org.apache.rampart.util.Axis2Util;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.security.*;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.WSSecurityE
svn commit: r1072322 - in /axis/axis2/java/rampart/branches/1_6/modules: rampart-core/src/main/java/org/apache/rampart/ rampart-core/src/main/java/org/apache/rampart/builder/ rampart-core/src/main/jav
Author: thilinamb
Date: Sat Feb 19 13:05:20 2011
New Revision: 1072322
URL: http://svn.apache.org/viewvc?rev=1072322&view=rev
Log:
Removing unnecessary isDebugEnabled checks and using isDebugEnabled() instead
of the static variable.
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1072322&r1=1072321&r2=1072322&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
Sat Feb 19 13:05:20 2011
@@ -52,8 +52,7 @@ import javax.xml.namespace.QName;
public class MessageBuilder {
private static Log log = LogFactory.getLog(MessageBuilder.class);
-private static boolean doDebug = log.isDebugEnabled();
-
+
public void build(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -136,15 +135,11 @@ public class MessageBuilder {
}
if(rpd.isTransportBinding()) {
- if (doDebug) {
- log.debug("Building transport binding");
- }
+ log.debug("Building transport binding");
TransportBindingBuilder building = new TransportBindingBuilder();
building.build(rmd);
} else if(rpd.isSymmetricBinding()) {
- if (doDebug) {
- log.debug("Building SymmetricBinding");
- }
+ log.debug("Building SymmetricBinding");
SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
builder.build(rmd);
} else {
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1072322&r1=1072321&r2=1072322&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
Sat Feb 19 13:05:20 2011
@@ -17,9 +17,15 @@
package org.apache.rampart;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.*;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFault;
+import org.apache.axiom.soap.SOAPFaultCode;
+import org.apache.axiom.soap.SOAPFaultSubCode;
+import org.apache.axiom.soap.SOAPFaultValue;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
@@ -32,18 +38,21 @@ import org.apache.rampart.policy.Rampart
import org.apache.rampart.util.Axis2Util;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.securit
svn commit: r1072323 - /axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Author: thilinamb
Date: Sat Feb 19 13:29:33 2011
New Revision: 1072323
URL: http://svn.apache.org/viewvc?rev=1072323&view=rev
Log:
Applying patch for RAMPART-305 provided by AmilaJ
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java?rev=1072323&r1=1072322&r2=1072323&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Sat Feb 19 13:29:33 2011
@@ -36,7 +36,7 @@ import org.apache.ws.security.WSSecurity
public class RampartSender implements Handler {
private static Log mlog =
LogFactory.getLog(RampartConstants.MESSAGE_LOG);
-
+
private static HandlerDescription EMPTY_HANDLER_METADATA =
new HandlerDescription("default Handler");
@@ -54,10 +54,11 @@ public class RampartSender implements Ha
}
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
-
+
if (!msgContext.isEngaged(WSSHandlerConstants.SECURITY_MODULE_NAME)) {
- return InvocationResponse.CONTINUE;
-}
+return InvocationResponse.CONTINUE;
+}
+
MessageBuilder builder = new MessageBuilder();
try {
@@ -67,7 +68,13 @@ public class RampartSender implements Ha
} catch (WSSPolicyException e) {
throw new AxisFault(e.getMessage(), e);
} catch (RampartException e) {
-throw new AxisFault(e.getMessage(), e);
+// If a framework exception is occurred while processing a
security fault
+// send the original fault to the client.
+if (msgContext.isProcessingFault()) {
+return InvocationResponse.CONTINUE;
+} else {
+throw new AxisFault(e.getMessage(), e);
+}
}
if(mlog.isDebugEnabled()){
svn commit: r1072324 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Author: thilinamb
Date: Sat Feb 19 13:29:49 2011
New Revision: 1072324
URL: http://svn.apache.org/viewvc?rev=1072324&view=rev
Log:
Applying patch for RAMPART-305 provided by AmilaJ
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java?rev=1072324&r1=1072323&r2=1072324&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Sat Feb 19 13:29:49 2011
@@ -36,7 +36,7 @@ import org.apache.ws.security.WSSecurity
public class RampartSender implements Handler {
private static Log mlog =
LogFactory.getLog(RampartConstants.MESSAGE_LOG);
-
+
private static HandlerDescription EMPTY_HANDLER_METADATA =
new HandlerDescription("default Handler");
@@ -54,10 +54,11 @@ public class RampartSender implements Ha
}
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
-
+
if (!msgContext.isEngaged(WSSHandlerConstants.SECURITY_MODULE_NAME)) {
- return InvocationResponse.CONTINUE;
-}
+return InvocationResponse.CONTINUE;
+}
+
MessageBuilder builder = new MessageBuilder();
try {
@@ -67,7 +68,13 @@ public class RampartSender implements Ha
} catch (WSSPolicyException e) {
throw new AxisFault(e.getMessage(), e);
} catch (RampartException e) {
-throw new AxisFault(e.getMessage(), e);
+// If a framework exception is occurred while processing a
security fault
+// send the original fault to the client.
+if (msgContext.isProcessingFault()) {
+return InvocationResponse.CONTINUE;
+} else {
+throw new AxisFault(e.getMessage(), e);
+}
}
if(mlog.isDebugEnabled()){
svn commit: r1072325 - in /axis/axis2/java/core/branches/1_6: release-notes.html src/site/xdoc/index.xml
Author: ruwan Date: Sat Feb 19 13:36:12 2011 New Revision: 1072325 URL: http://svn.apache.org/viewvc?rev=1072325&view=rev Log: Fixing the error in site generation Modified: axis/axis2/java/core/branches/1_6/release-notes.html axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml Modified: axis/axis2/java/core/branches/1_6/release-notes.html URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/release-notes.html?rev=1072325&r1=1072324&r2=1072325&view=diff == --- axis/axis2/java/core/branches/1_6/release-notes.html (original) +++ axis/axis2/java/core/branches/1_6/release-notes.html Sat Feb 19 13:36:12 2011 @@ -113,6 +113,6 @@ Tools Bugs marked as Resolved/Fixed for 1.6 Release: - Follow the filter https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&requestId=12315272";>Issues fixed for the 1.6 release + Follow the filter http://bit.ly/issues-fixed-for-1_6";>Issues fixed for the 1.6 release Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml?rev=1072325&r1=1072324&r2=1072325&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml Sat Feb 19 13:36:12 2011 @@ -37,7 +37,7 @@ Web site for Axis2/C implementation info Apache Axis2, Axis2, Apache, the Apache feather logo, and the Apache Axis2 project logo are trademarks of The Apache Software Foundation. February 19, 2011 - Apache Axis2/Java Version 1.6 Released! 1.6 is a major release of axis2 with many fixes and improvements to the core and all it's modules -Refer to the following filter https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&requestId=12315272";>Issues fixed for the 1.6 release to find all the issues fixed for the 1.6 release +Refer to the following filter http://bit.ly/issues-fixed-for-1_6";>Issues fixed for the 1.6 release to find all the issues fixed for the 1.6 release December 19, 2010 - Apache Axis2/Java Version 1.5.4 Released! 1.5.4 is a maintenance release that contains fixes for the following issues:
svn commit: r1072332 - /axis/axis2/java/sandesha/trunk/pom.xml
Author: veithen Date: Sat Feb 19 14:19:41 2011 New Revision: 1072332 URL: http://svn.apache.org/viewvc?rev=1072332&view=rev Log: Updated the dependency versions of the trunk. 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=1072332&r1=1072331&r2=1072332&view=diff == --- axis/axis2/java/sandesha/trunk/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/pom.xml Sat Feb 19 14:19:41 2011 @@ -425,10 +425,9 @@ SNAPSHOT -SNAPSHOT +1.7.0-SNAPSHOT 1.2.12-SNAPSHOT - -2.0.4 +3.0.0-SNAPSHOT 1.1.1 3.8.2 1.2.15
svn commit: r1072337 - /axis/axis2/java/core/tags/v1.6.0/
Author: ruwan Date: Sat Feb 19 14:31:35 2011 New Revision: 1072337 URL: http://svn.apache.org/viewvc?rev=1072337&view=rev Log: tagging the release Added: axis/axis2/java/core/tags/v1.6.0/ (props changed) - copied from r1072334, axis/axis2/java/core/branches/1_6/ Propchange: axis/axis2/java/core/tags/v1.6.0/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 19 14:31:35 2011 @@ -0,0 +1,4 @@ +*.ipr +*.iml +*.iws +target Propchange: axis/axis2/java/core/tags/v1.6.0/ -- svn:mergeinfo = /axis/axis2/java/core/trunk:1070439,1072077,1072271
svn commit: r1072345 - /axis/axis2/java/core/tags/v1.6.0/
Author: ruwan Date: Sat Feb 19 14:36:26 2011 New Revision: 1072345 URL: http://svn.apache.org/viewvc?rev=1072345&view=rev Log: removing the manually created tag Removed: axis/axis2/java/core/tags/v1.6.0/
svn commit: r1072346 - /axis/axis2/java/core/tags/v1.6.0/
Author: ruwan Date: Sat Feb 19 14:37:04 2011 New Revision: 1072346 URL: http://svn.apache.org/viewvc?rev=1072346&view=rev Log: [maven-scm] copy for tag v1.6.0 Added: axis/axis2/java/core/tags/v1.6.0/ (props changed) - copied from r1072345, axis/axis2/java/core/branches/1_6/ Propchange: axis/axis2/java/core/tags/v1.6.0/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 19 14:37:04 2011 @@ -0,0 +1,4 @@ +*.ipr +*.iml +*.iws +target Propchange: axis/axis2/java/core/tags/v1.6.0/ -- svn:mergeinfo = /axis/axis2/java/core/trunk:1070439,1072077,1072271
svn commit: r1072365 - in /axis/axis2/java/core/tags/v1.6.0/modules: all/ rmi/ samples/book/ samples/java_first_jaxws/ samples/jaxws-addressbook/ samples/jaxws-calculator/ samples/jaxws-interop/ sampl
Author: ruwan Date: Sat Feb 19 15:50:35 2011 New Revision: 1072365 URL: http://svn.apache.org/viewvc?rev=1072365&view=rev Log: Fixing the versions on the sample descriptors which were missed by the release plugin - yes we need to fix this such that the release plugin can pick them up as well Modified: axis/axis2/java/core/tags/v1.6.0/modules/all/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/rmi/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/book/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/java_first_jaxws/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-addressbook/README.txt axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-addressbook/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-calculator/README.txt axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-calculator/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-interop/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-samples/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/samples/jaxws-version/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml axis/axis2/java/core/tags/v1.6.0/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml Modified: axis/axis2/java/core/tags/v1.6.0/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/tags/v1.6.0/modules/all/pom.xml?rev=1072365&r1=1072364&r2=1072365&view=diff == --- axis/axis2/java/core/tags/v1.6.0/modules/all/pom.xml (original) +++ axis/axis2/java/core/tags/v1.6.0/modules/all/pom.xml Sat Feb 19 15:50:35 2011 @@ -5,7 +5,7 @@ org.apache.axis2 axis2-parent -1.6.0-SNAPSHOT +1.6.0 ../parent/pom.xml Modified: axis/axis2/java/core/tags/v1.6.0/modules/rmi/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/tags/v1.6.0/modules/rmi/pom.xml?rev=1072365&r1=1072364&r2=1072365&view=diff == --- axis/axis2/java/core/tags/v1.6.0/modules/rmi/pom.xml (original) +++ axis/axis2/java/core/tags/v1.6.0/modules/rmi/pom.xml Sat Feb 19 15:50:35 2011 @@ -27,7 +27,7 @@ org.apache.axis2 axis2-parent -1.6.0-SNAPSHOT +1.6.0 ../parent/pom.xml Modified: axis/axis2/java/core/tags/v1.6.0/modules/samples/book/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/tags/v1.6.0/modules/samples/book/pom.xml?rev=1072365&r1=1072364&r2=1072365&view=diff == --- axis/axis2/java/core/tags/v1.6.0/modules/samples/book/pom.xml (original) +++ axis/axis2/java/core/tags/v1.6.0/modules/samples/book/pom.xml Sat Feb 19 15:50:35 2011 @@ -37,27 +37,27 @@ org.apache.axis2 axis2-kernel -1.6.0-SNAPSHOT +1.6.0 org.apache.axis2 axis2-codegen -1.6.0-SNAPSHOT +1.6.0 org.apache.axis2 axis2-adb -1.6.0-SNAPSHOT +1.6.0 org.apache.ws.commons.axiom axiom-api -1.2.12-SNAPSHOT +1.2.11 org.apache.ws.commons.axiom axiom-impl -1.2.12-SNAPSHOT +1.2.11 org.apache.ws.commons.schema @@ -112,12 +112,12 @@ org.apache.axis2 axis2-transport-http - 1.6.0-SNAPSHOT + 1.6.0 org.apache.axis2 axis2-transport-local - 1.6.0-SNAPSHOT + 1.6.0 Modified: axis/axis2/java/core/tags/v1.6.0/modules/samples/java_first_jaxws/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/tags/v1.6.0/modules/samples/java_first_jaxws/pom.xml?rev=1072365&r1=1072364&r2=1072365&view=diff == --- axis/axis2/java/core/tags/v1.6.0/modules/samples/java_first_jaxws/pom.xml (original) +++ axis/axis2/java/core/tags/v1.6.0/modules/samples/java_first_jaxws/pom.xml Sat Feb 19 15:50:35 2011 @@ -38,32 +38,32 @@ org.apache.axis2 axis2-kernel -1.6.0-SNAPSHOT +1.6.0 org.apache.axis2 axis2-jaxws -1.6.0-SNAPSHOT +1.6.0 org.apache.axis2 axis2-codegen -1.6.0-SNAPSHOT +1.6.0 org.apache.axis2 axis2-
svn commit: r1072385 - in /axis/axis2/java/core/trunk: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/clustering/ modules/codegen/ modules/corba/ modules/distribution/ modules/fastin
Author: veithen Date: Sat Feb 19 16:48:49 2011 New Revision: 1072385 URL: http://svn.apache.org/viewvc?rev=1072385&view=rev Log: Setting the trunk version to 1.7.0-SNAPSHOT to follow latest Maven recommendations (see MNG-4957) and to realign with Rampart and Sandesha2 trunks. Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml axis/axis2/java/core/trunk/modules/adb/pom.xml axis/axis2/java/core/trunk/modules/addressing/pom.xml axis/axis2/java/core/trunk/modules/clustering/pom.xml axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/corba/pom.xml axis/axis2/java/core/trunk/modules/distribution/pom.xml axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml axis/axis2/java/core/trunk/modules/integration/pom.xml axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml axis/axis2/java/core/trunk/modules/jaxbri/pom.xml axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml axis/axis2/java/core/trunk/modules/jaxws/pom.xml axis/axis2/java/core/trunk/modules/jibx/pom.xml axis/axis2/java/core/trunk/modules/json/pom.xml axis/axis2/java/core/trunk/modules/kernel/pom.xml axis/axis2/java/core/trunk/modules/metadata/pom.xml axis/axis2/java/core/trunk/modules/mex/pom.xml axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml axis/axis2/java/core/trunk/modules/osgi/pom.xml axis/axis2/java/core/trunk/modules/parent/pom.xml axis/axis2/java/core/trunk/modules/ping/pom.xml axis/axis2/java/core/trunk/modules/resource-bundle/pom.xml axis/axis2/java/core/trunk/modules/saaj/pom.xml axis/axis2/java/core/trunk/modules/samples/version/pom.xml axis/axis2/java/core/trunk/modules/scripting/pom.xml axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml axis/axis2/java/core/trunk/modules/spring/pom.xml axis/axis2/java/core/trunk/modules/testutils/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml axis/axis2/java/core/trunk/modules/transport/http/pom.xml axis/axis2/java/core/trunk/modules/transport/local/pom.xml axis/axis2/java/core/trunk/modules/webapp/pom.xml axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml axis/axis2/java/core/trunk/pom.xml Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=1072385&r1=1072384&r2=1072385&view=diff == --- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Sat Feb 19 16:48:49 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-parent -SNAPSHOT +1.7.0-SNAPSHOT ../parent/pom.xml axis2-adb-codegen Modified: axis/axis2/java/core/trunk/modules/adb/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/pom.xml?rev=1072385&r1=1072384&r2=1072385&view=diff == --- axis/axis2/java/core/trunk/modules/adb/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/adb/pom.xml Sat Feb 19 16:48:49 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-parent -SNAPSHOT +1.7.0-SNAPSHOT ../parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/addressing/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/pom.xml?rev=1072385&r1=1072384&r2=1072385&view=diff == --- axis/axis2/java/core/trunk/modules/addressing/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/addressing/pom.xml Sat Feb 19 16:48:49 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-parent -SNAPSHOT +1.7.0-SNAPSHOT ../parent/pom.xml addressing Modified: axis/axis2/java/core/trunk/modules/clustering/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/pom.xml?rev=1072385&r1=1072384&r2
svn commit: r1072410 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen
Date: Sat Feb 19 18:56:26 2011
New Revision: 1072410
URL: http://svn.apache.org/viewvc?rev=1072410&view=rev
Log:
Updated Axis2 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=1072410&r1=1072409&r2=1072410&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sat Feb 19 18:56:26 2011
@@ -411,7 +411,7 @@
${pom.version}
${pom.version}
-SNAPSHOT
+1.7.0-SNAPSHOT
1.2.12-SNAPSHOT
1.5.12-SNAPSHOT
svn commit: r1072420 - /axis/axis2/java/sandesha/trunk/pom.xml
Author: veithen Date: Sat Feb 19 19:14:21 2011 New Revision: 1072420 URL: http://svn.apache.org/viewvc?rev=1072420&view=rev Log: Updated Axis2 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=1072420&r1=1072419&r2=1072420&view=diff == --- axis/axis2/java/sandesha/trunk/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/pom.xml Sat Feb 19 19:14:21 2011 @@ -424,7 +424,7 @@ -SNAPSHOT +1.7.0-SNAPSHOT 1.7.0-SNAPSHOT 1.2.12-SNAPSHOT 3.0.0-SNAPSHOT
svn commit: r1072434 - /axis/axis2/java/transports/trunk/pom.xml
Author: veithen Date: Sat Feb 19 20:35:41 2011 New Revision: 1072434 URL: http://svn.apache.org/viewvc?rev=1072434&view=rev Log: Updated Axis2 version. Modified: axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=1072434&r1=1072433&r2=1072434&view=diff == --- axis/axis2/java/transports/trunk/pom.xml (original) +++ axis/axis2/java/transports/trunk/pom.xml Sat Feb 19 20:35:41 2011 @@ -468,7 +468,7 @@ -SNAPSHOT +1.7.0-SNAPSHOT false
svn commit: r1072499 - 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 20 05:12:10 2011
New Revision: 1072499
URL: http://svn.apache.org/viewvc?rev=1072499&view=rev
Log:
user service name to distinguish the exception element name. otherwise there
will be an new element per method per 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=1072499&r1=1072498&r2=1072499&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 20 05:12:10 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 = method.getName() +
getSimpleClassName(exceptionType);
+String partQName = inMessage.getAxisService().getName() +
getSimpleClassName(exceptionType);
TypeTable typeTable =
inMessage.getAxisService().getTypeTable();
QName elementQName =
typeTable.getQNamefortheType(partQName);
SOAPFactory fac = getSOAPFactory(inMessage);
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=1072499&r1=1072498&r2=1072499&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 20 05:12:10 2011
@@ -443,7 +443,7 @@ public class DefaultSchemaGenerator impl
if (AxisFault.class.getName().equals(extype.getName())) {
continue;
}
-String partQname = jMethod.getName() +
getSimpleClassName(extype);
+String partQname = this.service.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(jMethod.getName() +
getSimpleClassName(extype));
+faultMessage.setName(this.service.getName() +
getSimpleClassName(extype));
faultMessage.setElementQName(typeTable.getQNamefortheType(partQname));
axisOperation.setFaultMessages(faultMessage);
}
svn commit: r1072510 - in /axis/axis2/java/core/trunk/modules/samples/faulthandling: client/src/example/BankClient.java service/src/example/BankServiceSkeleton.java
Author: amilas
Date: Sun Feb 20 06:26:55 2011
New Revision: 1072510
URL: http://svn.apache.org/viewvc?rev=1072510&view=rev
Log:
fixing the fault handling sample
Modified:
axis/axis2/java/core/trunk/modules/samples/faulthandling/client/src/example/BankClient.java
axis/axis2/java/core/trunk/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java
Modified:
axis/axis2/java/core/trunk/modules/samples/faulthandling/client/src/example/BankClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/faulthandling/client/src/example/BankClient.java?rev=1072510&r1=1072509&r2=1072510&view=diff
==
---
axis/axis2/java/core/trunk/modules/samples/faulthandling/client/src/example/BankClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/samples/faulthandling/client/src/example/BankClient.java
Sun Feb 20 06:26:55 2011
@@ -51,10 +51,10 @@ public final class BankClient {
final WithdrawResponse withdrawResponse =
bankService.withdraw(withdrawRequest);
System.out.println("Balance = " + withdrawResponse.getBalance());
-} catch (AccountNotExistFaultMessage e) {
+} catch (AccountNotExistException e) {
final AccountNotExistFault fault = e.getFaultMessage();
System.out.println("Account#" + fault.getAccount() + " does not
exist");
-} catch (InsufficientFundFaultMessage e) {
+} catch (InsufficientFundException e) {
final InsufficientFundFault fault = e.getFaultMessage();
System.out.println("Account#" + fault.getAccount() + " has balance
of " + fault.getBalance() + ". It cannot support withdrawal of " +
fault.getRequestedFund());
} catch (RemoteException e) {
Modified:
axis/axis2/java/core/trunk/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java?rev=1072510&r1=1072509&r2=1072510&view=diff
==
---
axis/axis2/java/core/trunk/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java
(original)
+++
axis/axis2/java/core/trunk/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java
Sun Feb 20 06:26:55 2011
@@ -35,12 +35,12 @@
*/
public example.WithdrawResponse withdraw(example.Withdraw param0)
- throws InsufficientFundFaultMessage,AccountNotExistFaultMessage{
+ throws InsufficientFundException,AccountNotExistException{
final String account = param0.getAccount();
if (account.equals("13")) {
final AccountNotExistFault fault = new AccountNotExistFault();
fault.setAccount(account);
-AccountNotExistFaultMessage messageException = new
AccountNotExistFaultMessage("Account does not exist!");
+AccountNotExistException messageException = new
AccountNotExistException("Account does not exist!");
messageException.setFaultMessage(fault);
throw messageException;
}
@@ -51,7 +51,7 @@
fault.setAccount(account);
fault.setBalance(1000);
fault.setRequestedFund(amount);
-InsufficientFundFaultMessage messageException = new
InsufficientFundFaultMessage("Insufficient funds");
+InsufficientFundException messageException = new
InsufficientFundException("Insufficient funds");
messageException.setFaultMessage(fault);
throw messageException;
}
