svn commit: r1298292 [3/3] - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src: main/java/org/apache/rahas/ main/java/org/apache/rahas/client/ main/java/org/apache/rahas/impl/ main/java/org/
Added: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/resources/repo/conf/client.axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/resources/repo/conf/client.axis2.xml?rev=1298292&view=auto == --- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/resources/repo/conf/client.axis2.xml (added) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/resources/repo/conf/client.axis2.xml Thu Mar 8 08:11:32 2012 @@ -0,0 +1,410 @@ + + + + + + + + +true +false +false +false + + + + + + + + + + + +3 + + + +false + + + + + +false + +admin +axis2 + + + + + + + + + + + + + + + + + + + + + + + + + +false + + +false + + + + + + + + + + + + + + + + + + + + + + + + + + + +http://www.w3.org/2004/08/wsdl/in-only"; + class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/> +http://www.w3.org/2004/08/wsdl/in-out"; + class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> +http://www.w3.org/2006/01/wsdl/in-only"; + class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/> +http://www.w3.org/2006/01/wsdl/in-out"; + class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r1298294 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: description/AxisService2WSDL11.java util/WSDLSerializationUtil.java
Author: thilinamb
Date: Thu Mar 8 08:22:25 2012
New Revision: 1298294
URL: http://svn.apache.org/viewvc?rev=1298294&view=rev
Log:
Fixing an issue when defining policy references in services.xml.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1298294&r1=1298293&r2=1298294&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Thu Mar 8 08:22:25 2012
@@ -1262,10 +1262,10 @@ public class AxisService2WSDL11 implemen
PolicyLocator locator = new PolicyLocator(axisService);
Policy p = locator.lookup(key);
-if (p == null) {
-throw new Exception("Policy not found for uri : " + key);
+if (p != null) {
+addPolicyToDefinitionElement(key, p);
+
}
-addPolicyToDefinitionElement(key, p);
}
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?rev=1298294&r1=1298293&r2=1298294&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Thu Mar 8 08:22:25 2012
@@ -19,26 +19,13 @@
package org.apache.axis2.util;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.PolicySubject;
-import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.*;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.namespace.Constants;
@@ -48,6 +35,9 @@ import org.apache.axis2.wsdl.SOAPModuleM
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyReference;
+import javax.xml.namespace.QName;
+import java.util.*;
+
/**
* Helps the AxisService to WSDL process
*/
@@ -522,11 +512,9 @@ public class WSDLSerializationUtil {
PolicyLocator locator = new
PolicyLocator(service);
Policy p = locator.lookup(key);
- if (p == null) {
- throw new RuntimeException("Policy not
found for uri : "
- + key);
- }
- policies.add(p);
+if (p != null) {
+policies.add(p);
+}
}
}
svn commit: r1298295 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src: main/java/org/apache/rahas/RahasConstants.java test/java/org/apache/rahas/test/util/TestUtil.java
Author: amilaj
Date: Thu Mar 8 08:30:19 2012
New Revision: 1298295
URL: http://svn.apache.org/viewvc?rev=1298295&view=rev
Log:
Fixed few typos and removed unnecessary constant
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java?rev=1298295&r1=1298294&r2=1298295&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
Thu Mar 8 08:30:19 2012
@@ -84,7 +84,6 @@ public class RahasConstants {
public static final String KEY_TYPE_SYMM_KEY = "/SymmetricKey";
public static final String KEY_TYPE_PUBLIC_KEY = "/PublicKey";
public static final String KEY_TYPE_BEARER = "/Bearer";
-public static final String KEY_TYPE_HOK = "/Bearer";
//Attr values
public static final String BIN_SEC_TYPE_NONCE = "/Nonce";
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java?rev=1298295&r1=1298294&r2=1298295&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java
Thu Mar 8 08:30:19 2012
@@ -242,8 +242,8 @@ public class TestUtil {
/**
* This is directly taken from rampart-core.
* TODO we need to move these common code to a new module. Otherwise code
will be duplicated.
- * We cannot following method from rampart-core as it creates a cyclic
dependency. Therefore we have
- * to live will following.
+ * We cannot use following method from rampart-core as it creates a cyclic
dependency. Therefore we have
+ * to live with following.
* @param doc The document to convert.
* @param useDoom Whether to use doom or not.
* @return A SOAPEnvelope.
@@ -347,8 +347,8 @@ public class TestUtil {
/**
* TODO we need to move these common code to a new module. Otherwise code
will be duplicated.
- * We cannot following method from rampart-core as it creates a cyclic
dependency. Therefore we have
- * to live will following.
+ * We cannot use following method from rampart-core as it creates a cyclic
dependency. Therefore we have
+ * to live with following.
* Creates a DOM Document using the SOAP Envelope.
* @param env An org.apache.axiom.soap.SOAPEnvelope instance
* @return Returns the DOM Document of the given SOAP Envelope.
svn commit: r1298550 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
Author: veithen
Date: Thu Mar 8 20:04:35 2012
New Revision: 1298550
URL: http://svn.apache.org/viewvc?rev=1298550&view=rev
Log:
Added a missing delegate method.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?rev=1298550&r1=1298549&r2=1298550&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
Thu Mar 8 20:04:35 2012
@@ -24,6 +24,7 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.om.impl.dom.TextImpl;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.Text;
@@ -242,6 +243,10 @@ public class TextImplEx extends NodeImpl
textNode.setParent(element);
}
+public Document getOwnerDocument() {
+return textNode.getOwnerDocument();
+}
+
/* (non-Javadoc)
* @see org.apache.axiom.om.OMNode#getParent()
*/
svn commit: r1298688 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: sagara
Date: Fri Mar 9 01:58:45 2012
New Revision: 1298688
URL: http://svn.apache.org/viewvc?rev=1298688&view=rev
Log:
Fixed AXIS2-5264.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
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=1298688&r1=1298687&r2=1298688&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
Fri Mar 9 01:58:45 2012
@@ -184,7 +184,7 @@ public class DefaultSchemaGenerator impl
}
for (String extraClass : extraClassesArray){
-this.extraClasses.add(extraClass);
+this.extraClasses.add(extraClass.trim());
}
}
}
svn commit: r1298691 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: sagara
Date: Fri Mar 9 02:07:29 2012
New Revision: 1298691
URL: http://svn.apache.org/viewvc?rev=1298691&view=rev
Log:
Merged r1298688 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/description/java2wsdl/DefaultSchemaGenerator.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 9 02:07:29 2012
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1
205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1
205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298688
Modified:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1298691&r1=1298690&r2=1298691&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Fri Mar 9 02:07:29 2012
@@ -178,7 +178,7 @@ public class DefaultSchemaGenerator impl
}
for (String extraClass : extraClassesArray){
-this.extraClasses.add(extraClass);
+this.extraClasses.add(extraClass.trim());
}
}
}
