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 2010/02/12 20:26:07 UTC
svn commit: r909568 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Author: dkulp
Date: Fri Feb 12 19:26:05 2010
New Revision: 909568
URL: http://svn.apache.org/viewvc?rev=909568&view=rev
Log:
Merged revisions 909502 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r909502 | dkulp | 2010-02-12 12:15:13 -0500 (Fri, 12 Feb 2010) | 1 line
[CXF-2669] Change default cid to make it more interopable
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 19:26:05 2010
@@ -1 +1 @@
-/cxf/trunk:908451,909102,909396,909411,909486,909506-909557
+/cxf/trunk:908451,909102,909396,909411,909486,909502,909506-909557
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java?rev=909568&r1=909567&r2=909568&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java Fri Feb 12 19:26:05 2010
@@ -62,7 +62,7 @@
*/
public static String createContentID(String ns) throws UnsupportedEncodingException {
// tend to change
- String cid = "http://cxf.apache.org/";
+ String cid = "cxf.apache.org";
String name = ATT_UUID + "-" + String.valueOf(++counter);
if (ns != null && (ns.length() > 0)) {