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/01 14:44:55 UTC
svn commit: r1498415 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/internal/
api/src/test/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/...
Author: ay
Date: Mon Jul 1 12:44:54 2013
New Revision: 1498415
URL: http://svn.apache.org/r1498415
Log:
[CXF-5102] schema resource loading in various blueprint namespace handlers not working in some environment
Added:
cxf/trunk/api/src/test/java/org/apache/cxf/internal/
cxf/trunk/api/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/blueprint/
cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandlerTest.java
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/blueprint/
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandlerTest.java
cxf/trunk/rt/features/clustering/src/test/
cxf/trunk/rt/features/clustering/src/test/java/
cxf/trunk/rt/features/clustering/src/test/java/org/
cxf/trunk/rt/features/clustering/src/test/java/org/apache/
cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/
cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/
cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/
cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd (with props)
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java (with props)
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java Mon Jul 1 12:44:54 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;
}
Added: cxf/trunk/api/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java (added)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,39 @@
+/**
+ * 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.cxf.internal;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class CXFAPINamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ CXFAPINamespaceHandler handler = new CXFAPINamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/configuration/beans"));
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/configuration/parameterized-types"));
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/configuration/security"));
+ assertNotNull(handler.getSchemaLocation("http://schemas.xmlsoap.org/wsdl/"));
+ }
+
+}
Modified: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java Mon Jul 1 12:44:54 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/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java (original)
+++ cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java Mon Jul 1 12:44:54 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")
Added: cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandlerTest.java (added)
+++ cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.binding.object.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class ObjectBindingBPHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ ObjectBindingBPHandler handler = new ObjectBindingBPHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/binding/object"));
+ }
+
+}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java Mon Jul 1 12:44:54 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")
Added: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java (added)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,35 @@
+/**
+ * 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.cxf.binding.soap.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class SoapBindingBPHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ SoapBindingBPHandler handler = new SoapBindingBPHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/bindings/soap"));
+ }
+}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java Mon Jul 1 12:44:54 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;
}
Added: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,35 @@
+/**
+ * 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.cxf.bus.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class CXFCoreNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ CXFCoreNamespaceHandler handler = new CXFCoreNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/core"));
+ }
+}
Modified: cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java Mon Jul 1 12:44:54 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");
}
}
Added: cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.clustering.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class ClusteringBPNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ ClusteringBPNamespaceHandler handler = new ClusteringBPNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/clustering"));
+ }
+
+}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java Mon Jul 1 12:44:54 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");
}
Added: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.jaxrs.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JAXRSBPNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ JAXRSBPNamespaceHandler handler = new JAXRSBPNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/jaxrs"));
+ }
+
+}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java Mon Jul 1 12:44:54 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");
}
Added: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.jaxws.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JAXWSBPNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ JAXWSBPNamespaceHandler handler = new JAXWSBPNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/jaxws"));
+ }
+
+}
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java Mon Jul 1 12:44:54 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");
}
Added: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.frontend.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class SimpleBPNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ SimpleBPNamespaceHandler handler = new SimpleBPNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/simple"));
+ }
+
+}
Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java Mon Jul 1 12:44:54 2013
@@ -41,7 +41,7 @@ public class JAXRSBPNamespaceHandler imp
}
public URL getSchemaLocation(String namespace) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/jaxrs-client.xsd");
+ return getClass().getClassLoader().getResource("schemas/blueprint/jaxrs-client.xsd");
}
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.jaxrs.client.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JAXRSBPNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ JAXRSBPNamespaceHandler handler = new JAXRSBPNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/jaxrs-client"));
+ }
+
+}
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java Mon Jul 1 12:44:54 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;
}
Added: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java (added)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.transport.http_jetty.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class HTTPJettyTransportNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ HTTPJettyTransportNamespaceHandler handler = new HTTPJettyTransportNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/transports/http-jetty/configuration"));
+ }
+
+}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java Mon Jul 1 12:44:54 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;
}
Added: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java (added)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/blueprint/HttpBPHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.transport.http.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class HttpBPHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ HttpBPHandler handler = new HttpBPHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/transports/http/configuration"));
+ }
+
+}
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java Mon Jul 1 12:44:54 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")
Added: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java (added)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.cxf.ws.addressing.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class WsBPHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ WsBPHandler handler = new WsBPHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/ws/addressing"));
+ }
+
+}
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java Mon Jul 1 12:44:54 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;
Added: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java (added)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,40 @@
+/**
+ * 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.cxf.ws.policy.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class PolicyBPHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ PolicyBPHandler handler = new PolicyBPHandler();
+
+ //REVIST is this first one correct? the referenced schema has namespace http://cxf.apache.org/blueprint/policy
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/policy"));
+ assertNotNull(handler.getSchemaLocation("http://www.w3.org/ns/ws-policy"));
+ assertNotNull(handler.getSchemaLocation("http://www.w3.org/2006/07/ws-policy"));
+ assertNotNull(handler.getSchemaLocation("http://schemas.xmlsoap.org/ws/2004/09/policy"));
+ }
+
+}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java?rev=1498415&r1=1498414&r2=1498415&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java Mon Jul 1 12:44:54 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;
}
Added: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd (added)
+++ cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd Mon Jul 1 12:44:54 2013
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 1993-2007. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<xs:schema xmlns:tns="http://docs.oasis-open.org/ws-rx/wsrmp/200702" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://docs.oasis-open.org/ws-rx/wsrmp/200702" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="RMAssertion">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="SequenceSTR">
+ <xs:complexType>
+ <xs:sequence/>
+ <xs:anyAttribute namespace="##any" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="SequenceTransportSecurity">
+ <xs:complexType>
+ <xs:sequence/>
+ <xs:anyAttribute namespace="##any" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DeliveryAssurance">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ExactlyOnce">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AtLeastOnce">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AtMostOnce">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="InOrder">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java?rev=1498415&view=auto
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java (added)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java Mon Jul 1 12:44:54 2013
@@ -0,0 +1,38 @@
+/**
+ * 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.cxf.ws.rm.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class RMBPHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ RMBPHandler handler = new RMBPHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/ws/rm/manager"));
+ assertNotNull(handler.getSchemaLocation("http://schemas.xmlsoap.org/ws/2005/02/rm/policy"));
+ assertNotNull(handler.getSchemaLocation("http://docs.oasis-open.org/ws-rx/wsrmp/200702"));
+ }
+
+}
Propchange: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/blueprint/RMBPHandlerTest.java
------------------------------------------------------------------------------
svn:executable = *