svn commit: r1145332 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/util/ modules/mtompolicy/src/org/apache/axis2/policy/builders/ modules/mtompolicy/src/org/apache/ax
Author: veithen
Date: Mon Jul 11 20:33:43 2011
New Revision: 1145332
URL: http://svn.apache.org/viewvc?rev=1145332&view=rev
Log:
Merged r1072296, r1089989, r1090429 and r1090457 to the 1.6 branch to upgrade
to Neethi 3.0.1.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
axis/axis2/java/core/branches/1_6/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
axis/axis2/java/core/branches/1_6/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
axis/axis2/java/core/branches/1_6/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 11 20:33:43 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1091178,1091191,1094117,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072296,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
Modified:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java?rev=1145332&r1=1145331&r2=1145332&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
Mon Jul 11 20:33:43 2011
@@ -21,16 +21,13 @@ package org.apache.axis2.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
-import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Transformer;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -47,8 +44,6 @@ import org.apache.neethi.PolicyComponent
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.PolicyReference;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
public class PolicyUtil {
public static String getSafeString(String unsafeString) {
@@ -140,21 +135,20 @@ public class PolicyUtil {
public static PolicyComponent getPolicyComponentFromOMElement(
OMElement policyComponent) throws
IllegalArgumentException {
- if (Constants.Q_ELEM_POLICY.equals(policyComponent.getQName()))
{
+ if (Constants.isPolicyElement(policyComponent.getQName())) {
return PolicyEngine.getPolicy(policyComponent);
- } else if (policyComponent.getQName().equals(
- new QName(Constants.URI_POLICY_NS,
Constants.ELEM_POLICY_REF))) {
+ } else if (Constants.isPolicyRef(policyComponent.getQName())) {
return PolicyEngine.getPolicyReference(policyComponent);
} else {
throw new IllegalArgumentException(
- "Agrument is neither a nor
a element");
+ "Argument is neither a nor
a element");
}
}
public static Policy getPolicyFromOMElement(OMElement policyElement) {
- if (Constants.Q_ELEM_POLICY.equals(policyElement.getQName())) {
+ if (Constants.isPolicyElement(policyElement.getQName())) {
return PolicyEngine.getPolicy(policyElement);
} else {
throw new IllegalArgumentException(
@@ -164
svn commit: r1145336 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/core/src/main/java/org/apache/sandesha2/policy/ modules/core/src/main/java/org/apache/sandesha2/policy/builders/ modules/po
Author: veithen Date: Mon Jul 11 20:38:26 2011 New Revision: 1145336 URL: http://svn.apache.org/viewvc?rev=1145336&view=rev Log: Merged r1072332, r1072333 and r1090216 to the 1.6 branch to upgrade to Neethi 3.0.1. Added: axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/AcknowledgementIntervalAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/AcknowledgementIntervalAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/ContextManagerAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/ContextManagerAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/EPRDecoratorAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/EPRDecoratorAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/EnforceRMAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/EnforceRMAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/ExponentialBackoffAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/ExponentialBackoffAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/InactivityTimeoutAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/InactivityTimeoutAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/InactivityTimeoutMeasureAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/InactivityTimeoutMeasureAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/InvokeInOrderAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/InvokeInOrderAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/MakeConnectionAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/MakeConnectionAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/MaximumRetransmissionCountAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/MaximumRetransmissionCountAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/MessageTypesToDropAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/MessageTypesToDropAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RetransmissionIntervalAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RetransmissionIntervalAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/SandeshaPropertyAssertion.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/SandeshaPropertyAssertion.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/SecurityManagerAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/SecurityManagerAssertionBuilder.java axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/policy/builders/SequenceRemovalTimeoutAssertionBuilder.java - copied unchanged from r1072333, axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/policy/builders/Se
svn commit: r1145456 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Author: isurues
Date: Tue Jul 12 05:03:53 2011
New Revision: 1145456
URL: http://svn.apache.org/viewvc?rev=1145456&view=rev
Log:
removing an unwanted block to remove the part after '/' from the service name.
this code breaks the hierarchical service scenario.
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=1145456&r1=1145455&r2=1145456&view=diff
==
---
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
(original)
+++
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Tue Jul 12 05:03:53 2011
@@ -100,10 +100,6 @@ public abstract class AbstractTransportL
@Override
public EndpointReference[] getEPRsForService(String serviceName, String
ip) throws AxisFault {
-//Strip out the operation name
-if (serviceName.indexOf('/') != -1) {
-serviceName = serviceName.substring(0, serviceName.indexOf('/'));
-}
// strip out the endpoint name if present
if (serviceName.indexOf('.') != -1) {
serviceName = serviceName.substring(0, serviceName.indexOf('.'));
