You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/09/23 21:50:57 UTC
svn commit: r1704925 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/
axiom-api/src/test/java/org/apache/axiom/attachments/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/
testing/axiom-test...
Author: veithen
Date: Wed Sep 23 19:50:56 2015
New Revision: 1704925
URL: http://svn.apache.org/viewvc?rev=1704925&view=rev
Log:
Fix a regression in the OMText#setOptimize method and add some infrastructure for XOP tests.
Added:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java (with props)
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MIMESample.java
- copied, changed from r1704765, webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMESample.java
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XOPSample.java (with props)
webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/
webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/spec-sample.msg (with props)
Removed:
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMESample.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
webservices/axiom/trunk/testing/soap-testsuite/pom.xml
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MTOMSample.java
webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SwASample.java
webservices/axiom/trunk/testing/xml-testsuite/pom.xml
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj Wed Sep 23 19:50:56 2015
@@ -65,7 +65,7 @@ public aspect AxiomTextSupport {
public final void AxiomText.setOptimize(boolean optimize) {
TextContent textContent = getTextContent(optimize);
if (textContent != null) {
- setOptimize(optimize);
+ textContent.setOptimize(optimize);
}
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java Wed Sep 23 19:50:56 2015
@@ -50,9 +50,9 @@ import org.apache.axiom.om.impl.MTOMCons
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.ExceptionInputStream;
import org.apache.axiom.testutils.io.IOTestUtils;
-import org.apache.axiom.ts.soap.MIMESample;
import org.apache.axiom.ts.soap.MTOMSample;
import org.apache.axiom.ts.soap.SwASample;
+import org.apache.axiom.ts.xml.MIMESample;
import org.apache.axiom.util.UIDGenerator;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.NullOutputStream;
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Wed Sep 23 19:50:56 2015
@@ -600,6 +600,8 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.text.TestGetTextCharactersFromDataHandler(metaFactory));
addTest(new org.apache.axiom.ts.om.xop.TestSerialize(metaFactory, false));
addTest(new org.apache.axiom.ts.om.xop.TestSerialize(metaFactory, true));
+ addTest(new org.apache.axiom.ts.om.xop.TestSetOptimize(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.xop.TestSetOptimize(metaFactory, true));
addTest(new org.apache.axiom.ts.om.xop.XOPRoundtripTest(metaFactory));
Method[] methods = AXIOMXPathTestCase.class.getMethods();
for (int i=0; i<methods.length; i++) {
Added: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java?rev=1704925&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java (added)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java Wed Sep 23 19:50:56 2015
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.om.xop;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.apache.axiom.ts.xml.XOPSample.XOP_SPEC_SAMPLE;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import javax.mail.Multipart;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.util.ByteArrayDataSource;
+
+import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.util.StAXParserConfiguration;
+import org.apache.axiom.ts.AxiomTestCase;
+
+public class TestSetOptimize extends AxiomTestCase {
+ private final boolean optimize;
+
+ public TestSetOptimize(OMMetaFactory metaFactory, boolean optimize) {
+ super(metaFactory);
+ this.optimize = optimize;
+ addTestParameter("optimize", optimize);
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ InputStream in = XOP_SPEC_SAMPLE.getInputStream();
+ try {
+ OMDocument document = OMXMLBuilderFactory.createOMBuilder(
+ metaFactory.getOMFactory(),
+ StAXParserConfiguration.DEFAULT,
+ new Attachments(in, XOP_SPEC_SAMPLE.getContentType())).getDocument();
+ for (Iterator it = document.getDescendants(false); it.hasNext(); ) {
+ OMNode node = (OMNode)it.next();
+ if (node instanceof OMText) {
+ OMText text = (OMText)node;
+ if (text.isBinary()) {
+ text.setOptimize(optimize);
+ }
+ }
+ }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ OMOutputFormat format = new OMOutputFormat();
+ format.setDoOptimize(true);
+ document.serialize(out, format);
+
+ Multipart mp = new MimeMultipart(new ByteArrayDataSource(out.toByteArray(), format.getContentType()));
+ assertThat(mp.getCount()).isEqualTo(optimize ? 3 : 1);
+ } finally {
+ in.close();
+ }
+ }
+}
Propchange: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/testing/soap-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/pom.xml?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/pom.xml Wed Sep 23 19:50:56 2015
@@ -45,18 +45,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MTOMSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MTOMSample.java?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MTOMSample.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MTOMSample.java Wed Sep 23 19:50:56 2015
@@ -18,24 +18,10 @@
*/
package org.apache.axiom.ts.soap;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
+import org.apache.axiom.ts.xml.MessageContent;
+import org.apache.axiom.ts.xml.XOPSample;
-import javax.mail.BodyPart;
-import javax.mail.internet.MimeMultipart;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.IOUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class MTOMSample extends MIMESample {
+public class MTOMSample extends XOPSample {
public static final MTOMSample SAMPLE1 = new MTOMSample("sample1.msg",
"multipart/related; " +
"boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; " +
@@ -63,40 +49,6 @@ public class MTOMSample extends MIMESamp
"boundary=\"----=_Part_542_1447667749.1430736561148\"");
private MTOMSample(String name, String contentType) {
- super("mtom/" + name, contentType);
- }
-
- public InputStream getInlinedMessage() {
- try {
- MimeMultipart mp = getMultipart();
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- Document rootPart = documentBuilderFactory.newDocumentBuilder().parse(
- mp.getBodyPart(0).getInputStream());
- process(rootPart.getDocumentElement(), mp);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- TransformerFactory.newInstance().newTransformer().transform(
- new DOMSource(rootPart), new StreamResult(baos));
- return new ByteArrayInputStream(baos.toByteArray());
- } catch (Exception ex) {
- throw new Error(ex);
- }
- }
-
- private void process(Element element, MimeMultipart mp) throws Exception {
- if (element.getNamespaceURI().equals("http://www.w3.org/2004/08/xop/include")
- && element.getLocalName().equals("Include")) {
- String cid = element.getAttribute("href").substring(4);
- BodyPart part = mp.getBodyPart("<" + cid + ">");
- String base64 = Base64.encodeBase64String(IOUtils.toByteArray(part.getInputStream()));
- element.getParentNode().replaceChild(
- element.getOwnerDocument().createTextNode(base64), element);
- } else {
- for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling()) {
- if (child instanceof Element) {
- process((Element)child, mp);
- }
- }
- }
+ super(MessageContent.fromClasspath(MTOMSample.class, "mtom/" + name), contentType);
}
}
Modified: webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SwASample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SwASample.java?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SwASample.java (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SwASample.java Wed Sep 23 19:50:56 2015
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.soap;
+import org.apache.axiom.ts.xml.MIMESample;
+import org.apache.axiom.ts.xml.MessageContent;
+
public class SwASample extends MIMESample {
public static final SwASample SAMPLE1 = new SwASample("sample1.msg",
"multipart/related; " +
@@ -26,6 +29,6 @@ public class SwASample extends MIMESampl
"start=\"<0....@apache.org>\"");
private SwASample(String name, String contentType) {
- super("swa/" + name, contentType);
+ super(MessageContent.fromClasspath(SwASample.class, "swa/" + name), contentType);
}
}
Modified: webservices/axiom/trunk/testing/xml-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/pom.xml?rev=1704925&r1=1704924&r2=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/pom.xml Wed Sep 23 19:50:56 2015
@@ -53,6 +53,14 @@
<artifactId>testutils</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
</dependencies>
<build>
Copied: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MIMESample.java (from r1704765, webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMESample.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MIMESample.java?p2=webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MIMESample.java&p1=webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMESample.java&r1=1704765&r2=1704925&rev=1704925&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/MIMESample.java (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/MIMESample.java Wed Sep 23 19:50:56 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.ts.soap;
+package org.apache.axiom.ts.xml;
import java.io.IOException;
import java.io.InputStream;
@@ -29,19 +29,16 @@ import javax.mail.internet.ContentType;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
-import org.apache.axiom.ts.xml.MessageContent;
-import org.apache.axiom.ts.xml.MessageSample;
-
public abstract class MIMESample extends MessageSample {
private final String contentType;
private MimeMultipart multipart;
- MIMESample(String name, String contentType) {
- super(MessageContent.fromClasspath(MIMESample.class, name));
+ protected MIMESample(MessageContent content, String contentType) {
+ super(content);
this.contentType = contentType;
}
- public String getContentType() {
+ public final String getContentType() {
return contentType;
}
@@ -55,7 +52,7 @@ public abstract class MIMESample extends
}
}
- public String getStart() {
+ public final String getStart() {
String start = getParameter("start");
if (start.startsWith("<") && start.endsWith(">")) {
return start.substring(1, start.length()-1);
@@ -64,7 +61,7 @@ public abstract class MIMESample extends
}
}
- public String getBoundary() {
+ public final String getBoundary() {
return getParameter("boundary");
}
Added: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XOPSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XOPSample.java?rev=1704925&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XOPSample.java (added)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XOPSample.java Wed Sep 23 19:50:56 2015
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.xml;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import javax.mail.BodyPart;
+import javax.mail.internet.MimeMultipart;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public class XOPSample extends MIMESample {
+ /**
+ * Slightly modified version of the non-SOAP sample given in the XOP spec.
+ */
+ public static final XOPSample XOP_SPEC_SAMPLE = new XOPSample("spec-sample.msg",
+ "Multipart/Related;boundary=MIME_boundary; " +
+ "type=\"application/xop+xml\"; " +
+ "start=\"<my...@example.org>\"; " +
+ "start-info=\"text/xml\"");
+
+ protected XOPSample(MessageContent content, String contentType) {
+ super(content, contentType);
+ }
+
+ private XOPSample(String name, String contentType) {
+ super(MessageContent.fromClasspath(XOPSample.class, "xop/" + name), contentType);
+ }
+
+ public final InputStream getInlinedMessage() {
+ try {
+ MimeMultipart mp = getMultipart();
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(true);
+ Document rootPart = documentBuilderFactory.newDocumentBuilder().parse(
+ mp.getBodyPart(0).getInputStream());
+ process(rootPart.getDocumentElement(), mp);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ TransformerFactory.newInstance().newTransformer().transform(
+ new DOMSource(rootPart), new StreamResult(baos));
+ return new ByteArrayInputStream(baos.toByteArray());
+ } catch (Exception ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private void process(Element element, MimeMultipart mp) throws Exception {
+ if (element.getNamespaceURI().equals("http://www.w3.org/2004/08/xop/include")
+ && element.getLocalName().equals("Include")) {
+ String cid = element.getAttribute("href").substring(4);
+ BodyPart part = mp.getBodyPart("<" + cid + ">");
+ String base64 = Base64.encodeBase64String(IOUtils.toByteArray(part.getInputStream()));
+ element.getParentNode().replaceChild(
+ element.getOwnerDocument().createTextNode(base64), element);
+ } else {
+ for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling()) {
+ if (child instanceof Element) {
+ process((Element)child, mp);
+ }
+ }
+ }
+ }
+}
Propchange: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XOPSample.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/spec-sample.msg
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/spec-sample.msg?rev=1704925&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/spec-sample.msg (added)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/spec-sample.msg Wed Sep 23 19:50:56 2015
@@ -0,0 +1,31 @@
+--MIME_boundary
+Content-Type: application/xop+xml;
+ charset=UTF-8;
+ type="text/xml"
+Content-Transfer-Encoding: 8bit
+Content-ID: <my...@example.org>
+
+<m:data xmlns:m='http://example.org/stuff'>
+ <m:photo><xop:Include
+ xmlns:xop='http://www.w3.org/2004/08/xop/include'
+ href='cid:http://example.org/me.png'/></m:photo>
+ <m:sig><xop:Include
+ xmlns:xop='http://www.w3.org/2004/08/xop/include'
+ href='cid:http://example.org/my.hsh'/></m:sig>
+</m:data>
+
+--MIME_boundary
+Content-Type: image/png
+Content-Transfer-Encoding: base64
+Content-ID: <http://example.org/me.png>
+
+/aWKKapGGyQ=
+
+--MIME_boundary
+Content-Type: application/pkcs7-signature
+Content-Transfer-Encoding: base64
+Content-ID: <http://example.org/my.hsh>
+
+Faa7vROi2VQ=
+
+--MIME_boundary--
Propchange: webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/xop/spec-sample.msg
------------------------------------------------------------------------------
svn:eol-style = CRLF