You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/06/10 02:57:39 UTC
svn commit: r1134158 - in /cxf/tags/cxf-2.3.5: ./
distribution/src/main/release/samples/ws_security/interopfest/wssc/
distribution/src/main/release/samples/ws_security/interopfest/wssec10/
distribution/src/main/release/samples/ws_security/interopfest/w...
Author: dkulp
Date: Fri Jun 10 00:57:39 2011
New Revision: 1134158
URL: http://svn.apache.org/viewvc?rev=1134158&view=rev
Log:
Merge CXF-3582 so I can rebuild 2.3.5
Also fix versions in poms that release:prepare could not modify
Added:
cxf/tags/cxf-2.3.5/rt/core/src/test/java/org/apache/cxf/attachment/cxf3582.data
- copied unchanged from r1134156, cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/attachment/cxf3582.data
Modified:
cxf/tags/cxf-2.3.5/ (props changed)
cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
cxf/tags/cxf-2.3.5/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
cxf/tags/cxf-2.3.5/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
cxf/tags/cxf-2.3.5/systests/container-integration/jetty6/pom.xml
Propchange: cxf/tags/cxf-2.3.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 00:57:39 2011
@@ -1 +1 @@
-/cxf/trunk:1128145
+/cxf/branches/2.3.x-fixes:1134156
Propchange: cxf/tags/cxf-2.3.5/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
Propchange: cxf/tags/cxf-2.3.5/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml (original)
+++ cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml Fri Jun 10 00:57:39 2011
@@ -21,12 +21,12 @@
<groupId>org.apache.cxf.samples.interopfest</groupId>
<name>CXF Interopfest WS-SC Demo </name>
<artifactId>ws-sc</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<relativePath>../../..</relativePath>
</parent>
@@ -181,29 +181,29 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
</dependencies>
</project>
Modified: cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml (original)
+++ cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml Fri Jun 10 00:57:39 2011
@@ -21,12 +21,12 @@
<groupId>org.apache.cxf.samples.interopfest</groupId>
<name>CXF Interopfest WS-SEC10 Demo</name>
<artifactId>ws-sec10</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<relativePath>../../..</relativePath>
</parent>
@@ -167,29 +167,29 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
</dependencies>
</project>
Modified: cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml (original)
+++ cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml Fri Jun 10 00:57:39 2011
@@ -21,12 +21,12 @@
<groupId>org.apache.cxf.samples.interopfest</groupId>
<name>CXF Interopfest WS-SEC11 Demo</name>
<artifactId>ws-sec11</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<relativePath>../../..</relativePath>
</parent>
@@ -168,29 +168,29 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
</dependencies>
</project>
Modified: cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml (original)
+++ cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml Fri Jun 10 00:57:39 2011
@@ -21,12 +21,12 @@
<groupId>org.apache.cxf.samples.interopfest</groupId>
<name>CXF Interopfest WS-TRUST10 Demo</name>
<artifactId>ws-trust10</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<relativePath>../../..</relativePath>
</parent>
@@ -151,29 +151,29 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
</dependencies>
</project>
Modified: cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml (original)
+++ cxf/tags/cxf-2.3.5/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml Fri Jun 10 00:57:39 2011
@@ -21,12 +21,12 @@
<groupId>org.apache.cxf.samples.interopfest</groupId>
<name>CXF Interopfest WS-TRUST13 Demo</name>
<artifactId>ws-trust13</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
<relativePath>../../..</relativePath>
</parent>
@@ -143,29 +143,29 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.3.5-SNAPSHOT</version>
+ <version>2.3.5</version>
</dependency>
</dependencies>
</project>
Modified: cxf/tags/cxf-2.3.5/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java (original)
+++ cxf/tags/cxf-2.3.5/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java Fri Jun 10 00:57:39 2011
@@ -179,7 +179,7 @@ public class MimeBodyPartInputStream ext
//boundary matched (may or may not be last mime boundary)
int processed = initialI - off;
- if ((len - (i + 2)) > 0) {
+ if ((len - ((i - off) + 2)) > 0) {
inStream.unread(buffer, i + 2, len - (i + 2) + off);
}
return processed;
Modified: cxf/tags/cxf-2.3.5/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java (original)
+++ cxf/tags/cxf-2.3.5/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java Fri Jun 10 00:57:39 2011
@@ -495,4 +495,142 @@ public class AttachmentDeserializerTest
}
}
-}
\ No newline at end of file
+
+ @Test
+ public void testCXF3582() throws Exception {
+ String contentType = "multipart/related; type=\"application/xop+xml\"; "
+ + "boundary=\"uuid:906fa67b-85f9-4ef5-8e3d-52416022d463\"; "
+ + "start=\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
+
+
+ Message message = new MessageImpl();
+ message.put(Message.CONTENT_TYPE, contentType);
+ message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3582.data"));
+ message.put(AttachmentDeserializer.ATTACHMENT_DIRECTORY, System
+ .getProperty("java.io.tmpdir"));
+ message.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD, String
+ .valueOf(AttachmentDeserializer.THRESHOLD));
+
+
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
+ Collections.singletonList("multipart/related"));
+
+ ad.initializeAttachments();
+
+ String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
+ DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
+ byte bts[] = new byte[1024];
+ InputStream ins = ds.getInputStream();
+ int count = ins.read(bts, 0, bts.length);
+ assertEquals(500, count);
+ assertEquals(-1, ins.read(new byte[1000], 500, 500));
+
+ cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-2@apache.org";
+ ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
+ bts = new byte[1024];
+ ins = ds.getInputStream();
+ count = ins.read(bts, 0, bts.length);
+ assertEquals(1024, count);
+ assertEquals(225, ins.read(new byte[1000], 500, 500));
+ assertEquals(-1, ins.read(new byte[1000], 500, 500));
+ }
+
+ @Test
+ public void testCXF3582b() throws Exception {
+ String contentType = "multipart/related; type=\"application/xop+xml\"; "
+ + "boundary=\"uuid:906fa67b-85f9-4ef5-8e3d-52416022d463\"; "
+ + "start=\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
+
+
+ Message message = new MessageImpl();
+ message.put(Message.CONTENT_TYPE, contentType);
+ message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3582.data"));
+ message.put(AttachmentDeserializer.ATTACHMENT_DIRECTORY, System
+ .getProperty("java.io.tmpdir"));
+ message.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD, String
+ .valueOf(AttachmentDeserializer.THRESHOLD));
+
+
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
+ Collections.singletonList("multipart/related"));
+
+ ad.initializeAttachments();
+
+ String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
+ DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
+ byte bts[] = new byte[1024];
+ InputStream ins = ds.getInputStream();
+ int count = 0;
+ int x = ins.read(bts, 500, 200);
+ while (x != -1) {
+ count += x;
+ x = ins.read(bts, 500, 200);
+ }
+ assertEquals(500, count);
+ assertEquals(-1, ins.read(new byte[1000], 500, 500));
+
+ cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-2@apache.org";
+ ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
+ bts = new byte[1024];
+ ins = ds.getInputStream();
+ count = 0;
+ x = ins.read(bts, 500, 200);
+ while (x != -1) {
+ count += x;
+ x = ins.read(bts, 500, 200);
+ }
+ assertEquals(1249, count);
+ assertEquals(-1, ins.read(new byte[1000], 500, 500));
+ }
+ @Test
+ public void testCXF3582c() throws Exception {
+ String contentType = "multipart/related; type=\"application/xop+xml\"; "
+ + "boundary=\"uuid:906fa67b-85f9-4ef5-8e3d-52416022d463\"; "
+ + "start=\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
+
+
+ Message message = new MessageImpl();
+ message.put(Message.CONTENT_TYPE, contentType);
+ message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3582.data"));
+ message.put(AttachmentDeserializer.ATTACHMENT_DIRECTORY, System
+ .getProperty("java.io.tmpdir"));
+ message.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD, String
+ .valueOf(AttachmentDeserializer.THRESHOLD));
+
+
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
+ Collections.singletonList("multipart/related"));
+
+ ad.initializeAttachments();
+
+ String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
+ DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
+ byte bts[] = new byte[1024];
+ InputStream ins = ds.getInputStream();
+ int count = 0;
+ int x = ins.read(bts, 100, 600);
+ while (x != -1) {
+ count += x;
+ x = ins.read(bts, 100, 600);
+ }
+ assertEquals(500, count);
+ assertEquals(-1, ins.read(new byte[1000], 100, 600));
+
+ cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-2@apache.org";
+ ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
+ bts = new byte[1024];
+ ins = ds.getInputStream();
+ count = 0;
+ x = ins.read(bts, 100, 600);
+ while (x != -1) {
+ count += x;
+ x = ins.read(bts, 100, 600);
+ }
+ assertEquals(1249, count);
+ assertEquals(-1, ins.read(new byte[1000], 100, 600));
+ }
+}
+
Modified: cxf/tags/cxf-2.3.5/systests/container-integration/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/cxf/tags/cxf-2.3.5/systests/container-integration/jetty6/pom.xml?rev=1134158&r1=1134157&r2=1134158&view=diff
==============================================================================
--- cxf/tags/cxf-2.3.5/systests/container-integration/jetty6/pom.xml (original)
+++ cxf/tags/cxf-2.3.5/systests/container-integration/jetty6/pom.xml Fri Jun 10 00:57:39 2011
@@ -4,13 +4,13 @@
<parent>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-container-integration</artifactId>
- <version>2.3.3-SNAPSHOT</version>
+ <version>2.3.5</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-ci-jetty6</artifactId>
<name>Apache CXF Container Integration Test Jetty6</name>
- <version>2.3.3-SNAPSHOT</version>
+ <version>2.3.5</version>
<build>
<plugins>
<plugin>