You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/08/02 15:15:51 UTC
svn commit: r1693811 - in /axis/axis2/java/core/branches/1_6: ./
modules/adb-codegen/ modules/adb/ modules/jaxws/
modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/
modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/ modules/jax...
Author: veithen
Date: Sun Aug 2 13:15:50 2015
New Revision: 1693811
URL: http://svn.apache.org/r1693811
Log:
Upgrade to Axiom 1.2.15 and merge the necessary changes from the trunk (all of which apply cleanly).
Added:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
- copied, changed from r1609578, axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java
- copied, changed from r1609578, axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SAAJDocument.java
- copied unchanged from r1609578, axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SAAJDocument.java
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/ImplementationTest.java
- copied unchanged from r1609578, axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/ImplementationTest.java
Removed:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SAAJNode.java
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/ (props changed)
axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
axis/axis2/java/core/branches/1_6/modules/transport/testkit/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 13:15:50 2015
@@ -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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1621171-1621172,1631608,1649688,1677432,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,168790
2,1687961,1693147
+/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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,168383
1,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1693147
Modified: axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml Sun Aug 2 13:15:50 2015
@@ -64,6 +64,11 @@
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/pom.xml Sun Aug 2 13:15:50 2015
@@ -62,6 +62,11 @@
<artifactId>axiom-dom</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Propchange: axis/axis2/java/core/branches/1_6/modules/jaxws/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 13:15:50 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/jaxws: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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,120
2867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1649688
+/axis/axis2/java/core/trunk/modules/jaxws: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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,120
2867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1609578,1609866,1649688,1683827,1683831,1686316
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml Sun Aug 2 13:15:50 2015
@@ -54,6 +54,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
</dependency>
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java Sun Aug 2 13:15:50 2015
@@ -141,7 +141,9 @@ public class XMLStringBlockImpl extends
}
public boolean isDestructiveRead() {
- return false;
+// return false;
+ // TODO: XMLStringBlock should actually be non destructive, but getReader() throws an exception when it is invoked the second time
+ return true;
}
public boolean isDestructiveWrite() {
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java Sun Aug 2 13:15:50 2015
@@ -362,8 +362,7 @@ public class SAAJConverterImpl implement
break;
}
case XMLStreamReader.END_DOCUMENT: {
- // Close reader and ignore
- reader.close();
+ // Ignore
break;
}
case XMLStreamReader.PROCESSING_INSTRUCTION: {
@@ -382,6 +381,7 @@ public class SAAJConverterImpl implement
this._unexpectedEvent("EventID " + String.valueOf(eventID));
}
}
+ reader.close();
} catch (WebServiceException e) {
throw e;
} catch (XMLStreamException e) {
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java Sun Aug 2 13:15:50 2015
@@ -59,21 +59,21 @@ public class DataSourceFormatter impleme
if (log.isDebugEnabled()) {
log.debug("start writeTo()");
}
+ OMElement omElement = messageContext.getEnvelope().getBody().getFirstElement();
+ DataSource busObject;
+ try {
+ busObject = (DataSource)((DataSourceBlock)((OMSourcedElement) omElement).getDataSource()).getBusinessObject(true);
+ } catch (XMLStreamException e) {
+ throw AxisFault.makeFault(e);
+ }
+ DataHandler dataHandler = new DataHandler(busObject);
if (attachments != null && !attachments.isEmpty()) {
- OMElement omElement = messageContext.getEnvelope().getBody().getFirstElement();
- DataSource busObject;
- try {
- busObject = (DataSource)((DataSourceBlock)((OMSourcedElement) omElement).getDataSource()).getBusinessObject(true);
- } catch (XMLStreamException e) {
- throw AxisFault.makeFault(e);
- }
OMMultipartWriter mpw = new OMMultipartWriter(outputStream, format);
- DataHandler rootDataHandler = new DataHandler(busObject);
- if (!rootDataHandler.getContentType().equals(contentType)) {
- rootDataHandler = new WrappedDataHandler(rootDataHandler, contentType);
+ if (!dataHandler.getContentType().equals(contentType)) {
+ dataHandler = new WrappedDataHandler(dataHandler, contentType);
}
try {
- mpw.writePart(rootDataHandler, format.getRootContentId());
+ mpw.writePart(dataHandler, format.getRootContentId());
for (String cid : attachments.keySet()) {
mpw.writePart(attachments.get(cid), cid);
}
@@ -82,24 +82,13 @@ public class DataSourceFormatter impleme
} catch (IOException ex) {
throw AxisFault.makeFault(ex);
}
- } else {
- OMElement omElement = messageContext.getEnvelope().getBody().getFirstElement();
- if (omElement != null) {
- try {
- if (preserve) {
- omElement.serialize(outputStream, format);
- } else {
- omElement.serializeAndConsume(outputStream, format);
- }
- } catch (XMLStreamException e) {
- throw AxisFault.makeFault(e);
- }
- }
- try {
- outputStream.flush();
- } catch (IOException e) {
- throw AxisFault.makeFault(e);
- }
+ } else {
+ try {
+ dataHandler.writeTo(outputStream);
+ outputStream.flush();
+ } catch (IOException e) {
+ throw AxisFault.makeFault(e);
+ }
}
} finally {
if (log.isDebugEnabled()) {
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml Sun Aug 2 13:15:50 2015
@@ -105,6 +105,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java Sun Aug 2 13:15:50 2015
@@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.attachments.impl.BufferUtils;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDataSource;
@@ -60,7 +61,7 @@ public class DataSourceBuilder implement
return factory.createOMElement(ds, "dummy", ns);
}
- public class ByteArrayDataSourceEx extends javax.mail.util.ByteArrayDataSource implements OMDataSource {
+ public class ByteArrayDataSourceEx extends ByteArrayDataSource implements OMDataSource {
private byte[] bytes;
public ByteArrayDataSourceEx(byte[] bytes, String s) {
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java Sun Aug 2 13:15:50 2015
@@ -20,6 +20,7 @@
package org.apache.axis2.builder;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.MTOMConstants;
@@ -27,9 +28,8 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
import java.io.InputStream;
+import java.text.ParseException;
public class MIMEBuilder implements Builder {
Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Sun Aug 2 13:15:50 2015
@@ -68,7 +68,7 @@
<properties>
<neethi.version>3.0.2</neethi.version>
<woden.version>1.0M9</woden.version>
- <axiom.version>1.2.14</axiom.version>
+ <axiom.version>1.2.15</axiom.version>
<xmlschema.version>1.4.7</xmlschema.version>
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.7</antlr.version>
@@ -918,12 +918,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.1</version>
+ <version>1.7.4</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.1</version>
+ <version>1.7.4</version>
</dependency>
</dependencies>
</dependencyManagement>
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 13:15:50 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/saaj: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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202
867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296062,1297744,1297765,1298550,1299356,1299392,1300358,1305728,1328733,1331561,1331616,1332362,1332402,1337975,1338816,1343353,1343399,1343543,1348340,1355706,1355710,1358413,1358494,1358508,1358691,1359499,1359504,1360338,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969
+/axis/axis2/java/core/trunk/modules/saaj: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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202
867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296062,1297744,1297765,1298550,1299356,1299392,1300358,1305728,1328733,1331561,1331616,1332362,1332402,1337975,1338816,1343353,1343399,1343543,1348340,1355706,1355710,1358413,1358494,1358508,1358691,1359499,1359504,1360338,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1509438,1510122,1609578,1609866,1683827,1683831,1686316
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml Sun Aug 2 13:15:50 2015
@@ -101,6 +101,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>saaj-testsuite</artifactId>
+ <version>${axiom.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
on Sun's internal copy of Xerces. See AXIS2-4228. -->
<dependency>
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java Sun Aug 2 13:15:50 2015
@@ -18,19 +18,16 @@
*/
package org.apache.axis2.saaj;
-import javax.xml.soap.SOAPElement;
-
+import org.apache.axiom.om.OMComment;
import org.w3c.dom.Comment;
public class CommentImpl extends TextImplEx implements Comment {
-
- public CommentImpl(String data, SOAPElement parent) {
- super(data, parent);
+ public CommentImpl(OMComment textNode) {
+ super(textNode);
}
- public CommentImpl(String data, SOAPElement parent,
- org.w3c.dom.Node prevSibling, org.w3c.dom.Node nextSibling) {
- super(data, parent, prevSibling, nextSibling);
+ public CommentImpl(String data) {
+ super(data);
}
public boolean isComment() {
Copied: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java (from r1609578, axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java?p2=axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java&p1=axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java&r1=1609578&r2=1693811&rev=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java Sun Aug 2 13:15:50 2015
@@ -19,6 +19,8 @@
package org.apache.axis2.saaj;
import javax.xml.soap.Node;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
import org.apache.axiom.om.OMNode;
@@ -26,4 +28,16 @@ public abstract class NodeImpl<T extends
public NodeImpl(T target, S omTarget) {
super(target, omTarget);
}
+
+ public final void detachNode() {
+ omTarget.detach();
+ }
+
+ public final SOAPElement getParentElement() {
+ return (SOAPElement)getParentNode();
+ }
+
+ public void setParentElement(SOAPElement parent) throws SOAPException {
+ (((SOAPElementImpl<?>)parent).omTarget).addChild(this.omTarget);
+ }
}
Copied: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java (from r1609578, axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java?p2=axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java&p1=axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java&r1=1609578&r2=1693811&rev=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java Sun Aug 2 13:15:50 2015
@@ -20,12 +20,10 @@
package org.apache.axis2.saaj;
import org.apache.axiom.om.OMComment;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMInformationItem;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -55,7 +53,6 @@ import javax.xml.soap.SOAPException;
public abstract class ProxyNode<T extends org.w3c.dom.Node, S extends OMInformationItem> implements Node {
protected final T target;
protected final S omTarget;
- protected SOAPElement parentElement;
static final String SAAJ_NODE = "saaj.node";
public ProxyNode(T target, S omTarget) {
@@ -73,35 +70,6 @@ public abstract class ProxyNode<T extend
}
/**
- * Removes this <code>Node</code> object from the tree. Once removed, this node can be garbage
- * collected if there are no application references to it.
- */
- public void detachNode() {
- this.detach();
- }
-
- public OMNode detach() {
- parentElement = null;
- return null;
- }
-
- /**
- * Removes this <code>Node</code> object from the tree. Once removed, this node can be garbage
- * collected if there are no application references to it.
- */
- public SOAPElement getParentElement() {
- return this.parentElement;
- }
-
- public OMContainer getParent() {
- return (OMContainer)this.parentElement;
- }
-
- /* public OMNode getOMNode() {
- return omNode;
- }*/
-
- /**
* Notifies the implementation that this <code>Node</code> object is no longer being used by the
* application and that the implementation is free to reuse this object for nodes that may be
* created later.
@@ -114,19 +82,6 @@ public abstract class ProxyNode<T extend
// There is no implementation in Axis 1.2 also
}
- /**
- * Sets the parent of this <code>Node</code> object to the given <code>SOAPElement</code>
- * object.
- *
- * @param parent the <code>SOAPElement</code> object to be set as the parent of this
- * <code>Node</code> object
- * @throws SOAPException if there is a problem in setting the parent to the given element
- * @see #getParentElement() getParentElement()
- */
- public void setParentElement(SOAPElement parent) throws SOAPException {
- this.parentElement = parent;
- }
-
public void setType(int nodeType) throws OMException {
throw new UnsupportedOperationException("TODO");
}
@@ -235,21 +190,20 @@ public abstract class ProxyNode<T extend
}
}
- // TODO: the existence of this method probably indicates a problem in TextImplEx
public org.w3c.dom.Node getParentNode() {
- return null;
+ return toSAAJNode(target.getParentNode());
}
public final boolean hasAttributes() {
- return parentElement.hasAttributes();
+ return target.hasAttributes();
}
public final boolean isSupported(String feature, String version) {
- return parentElement.isSupported(feature, version);
+ return target.isSupported(feature, version);
}
public final String getBaseURI() {
- return parentElement.getBaseURI();
+ return target.getBaseURI();
}
public final String getNodeValue() throws DOMException {
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java Sun Aug 2 13:15:50 2015
@@ -39,7 +39,7 @@ public class SOAPBodyElementImpl<T exten
if (!(parent instanceof SOAPBody)) {
throw new IllegalArgumentException("Parent is not a SOAPBody");
}
- this.parentElement = parent;
+ super.setParentElement(parent);
}
public SOAPElement addAttribute(QName qname, String value) throws SOAPException {
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Sun Aug 2 13:15:50 2015
@@ -21,7 +21,6 @@ package org.apache.axis2.saaj;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAP11Version;
import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPFactory;
@@ -64,7 +63,7 @@ public class SOAPBodyImpl extends SOAPEl
throw new SOAPException("A SOAPFault has been already added to this SOAPBody");
}
SOAPBodyElementImpl<OMElement> childEle =
- new SOAPBodyElementImpl<OMElement>((OMElement)getOwnerDocument().createElement(localName));
+ new SOAPBodyElementImpl<OMElement>((OMElement)target.getOwnerDocument().createElement(localName));
childEle.target.setUserData(SAAJ_NODE, childEle, null);
target.appendChild(childEle.target);
childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
@@ -80,7 +79,7 @@ public class SOAPBodyImpl extends SOAPEl
}
SOAPBodyElementImpl<OMElement> childEle =
new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElementNS(namespaceURI,
+ (OMElement)target.getOwnerDocument().createElementNS(namespaceURI,
localName));
childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
@@ -95,7 +94,7 @@ public class SOAPBodyImpl extends SOAPEl
String namespaceURI = child.getNamespaceURI();
String prefix = child.getPrefix();
- SOAPBodyElementImpl<OMElement> childEle = new SOAPBodyElementImpl<OMElement>((OMElement)child);
+ SOAPBodyElementImpl<?> childEle = toSOAPBodyElement(child);
childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
@@ -107,6 +106,14 @@ public class SOAPBodyImpl extends SOAPEl
return childEle;
}
+ private SOAPBodyElementImpl<?> toSOAPBodyElement(Element element) {
+ if (element instanceof SOAPBodyElementImpl) {
+ return (SOAPBodyElementImpl<?>)element;
+ } else {
+ return new SOAPBodyElementImpl<OMElement>(((SOAPElementImpl<?>)element).omTarget);
+ }
+ }
+
public SOAPElement addChildElement(SOAPElement soapElement) throws SOAPException {
String namespaceURI = soapElement.getNamespaceURI();
String prefix = soapElement.getPrefix();
@@ -116,12 +123,12 @@ public class SOAPBodyImpl extends SOAPEl
if (namespaceURI == null || namespaceURI.trim().length() == 0) {
childEle =
new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElement(localName));
+ (OMElement)target.getOwnerDocument().createElement(localName));
} else {
omTarget.declareNamespace(namespaceURI, prefix);
childEle =
new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElementNS(namespaceURI,
+ (OMElement)target.getOwnerDocument().createElementNS(namespaceURI,
localName));
}
@@ -163,14 +170,14 @@ public class SOAPBodyImpl extends SOAPEl
SOAPBodyElementImpl<OMElement> childEle;
if (uri == null || "".equals(uri)) {
childEle = new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElement(localName));
+ (OMElement)target.getOwnerDocument().createElement(localName));
} else if (prefix.length() == 0) {
childEle = new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElementNS(uri,
+ (OMElement)target.getOwnerDocument().createElementNS(uri,
localName));
} else {
childEle = new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElementNS(uri,
+ (OMElement)target.getOwnerDocument().createElementNS(uri,
prefix + ":" + localName));
}
childEle.target.setUserData(SAAJ_NODE, childEle, null);
@@ -399,11 +406,11 @@ public class SOAPBodyImpl extends SOAPEl
}
if (node instanceof org.w3c.dom.Text) {
org.w3c.dom.Text domText = (org.w3c.dom.Text)node;
- return new TextImplEx(domText.getData(), parent);
+ return new TextImplEx(domText.getData());
}
if (node instanceof org.w3c.dom.Comment) {
org.w3c.dom.Comment domText = (org.w3c.dom.Comment)node;
- return new CommentImpl(domText.getData(), parent);
+ return new CommentImpl(domText.getData());
}
Element domEle = ((Element)node);
int indexOfColon = domEle.getTagName().indexOf(":");
@@ -469,15 +476,6 @@ public class SOAPBodyImpl extends SOAPEl
return saajEle;
}
- public void detachNode() {
- this.detach();
- }
-
- public OMNode detach() {
- this.parentElement = null;
- return this.omTarget.detach();
- }
-
public Iterator getChildElements(Name name) {
QName qName = new QName(name.getURI(), name.getLocalName());
return getChildren(omTarget.getChildrenWithName(qName));
@@ -496,14 +494,14 @@ public class SOAPBodyImpl extends SOAPEl
SOAPBodyElementImpl<OMElement> childEle;
if (qname.getNamespaceURI() == null || "".equals(qname.getNamespaceURI())) {
childEle = new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElement(qname.getLocalPart()));
+ (OMElement)target.getOwnerDocument().createElement(qname.getLocalPart()));
}else if(null == qname.getPrefix() || "".equals(qname.getPrefix().trim())) {
childEle = new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElementNS(qname.getNamespaceURI(),
+ (OMElement)target.getOwnerDocument().createElementNS(qname.getNamespaceURI(),
qname.getLocalPart()));
}else {
childEle = new SOAPBodyElementImpl<OMElement>(
- (OMElement)getOwnerDocument().createElementNS(qname.getNamespaceURI(),
+ (OMElement)target.getOwnerDocument().createElementNS(qname.getNamespaceURI(),
qname.getPrefix() + ":" +
qname.getLocalPart()));
}
@@ -568,7 +566,7 @@ public class SOAPBodyImpl extends SOAPEl
Collection childElements = new ArrayList();
while (childIter.hasNext()) {
org.w3c.dom.Node domNode = (org.w3c.dom.Node)childIter.next();
- Node saajNode = toSAAJNode(domNode);
+ org.w3c.dom.Node saajNode = toSAAJNode(domNode);
if (saajNode instanceof javax.xml.soap.Text) {
childElements.add(saajNode);
} else if (!(saajNode instanceof SOAPBodyElement)) {
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Sun Aug 2 13:15:50 2015
@@ -23,8 +23,6 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.OMElementEx;
import org.apache.axiom.soap.SOAP11Version;
import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPFactory;
@@ -53,7 +51,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-public class SOAPElementImpl<T extends OMElement> extends SAAJNode<Element,T> implements SOAPElement {
+public class SOAPElementImpl<T extends OMElement> extends NodeImpl<Element,T> implements SOAPElement {
private String encodingStyle;
public SOAPElementImpl(T element) {
@@ -71,7 +69,7 @@ public class SOAPElementImpl<T extends O
*/
public SOAPElement addAttribute(Name name, String value) throws SOAPException {
if (name.getURI() == null || name.getURI().trim().length() == 0) {
- target.setAttribute(name.getLocalName(), value);
+ target.setAttributeNS("", name.getLocalName(), value);
} else {
target.setAttributeNS(name.getURI(), name.getPrefix() + ":" + name.getLocalName(),
value);
@@ -102,7 +100,7 @@ public class SOAPElementImpl<T extends O
} else {
omTarget.declareNamespace(namespaceURI, prefix);
childEle =
- new SOAPElementImpl<OMElement>((OMElement)getOwnerDocument().createElementNS(namespaceURI,
+ new SOAPElementImpl<OMElement>((OMElement)target.getOwnerDocument().createElementNS(namespaceURI,
localName));
}
@@ -138,9 +136,8 @@ public class SOAPElementImpl<T extends O
if (prefix == null) {
prefix = "";
}
- SOAPElementImpl<OMElement> childEle =
- new SOAPElementImpl<OMElement>((OMElement)getOwnerDocument().
- createElementNS(namespaceURI, prefix.length() == 0 ? localName : prefix + ":" + localName));
+ SOAPElementImpl<OMElement> childEle = (SOAPElementImpl<OMElement>)getOwnerDocument().
+ createElementNS(namespaceURI, prefix.length() == 0 ? localName : prefix + ":" + localName);
childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(prefix.length() == 0
@@ -204,9 +201,7 @@ public class SOAPElementImpl<T extends O
//Therefore create a text node and add it
//TODO: May need to address the situation where the prev sibling of the textnode itself is a textnode
Text textNode = getOwnerDocument().createTextNode(text);
- target.appendChild(textNode);
- TextImplEx saajTextNode = new TextImplEx((OMText)textNode, this);
- textNode.setUserData(SAAJ_NODE, saajTextNode, null);
+ appendChild(textNode);
return this;
}
@@ -645,30 +640,6 @@ public class SOAPElementImpl<T extends O
}
/**
- * Returns the parent element of this <code>Node</code> object. This method can throw an
- * <code>UnsupportedOperationException</code> if the tree is not kept in memory.
- *
- * @return the <code>SOAPElement</code> object that is the parent of this <code>Node</code>
- * object or <code>null</code> if this <code>Node</code> object is root
- * @throws UnsupportedOperationException if the whole tree is not kept in memory
- * @see #setParentElement(javax.xml.soap.SOAPElement) setParentElement(javax.xml.soap.SOAPElement)
- */
- public SOAPElement getParentElement() {
- if (this.parentElement == null) {
- javax.xml.soap.Node parentNode = toSAAJNode(target.getParentNode());
- if (parentNode instanceof SOAPElement) {
- this.parentElement = (SOAPElement) parentNode;
- }
- }
- return this.parentElement;
- }
-
- public void setParentElement(SOAPElement parent) throws SOAPException {
- this.parentElement = parent;
- ((OMElementEx)this.omTarget).setParent(((SOAPElementImpl<? extends OMElement>)parent).omTarget);
- }
-
- /**
* Returns the the value of the immediate child of this <code>Node</code> object if a child
* exists and its value is text.
*
@@ -696,28 +667,6 @@ public class SOAPElementImpl<T extends O
return super.clone();
}
- public Node getParentNode() {
- Node parentNode = null;
- if (this.parentElement == null) {
- parentNode = toSAAJNode(target.getParentNode());
- if (parentNode instanceof SOAPElement) {
- this.parentElement = (SOAPElement) parentNode;
- }
- } else {
- parentNode = this.parentElement;
- }
- return parentNode;
- }
-
- /** dom Node method */
- public org.w3c.dom.Node getNextSibling() {
- return toSAAJNode(target.getNextSibling());
- }
-
- public Node getPreviousSibling() {
- return toSAAJNode(target.getPreviousSibling());
- }
-
/**
* If this is a Text node then this method will set its value, otherwise it sets the value of
* the immediate (Text) child of this node. The value of the immediate child of this node can be
@@ -746,16 +695,6 @@ public class SOAPElementImpl<T extends O
}
}
- public void detachNode() {
- this.detach();
- }
-
- public OMNode detach() {
- OMNode omNode = this.omTarget.detach();
- this.parentElement = null;
- return omNode;
- }
-
public String toString() {
return target.toString();
}
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java Sun Aug 2 13:15:50 2015
@@ -755,7 +755,7 @@ public class SOAPFaultImpl extends SOAPB
Collection childElements = new ArrayList();
while (childIter.hasNext()) {
org.w3c.dom.Node domNode = (org.w3c.dom.Node)childIter.next();
- Node saajNode = toSAAJNode(domNode);
+ org.w3c.dom.Node saajNode = toSAAJNode(domNode);
if (!(saajNode instanceof SOAPFaultElement)) {
// silently replace node, as per saaj 1.2 spec
SOAPFaultElement bodyEle = new SOAPFaultElementImpl<OMElement>((OMElement)domNode);
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Sun Aug 2 13:15:50 2015
@@ -21,7 +21,6 @@ package org.apache.axis2.saaj;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAP11Version;
import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPFactory;
@@ -31,7 +30,6 @@ import org.w3c.dom.Element;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
-import javax.xml.soap.Node;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
@@ -349,7 +347,7 @@ public class SOAPHeaderImpl extends SOAP
Collection childElements = new ArrayList();
while (childIter.hasNext()) {
org.w3c.dom.Node domNode = (org.w3c.dom.Node)childIter.next();
- Node saajNode = toSAAJNode(domNode);
+ org.w3c.dom.Node saajNode = toSAAJNode(domNode);
if (saajNode instanceof javax.xml.soap.Text) {
childElements.add(saajNode);
} else if (!(saajNode instanceof SOAPHeaderElement)) {
@@ -363,14 +361,4 @@ public class SOAPHeaderImpl extends SOAP
}
return childElements.iterator();
}
-
- public void detachNode() {
- this.detach();
- }
-
- public OMNode detach() {
- OMNode omNode = omTarget.detach();
- parentElement = null;
- return omNode;
- }
}
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java Sun Aug 2 13:15:50 2015
@@ -20,19 +20,18 @@
package org.apache.axis2.saaj;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.mime.ContentTypeBuilder;
+import org.apache.axiom.mime.MediaType;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.OMMultipartWriter;
import org.apache.axiom.soap.SOAP11Version;
-import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.saaj.util.SAAJUtil;
import org.apache.axis2.transport.http.HTTPConstants;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MimeHeader;
import javax.xml.soap.MimeHeaders;
@@ -46,6 +45,7 @@ import javax.xml.soap.SOAPPart;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Hashtable;
@@ -63,12 +63,7 @@ public class SOAPMessageImpl extends SOA
public SOAPMessageImpl(SOAPEnvelopeImpl soapEnvelope) {
this.mimeHeaders = new MimeHeaders();
- if (((SOAPFactory)soapEnvelope.omTarget.getOMFactory()).getSOAPVersion() == SOAP11Version.getSingleton()) {
- this.mimeHeaders.addHeader("content-type", HTTPConstants.MEDIA_TYPE_TEXT_XML);
- } else if (((SOAPFactory)soapEnvelope.omTarget.getOMFactory()).getSOAPVersion() == SOAP12Version.getSingleton()) {
- this.mimeHeaders.addHeader("content-type",
- HTTPConstants.MEDIA_TYPE_APPLICATION_SOAP_XML);
- }
+ this.mimeHeaders.addHeader("content-type", ((SOAPFactory)soapEnvelope.omTarget.getOMFactory()).getSOAPVersion().getMediaType().toString());
soapPart = new SOAPPartImpl(this, soapEnvelope);
}
@@ -275,23 +270,20 @@ public class SOAPMessageImpl extends SOA
public void saveChanges() throws SOAPException {
try {
String contentTypeValue = getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE);
- ContentType contentType = null;
+ ContentTypeBuilder contentType;
if (isEmptyString(contentTypeValue)) {
- if (attachmentParts.size() > 0) {
- contentTypeValue = HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED;
- } else {
- contentTypeValue = getBaseType();
+ contentType = new ContentTypeBuilder(attachmentParts.size() > 0 ? MediaType.MULTIPART_RELATED : getMediaType());
+ } else {
+ contentType = new ContentTypeBuilder(contentTypeValue);
+ //Use configures the baseType with multipart/related while no attachment exists or all the attachments are removed
+ if (contentType.getMediaType().equals(MediaType.MULTIPART_RELATED) && attachmentParts.size() == 0) {
+ contentType.setMediaType(getMediaType());
+ contentType.clearParameters();
}
}
- contentType = new ContentType(contentTypeValue);
-
- //Use configures the baseType with multipart/related while no attachment exists or all the attachments are removed
- if(contentType.getBaseType().equals(HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED) && attachmentParts.size() == 0) {
- contentType = new ContentType(getBaseType());
- }
//If it is of multipart/related, initialize those required values in the content-type, including boundary etc.
- if (contentType.getBaseType().equals(HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED)) {
+ if (contentType.getMediaType().equals(MediaType.MULTIPART_RELATED)) {
//Configure boundary
String boundaryParam = contentType.getParameter("boundary");
@@ -315,15 +307,15 @@ public class SOAPMessageImpl extends SOA
}
//Configure type
- contentType.setParameter("type", getBaseType());
+ contentType.setParameter("type", getMediaType().toString());
//Configure charset
String soapPartContentTypeValue = getSingleHeaderValue(soapPart.getMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE));
- ContentType soapPartContentType = null;
+ ContentTypeBuilder soapPartContentType = null;
if (isEmptyString(soapPartContentTypeValue)) {
- soapPartContentType = new ContentType(soapPartContentTypeValue);
+ soapPartContentType = new ContentTypeBuilder(soapPartContentTypeValue);
} else {
- soapPartContentType = new ContentType(getBaseType());
+ soapPartContentType = new ContentTypeBuilder(getMediaType());
}
setCharsetParameter(soapPartContentType);
} else {
@@ -382,7 +374,7 @@ public class SOAPMessageImpl extends SOA
if (attachmentParts.isEmpty()) {
envelope.serialize(out, format);
} else {
- ContentType contentType = new ContentType(getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE));
+ ContentTypeBuilder contentType = new ContentTypeBuilder(getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE));
String boundary = contentType.getParameter("boundary");
if(isEmptyString(boundary)) {
boundary = UIDGenerator.generateMimeBoundary();
@@ -612,9 +604,8 @@ public class SOAPMessageImpl extends SOA
}
}
- private String getBaseType() throws SOAPException {
- boolean isSOAP12 = ((SOAPFactory)((SOAPEnvelopeImpl) soapPart.getEnvelope()).omTarget.getOMFactory()).getSOAPVersion() == SOAP12Version.getSingleton();
- return isSOAP12 ? HTTPConstants.MEDIA_TYPE_APPLICATION_SOAP_XML : HTTPConstants.MEDIA_TYPE_TEXT_XML;
+ private MediaType getMediaType() throws SOAPException {
+ return ((SOAPFactory)((SOAPEnvelopeImpl) soapPart.getEnvelope()).omTarget.getOMFactory()).getSOAPVersion().getMediaType();
}
/**
@@ -624,7 +615,7 @@ public class SOAPMessageImpl extends SOA
* @param contentType
* @throws SOAPException
*/
- private void setCharsetParameter(ContentType contentType) throws SOAPException{
+ private void setCharsetParameter(ContentTypeBuilder contentType) throws SOAPException{
String charset = (String)getProperty(CHARACTER_SET_ENCODING);
if (!isEmptyString(charset)) {
contentType.setParameter("charset", charset);
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java Sun Aug 2 13:15:50 2015
@@ -20,6 +20,8 @@
package org.apache.axis2.saaj;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.mime.ContentType;
+import org.apache.axiom.mime.MediaType;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.impl.MTOMConstants;
@@ -52,8 +54,6 @@ import org.w3c.dom.ProcessingInstruction
import org.w3c.dom.Text;
import org.w3c.dom.UserDataHandler;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
@@ -71,9 +71,11 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.text.ParseException;
import java.util.Iterator;
public class SOAPPartImpl extends SOAPPart {
@@ -146,25 +148,29 @@ public class SOAPPartImpl extends SOAPPa
soapFactory = metaFactory.getSOAP11Factory();
soapEnvelopeNamespaceURI = null;
} else {
- String baseType = contentType.getBaseType().toLowerCase();
- String soapContentType;
- if (baseType.equals(MTOMConstants.MTOM_TYPE)) {
+ MediaType baseType = contentType.getMediaType();
+ MediaType soapContentType;
+ if (baseType.equals(MediaType.APPLICATION_XOP_XML)) {
isMTOM = true;
String typeParam = contentType.getParameter("type");
if (typeParam == null) {
throw new SOAPException("Missing 'type' parameter in XOP content type");
} else {
- soapContentType = typeParam.toLowerCase();
+ try {
+ soapContentType = new ContentType(typeParam).getMediaType();
+ } catch (ParseException ex) {
+ throw new SOAPException("Failed to parse the 'type' parameter", ex);
+ }
}
} else {
isMTOM = false;
soapContentType = baseType;
}
- if (soapContentType.equals(HTTPConstants.MEDIA_TYPE_TEXT_XML)) {
+ if (soapContentType.equals(MediaType.TEXT_XML)) {
soapEnvelopeNamespaceURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
soapFactory = metaFactory.getSOAP11Factory();
- } else if (soapContentType.equals(HTTPConstants.MEDIA_TYPE_APPLICATION_SOAP_XML)) {
+ } else if (soapContentType.equals(MediaType.APPLICATION_SOAP_XML)) {
soapEnvelopeNamespaceURI = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
soapFactory = metaFactory.getSOAP12Factory();
} else {
@@ -1186,7 +1192,7 @@ public class SOAPPartImpl extends SOAPPa
throw new IllegalStateException("Cannot set value of SOAPPart.");
}
- javax.xml.soap.Node toSAAJNode(org.w3c.dom.Node domNode) {
- return SAAJNode.toSAAJNode(domNode, this);
+ Node toSAAJNode(org.w3c.dom.Node domNode) {
+ return ProxyNode.toSAAJNode(domNode, this);
}
}
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java Sun Aug 2 13:15:50 2015
@@ -20,38 +20,18 @@
package org.apache.axis2.saaj;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMNode;
import org.w3c.dom.DOMException;
-import javax.xml.soap.SOAPElement;
import javax.xml.soap.Text;
-public class TextImplEx extends SAAJNode<org.w3c.dom.Text,OMText> implements Text {
- private org.w3c.dom.Node previousSibling;
- private org.w3c.dom.Node nextSibling;
-
- public TextImplEx(String data, SOAPElement parent) {
- this(OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM).getOMFactory().createOMText(data), parent);
- }
-
- public TextImplEx(OMText textNode, SOAPElement parent) {
- super((org.w3c.dom.Text)textNode, textNode);
- this.parentElement = parent;
- }
-
- public TextImplEx(String data, SOAPElement parent,
- org.w3c.dom.Node prevSibling, org.w3c.dom.Node nextSibling) {
- this(data, parent);
- this.previousSibling = prevSibling;
- this.nextSibling = nextSibling;
- }
-
- public void setNextSibling(org.w3c.dom.Node nextSibling) {
- this.nextSibling = nextSibling;
+public class TextImplEx extends NodeImpl<org.w3c.dom.CharacterData,OMNode> implements Text {
+ public TextImplEx(String data) {
+ this(OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM).getOMFactory().createOMText(data));
}
- public void setPreviousSibling(org.w3c.dom.Node previousSibling) {
- this.previousSibling = previousSibling;
+ public TextImplEx(OMNode textNode) {
+ super((org.w3c.dom.CharacterData)textNode, textNode);
}
/**
@@ -61,7 +41,7 @@ public class TextImplEx extends SAAJNode
* otherwise
*/
public boolean isComment() {
- String value = omTarget.getText();
+ String value = target.getData();
return value.startsWith("<!--") && value.endsWith("-->");
}
@@ -80,7 +60,7 @@ public class TextImplEx extends SAAJNode
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
public org.w3c.dom.Text splitText(int offset) throws DOMException {
- return target.splitText(offset);
+ return ((Text)target).splitText(offset);
}
public boolean isElementContentWhitespace() {
@@ -235,16 +215,6 @@ public class TextImplEx extends SAAJNode
return getValue();
}
-
- public org.w3c.dom.Node getNextSibling() {
- return toSAAJNode(nextSibling);
- }
-
-
- public org.w3c.dom.Node getPreviousSibling() {
- return toSAAJNode(previousSibling);
- }
-
public int getLength() {
return target.getLength();
}
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java Sun Aug 2 13:15:50 2015
@@ -20,6 +20,9 @@
package org.apache.axis2.saaj;
import junit.framework.Assert;
+
+import org.apache.axiom.mime.ContentType;
+import org.apache.axiom.mime.MediaType;
import org.apache.axis2.saaj.util.SAAJDataSource;
import org.apache.axis2.transport.http.HTTPConstants;
import org.junit.Before;
@@ -27,7 +30,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import javax.activation.DataHandler;
-import javax.mail.internet.ContentType;
import javax.xml.namespace.QName;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MessageFactory;
@@ -46,6 +48,7 @@ import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.transform.stream.StreamSource;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -247,7 +250,7 @@ public class SOAPMessageTest extends Ass
//start parameter is not checked, due to it is optional parameter, and seems RI will not add this value
//assertNotNull("start parameter should exist in the content-type header", contentType.getParameter("start"));
assertNotNull("type parameter should exist in the content-type header", contentType.getParameter("type"));
- assertEquals(HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED, contentType.getBaseType());
+ assertEquals(MediaType.MULTIPART_RELATED, contentType.getMediaType());
}
@Validated @Test
@@ -266,7 +269,7 @@ public class SOAPMessageTest extends Ass
msg2.saveChanges();
ContentType contentType2 = new ContentType(msg2.getMimeHeaders().getHeader(HTTPConstants.HEADER_CONTENT_TYPE)[0]);
- assertEquals(contentType.getBaseType(), contentType2.getBaseType());
+ assertEquals(contentType.getMediaType(), contentType2.getMediaType());
assertEquals(contentType.getParameter("boundary"), contentType2.getParameter("boundary"));
assertEquals(contentType.getParameter("type"), contentType2.getParameter("type"));
//start parameter is not checked, due to it is an optional parameter, and seems RI will not add this value
@@ -284,14 +287,14 @@ public class SOAPMessageTest extends Ass
assertNotNull(msg.getMimeHeaders().getHeader(HTTPConstants.HEADER_CONTENT_TYPE));
ContentType contentType = new ContentType(msg.getMimeHeaders().getHeader(HTTPConstants.HEADER_CONTENT_TYPE)[0]);
- assertEquals(HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED, contentType.getBaseType());
+ assertEquals(MediaType.MULTIPART_RELATED, contentType.getMediaType());
msg.removeAllAttachments();
msg.saveChanges();
assertNotNull(msg.getMimeHeaders().getHeader(HTTPConstants.HEADER_CONTENT_TYPE));
contentType = new ContentType(msg.getMimeHeaders().getHeader(HTTPConstants.HEADER_CONTENT_TYPE)[0]);
- assertEquals("text/xml", contentType.getBaseType());
+ assertEquals(MediaType.TEXT_XML, contentType.getMediaType());
}
private StringBuffer copyToBuffer(InputStream inputStream) {
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java Sun Aug 2 13:15:50 2015
@@ -196,50 +196,6 @@ public class SOAPPartTest extends Assert
assertTrue(node == null);
}
- /**
- * Check parent processing of SOAPMessage
- */
- // TODO: check why this fails with Sun's SAAJ implementation
- @Test
- public void test_parentAccess2() throws Exception {
-
- MessageFactory mf = MessageFactory.newInstance();
- SOAPMessage m = mf.createMessage();
- SOAPPart sp = m.getSOAPPart();
- SOAPEnvelope se = sp.getEnvelope();
- Node node = se.getParentNode();
- assertTrue(node == sp);
- node = node.getParentNode();
- assertTrue(node == null);
-
- SOAPElement e = se.getParentElement();
- assertTrue(node == null);
- }
-
- /**
- * Check parent processing of SOAPMessage
- */
- @Validated @Test
- public void test_parentAccess3() throws Exception {
-
- SOAP11Factory axiomSF = new SOAP11Factory();
- org.apache.axiom.soap.SOAPEnvelope axiomSE = axiomSF.createSOAPEnvelope();
- org.apache.axiom.soap.SOAPMessage axiomSM = axiomSF.createSOAPMessage();
- axiomSM.setSOAPEnvelope(axiomSE);
-
- SOAPEnvelopeImpl se = new SOAPEnvelopeImpl(axiomSE);
- SOAPMessageImpl sm = new SOAPMessageImpl(se);
- SOAPPartImpl sp = new SOAPPartImpl(sm, se);
-
- Node node = se.getParentNode();
- assertTrue(node == sp);
- node = node.getParentNode();
- assertTrue(node == null);
-
- SOAPElement e = se.getParentElement();
- assertTrue(node == null);
- }
-
// TODO: check why this fails with Sun's SAAJ implementation
@Test
public void testNodeTypes() throws Exception {
Modified: axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java Sun Aug 2 13:15:50 2015
@@ -22,10 +22,9 @@ package org.apache.axis2.format;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
+import java.text.ParseException;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
-
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
Modified: axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java Sun Aug 2 13:15:50 2015
@@ -15,6 +15,7 @@
*/
package org.apache.axis2.transport.jms;
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -35,14 +36,13 @@ import org.apache.axis2.transport.jms.io
import javax.jms.*;
import javax.jms.Queue;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.NameNotFoundException;
import java.lang.reflect.Method;
+import java.text.ParseException;
import java.util.*;
/**
Propchange: axis/axis2/java/core/branches/1_6/modules/transport/testkit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 13:15:50 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/transport/testkit: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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863
,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1649688
+/axis/axis2/java/core/trunk/modules/transport/testkit: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,1127327,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,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863
,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1609578,1609866,1649688,1683827,1683831,1686316
Modified: axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml?rev=1693811&r1=1693810&r2=1693811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml Sun Aug 2 13:15:50 2015
@@ -83,6 +83,10 @@
<artifactId>jetty</artifactId>
<version>5.1.10</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </dependency>
</dependencies>
<profiles>