cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1342620 - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/internal/ api/src/main/resources/OSGI-INF/ api/src/main/resources/OSGI-INF/blueprint/ rt/core/src/main/java/org/apache/cxf/bus/blueprint/ rt/core/src/main/resources/OSGI-INF/bl...
Date Fri, 25 May 2012 13:37:36 GMT
Author: dkulp
Date: Fri May 25 13:37:36 2012
New Revision: 1342620

URL: http://svn.apache.org/viewvc?rev=1342620&view=rev
Log:
Try to get the offline stuff working by having separate namespace
handler in API for schemas found there

Added:
    cxf/trunk/api/src/main/java/org/apache/cxf/internal/
    cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java   (with
props)
    cxf/trunk/api/src/main/resources/OSGI-INF/
    cxf/trunk/api/src/main/resources/OSGI-INF/blueprint/
    cxf/trunk/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml
      - copied, changed from r1342584, cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
    cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1342620&r1=1342619&r2=1342620&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Fri May 25 13:37:36 2012
@@ -34,6 +34,10 @@
     </parent>
 
     <properties>
+        <cxf.osgi.export>
+            !org.apache.cxf.internal,
+            org.apache.cxf.*,
+        </cxf.osgi.export>
         <cxf.osgi.import>
             com.sun*;resolution:=optional,
             org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}",
@@ -49,6 +53,7 @@
             com.sun.xml.bind.api.impl;resolution:=optional,
             com.sun.xml.internal.bind.api;resolution:=optional,
             com.sun.xml.internal.bind.api.impl;resolution:=optional,
+            org.apache.aries*;version="${cxf.aries.version.range}"
         </cxf.osgi.import>
         <cxf.osgi.dynamic.import>
             org.apache.cxf.bus,org.apache.cxf.*
@@ -125,7 +130,12 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.ws.xmlschema</groupId>
             <artifactId>xmlschema-core</artifactId>

Added: 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=1342620&view=auto
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java (added)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java Fri May
25 13:37:36 2012
@@ -0,0 +1,63 @@
+/**
+ * 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 java.net.URL;
+import java.util.Set;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import org.apache.aries.blueprint.NamespaceHandler;
+import org.apache.aries.blueprint.ParserContext;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.Metadata;
+
+/**
+ * 
+ */
+public class CXFAPINamespaceHandler implements NamespaceHandler {    
+    
+    public URL getSchemaLocation(String namespace) {
+        if ("http://cxf.apache.org/configuration/beans".equals(namespace)) {
+            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");
+        } else if ("http://cxf.apache.org/configuration/security".equals(namespace)) {
+            return getClass().getClassLoader().getResource("/schemas/configuration/security.xsd");
+        }
+        return null;
+    }
+
+
+    public Metadata parse(Element element, ParserContext context) {
+        return null;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public Set<Class> getManagedClasses() {
+        //probably should have the various stuff in cxf-api in here?
+        return null;
+    }
+    public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext
context) {
+        return null;
+    }
+    
+}

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml (from r1342584, cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml?p2=cxf/trunk/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml&p1=cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml&r1=1342584&r2=1342620&rev=1342620&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml (original)
+++ cxf/trunk/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml Fri May 25 13:37:36 2012
@@ -22,24 +22,19 @@
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-  <bean id="CXFCoreNamespaceHandler" class="org.apache.cxf.bus.blueprint.CXFCoreNamespaceHandler"/>
+  <bean id="CXFAPINamespaceHandler" class="org.apache.cxf.internal.CXFAPINamespaceHandler"/>
 
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
-    <service-properties>
-      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/core"/>
-    </service-properties>
-  </service>
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+  <service ref="CXFAPINamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
       <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/beans"/>
     </service-properties>
   </service>
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+  <service ref="CXFAPINamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
       <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/parameterized-types"/>
     </service-properties>
   </service>
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+  <service ref="CXFAPINamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
       <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/security"/>
     </service-properties>

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=1342620&r1=1342619&r2=1342620&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
Fri May 25 13:37:36 2012
@@ -43,12 +43,6 @@ 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");
-        } else if ("http://cxf.apache.org/configuration/beans".equals(namespace)) {
-            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");
-        } else if ("http://cxf.apache.org/configuration/security".equals(namespace)) {
-            return getClass().getClassLoader().getResource("/schemas/configuration/security.xsd");
         }
         return null;
     }

Modified: cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml?rev=1342620&r1=1342619&r2=1342620&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml (original)
+++ cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml Fri May 25 13:37:36
2012
@@ -29,19 +29,4 @@
       <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/core"/>
     </service-properties>
   </service>
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
-    <service-properties>
-      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/beans"/>
-    </service-properties>
-  </service>
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
-    <service-properties>
-      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/parameterized-types"/>
-    </service-properties>
-  </service>
-  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
-    <service-properties>
-      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/security"/>
-    </service-properties>
-  </service>
 </blueprint>
\ No newline at end of file



Mime
View raw message