cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1087939 - in /cxf/trunk/rt/bindings/coloc/src/main: java/org/apache/cxf/binding/coloc/blueprint/ resources/META-INF/ resources/OSGI-INF/blueprint/ resources/schemas/ resources/schemas/blueprint/
Date Sat, 02 Apr 2011 00:09:32 GMT
Author: dkulp
Date: Sat Apr  2 00:09:32 2011
New Revision: 1087939

URL: http://svn.apache.org/viewvc?rev=1087939&view=rev
Log:
[CXF-3434] Spring and blueprint can use the same schema for coloc as it
doesn't need to reference the bean namespace

Added:
    cxf/trunk/rt/bindings/coloc/src/main/resources/META-INF/spring.schemas
    cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd   (contents,
props changed)
      - copied, changed from r1087907, cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd
Removed:
    cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd
Modified:
    cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
    cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml

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=1087939&r1=1087938&r2=1087939&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
Sat Apr  2 00:09:32 2011
@@ -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/blueprint/coloc-feature.xsd");
+        return getClass().getClassLoader().getResource("/schemas/coloc-feature.xsd");
     }
 
     public Set<Class> getManagedClasses() {

Added: cxf/trunk/rt/bindings/coloc/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/resources/META-INF/spring.schemas?rev=1087939&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/resources/META-INF/spring.schemas (added)
+++ cxf/trunk/rt/bindings/coloc/src/main/resources/META-INF/spring.schemas Sat Apr  2 00:09:32
2011
@@ -0,0 +1,21 @@
+#
+#
+#    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.
+#
+#
+http\://cxf.apache.org/schemas/coloc-feature.xsd=schemas/coloc-feature.xsd
\ No newline at end of file

Modified: cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml?rev=1087939&r1=1087938&r2=1087939&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml Sat
Apr  2 00:09:32 2011
@@ -24,7 +24,7 @@
 
   <service interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
-      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/binding/coloc"/>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/binding/coloc"/>
     </service-properties>
     <bean class="org.apache.cxf.binding.coloc.blueprint.ColocBPNamespaceHandler"/>
   </service>

Copied: cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd (from r1087907,
cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd?p2=cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd&p1=cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd&r1=1087907&r2=1087939&rev=1087939&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd Sat Apr  2 00:09:32
2011
@@ -18,9 +18,9 @@
   under the License.
   -->
 
-<xs:schema xmlns="http://cxf.apache.org/blueprint/binding/coloc"
-           targetNamespace="http://cxf.apache.org/blueprint/binding/coloc"
-           xmlns:tns="http://cxf.apache.org/blueprint/binding/coloc"
+<xs:schema xmlns="http://cxf.apache.org/binding/coloc"
+           targetNamespace="http://cxf.apache.org/binding/coloc"
+           xmlns:tns="http://cxf.apache.org/binding/coloc"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">

Propchange: cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/coloc-feature.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message