You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2013/07/02 17:52:45 UTC
svn commit: r1498991 - in /cxf/branches/2.7.x-fixes: ./
api/src/main/java/org/apache/cxf/internal/
rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/
rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/
rt/bind...
Author: ay
Date: Tue Jul 2 15:52:45 2013
New Revision: 1498991
URL: http://svn.apache.org/r1498991
Log:
Merged revisions 1498988 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1498988 | ay | 2013-07-02 17:44:55 +0200 (Tue, 02 Jul 2013) | 1 line
clean up and add another test for CXF-5095
........
Added:
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
- copied unchanged from r1498988, cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java
cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
Propchange: cxf/branches/2.7.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -37,13 +37,13 @@ public class CXFAPINamespaceHandler impl
public URL getSchemaLocation(String namespace) {
if ("http://cxf.apache.org/configuration/beans".equals(namespace)) {
- return getClass().getClassLoader().getResource("/schemas/configuration/cxf-beans.xsd");
+ return getClass().getClassLoader().getResource("schemas/configuration/cxf-beans.xsd");
} else if ("http://cxf.apache.org/configuration/parameterized-types".equals(namespace)) {
- return getClass().getClassLoader().getResource("/schemas/configuration/parameterized-types.xsd");
+ return getClass().getClassLoader().getResource("schemas/configuration/parameterized-types.xsd");
} else if ("http://cxf.apache.org/configuration/security".equals(namespace)) {
- return getClass().getClassLoader().getResource("/schemas/configuration/security.xsd");
+ return getClass().getClassLoader().getResource("schemas/configuration/security.xsd");
} else if ("http://schemas.xmlsoap.org/wsdl/".equals(namespace)) {
- return getClass().getClassLoader().getResource("/schemas/wsdl/wsdl.xsd");
+ return getClass().getClassLoader().getResource("schemas/wsdl/wsdl.xsd");
}
return null;
}
Modified: cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -33,7 +33,7 @@ import org.osgi.service.blueprint.reflec
public class ColocBPNamespaceHandler implements NamespaceHandler {
public URL getSchemaLocation(String s) {
- return getClass().getClassLoader().getResource("/schemas/coloc-feature.xsd");
+ return getClass().getClassLoader().getResource("schemas/coloc-feature.xsd");
}
@SuppressWarnings("rawtypes")
Modified: cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java Tue Jul 2 15:52:45 2013
@@ -33,7 +33,7 @@ import org.osgi.service.blueprint.reflec
public class ObjectBindingBPHandler implements NamespaceHandler {
public URL getSchemaLocation(String s) {
- return getClass().getClassLoader().getResource("/schemas/bindings/blueprint/object.xsd");
+ return getClass().getClassLoader().getResource("schemas/bindings/blueprint/object.xsd");
}
@SuppressWarnings("rawtypes")
Modified: cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java Tue Jul 2 15:52:45 2013
@@ -32,7 +32,7 @@ import org.osgi.service.blueprint.reflec
public class SoapBindingBPHandler implements NamespaceHandler {
public URL getSchemaLocation(String s) {
- return getClass().getClassLoader().getResource("/schemas/configuration/blueprint/soap.xsd");
+ return getClass().getClassLoader().getResource("schemas/configuration/blueprint/soap.xsd");
}
@SuppressWarnings("rawtypes")
Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -42,7 +42,7 @@ public class CXFCoreNamespaceHandler imp
public URL getSchemaLocation(String namespace) {
if ("http://cxf.apache.org/blueprint/core".equals(namespace)) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/core.xsd");
+ return getClass().getClassLoader().getResource("schemas/blueprint/core.xsd");
}
return null;
}
Modified: cxf/branches/2.7.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -53,7 +53,7 @@ public class ClusteringBPNamespaceHandle
}
public URL getSchemaLocation(String namespace) {
- return getClass().getClassLoader().getResource("/schemas/clustering.xsd");
+ return getClass().getClassLoader().getResource("schemas/clustering.xsd");
}
}
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -41,7 +41,7 @@ public class JAXRSBPNamespaceHandler imp
}
public URL getSchemaLocation(String namespace) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/jaxrs.xsd");
+ return getClass().getClassLoader().getResource("schemas/blueprint/jaxrs.xsd");
}
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -45,7 +45,7 @@ public class JAXWSBPNamespaceHandler imp
}
public URL getSchemaLocation(String namespace) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/jaxws.xsd");
+ return getClass().getClassLoader().getResource("schemas/blueprint/jaxws.xsd");
}
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java Tue Jul 2 15:52:45 2013
@@ -19,7 +19,7 @@
package org.apache.cxf.jaxws.context;
-import java.util.Arrays;
+import java.lang.reflect.Array;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -65,7 +65,13 @@ class WrappedAttachments implements Set<
}
public Object[] toArray() {
- Object[] obj = new Object[attachments.size()];
+ return toArray(new Object[attachments.size()]);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T[] toArray(T[] a) {
+ T[] copy = a.length == attachments.size()
+ ? a : (T[])Array.newInstance(a.getClass(), attachments.size());
int i = 0;
for (Map.Entry<String, DataHandler> entry : attachments.entrySet()) {
Attachment o = cache.get(entry.getKey());
@@ -73,15 +79,9 @@ class WrappedAttachments implements Set<
o = new AttachmentImpl(entry.getKey(), entry.getValue());
cache.put(entry.getKey(), o);
}
- obj[i++] = o;
+ copy[i++] = (T)o;
}
- return obj;
- }
-
- @SuppressWarnings("unchecked")
- public <T> T[] toArray(T[] a) {
- Object[] obj = toArray();
- return (T[])Arrays.copyOf(obj, obj.length, a.getClass());
+ return copy;
}
public boolean add(Attachment e) {
Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -41,7 +41,7 @@ public class SimpleBPNamespaceHandler im
}
public URL getSchemaLocation(String namespace) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/simple.xsd");
+ return getClass().getClassLoader().getResource("schemas/blueprint/simple.xsd");
}
Modified: cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java Tue Jul 2 15:52:45 2013
@@ -44,7 +44,7 @@ public class HTTPJettyTransportNamespace
public URL getSchemaLocation(String s) {
if (JETTY_TRANSPORT.equals(s)) {
return getClass().getClassLoader().
- getResource("/schemas/configuration/http-jetty.xsd");
+ getResource("schemas/configuration/http-jetty.xsd");
} else {
return null;
}
Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java Tue Jul 2 15:52:45 2013
@@ -45,7 +45,7 @@ public class HttpBPHandler implements Na
public URL getSchemaLocation(String s) {
if ("http://cxf.apache.org/transports/http/configuration".equals(s)) {
return getClass().getClassLoader().
- getResource("/schemas/configuration/http-conf.xsd");
+ getResource("schemas/configuration/http-conf.xsd");
}
return null;
}
Modified: cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java Tue Jul 2 15:52:45 2013
@@ -33,7 +33,7 @@ import org.osgi.service.blueprint.reflec
public class WsBPHandler implements NamespaceHandler {
public URL getSchemaLocation(String s) {
- return getClass().getClassLoader().getResource("/schemas/ws-addr-conf.xsd");
+ return getClass().getClassLoader().getResource("schemas/ws-addr-conf.xsd");
}
@SuppressWarnings("rawtypes")
Modified: cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java Tue Jul 2 15:52:45 2013
@@ -35,13 +35,13 @@ public class PolicyBPHandler implements
//Say yes to various schemas.
if ("http://cxf.apache.org/policy".equals(s)) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/policy.xsd");
+ return getClass().getClassLoader().getResource("schemas/blueprint/policy.xsd");
} else if ("http://www.w3.org/ns/ws-policy".equals(s)) {
- return getClass().getClassLoader().getResource("/schemas/ws-policy-200702.xsd");
+ return getClass().getClassLoader().getResource("schemas/ws-policy-200702.xsd");
} else if ("http://www.w3.org/2006/07/ws-policy".equals(s)) {
- return getClass().getClassLoader().getResource("/schemas/ws-policy-200607.xsd");
+ return getClass().getClassLoader().getResource("schemas/ws-policy-200607.xsd");
} else if ("http://schemas.xmlsoap.org/ws/2004/09/policy".equals(s)) {
- return getClass().getClassLoader().getResource("/schemas/ws-policy-200409.xsd");
+ return getClass().getClassLoader().getResource("schemas/ws-policy-200409.xsd");
}
return null;
Modified: cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java?rev=1498991&r1=1498990&r2=1498991&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java Tue Jul 2 15:52:45 2013
@@ -35,13 +35,13 @@ public class RMBPHandler implements Name
public URL getSchemaLocation(String s) {
if ("http://cxf.apache.org/ws/rm/manager".equals(s)) {
return getClass().getClassLoader().
- getResource("/schemas/configuration/wsrm-manager.xsd");
+ getResource("schemas/configuration/wsrm-manager.xsd");
} else if ("http://schemas.xmlsoap.org/ws/2005/02/rm/policy".equals(s)) {
return getClass().getClassLoader().
- getResource("/schemas/configuration/wsrm-policy.xsd");
+ getResource("schemas/configuration/wsrm-policy.xsd");
} else if ("http://docs.oasis-open.org/ws-rx/wsrmp/200702".equals(s)) {
return getClass().getClassLoader().
- getResource("/schemas/configuration/wsrmp-1.1-schema-200702.xsd");
+ getResource("schemas/configuration/wsrmp-1.1-schema-200702.xsd");
}
return null;
}
Re: svn commit: r1498991 - in /cxf/branches/2.7.x-fixes: ./
api/src/main/java/org/apache/cxf/internal/ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/
rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ rt/bind...
Posted by Aki Yoshida <ay...@apache.org>.
it happened to me again. forgot to make sure my local 2.7.x svn is clean
before using domerge.
some other stuff went in with an unrelated merge.
i'll clean them up.
2013/7/2 <ay...@apache.org>
> Author: ay
> Date: Tue Jul 2 15:52:45 2013
> New Revision: 1498991
>
> URL: http://svn.apache.org/r1498991
> Log:
> Merged revisions 1498988 via svn merge from
> https://svn.apache.org/repos/asf/cxf/trunk
>
> ........
> r1498988 | ay | 2013-07-02 17:44:55 +0200 (Tue, 02 Jul 2013) | 1 line
>
> clean up and add another test for CXF-5095
> ........
>
> Added:
>
> cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
> - copied unchanged from r1498988,
> cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
> Modified:
> cxf/branches/2.7.x-fixes/ (props changed)
>
> cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
>
> cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
>
> cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/
>
> cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
> ...