Return-Path: 
 <commits-return-14390-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 93687 invoked from network); 1 Apr 2011 21:29:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Apr 2011 21:29:05 -0000
Received: (qmail 85235 invoked by uid 500); 1 Apr 2011 21:29:05 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 85128 invoked by uid 500); 1 Apr 2011 21:29:04 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 85121 invoked by uid 99); 1 Apr 2011 21:29:04 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2011 21:29:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2011 21:29:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E138523889EA; Fri,  1 Apr 2011 21:28:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1087905 - in /cxf/trunk/rt/bindings/coloc: ./
 src/main/java/org/apache/cxf/binding/coloc/blueprint/
 src/main/resources/OSGI-INF/ src/main/resources/OSGI-INF/blueprint/
 src/main/resources/schemas/ src/main/resources/schemas/blueprint/
Date: Fri, 01 Apr 2011 21:28:42 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110401212842.E138523889EA@eris.apache.org>

Author: dkulp
Date: Fri Apr  1 21:28:42 2011
New Revision: 1087905

URL: http://svn.apache.org/viewvc?rev=1087905&view=rev
Log:
[CXF-3434] coloc feature for blueprint
Patch from Johan Edstrom applied.

Added:
    cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/
    cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java   (with props)
    cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/
    cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/
    cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml   (with props)
    cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/
    cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/
    cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd   (with props)
Modified:
    cxf/trunk/rt/bindings/coloc/pom.xml

Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=1087905&r1=1087904&r2=1087905&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Fri Apr  1 21:28:42 2011
@@ -33,6 +33,14 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <scope>provided</scope>

Added: 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=1087905&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java (added)
+++ cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java Fri Apr  1 21:28:42 2011
@@ -0,0 +1,50 @@
+/**
+ * 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.coloc.blueprint;
+
+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.apache.cxf.binding.coloc.feature.ColocFeature;
+import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.Metadata;
+
+public class ColocBPNamespaceHandler implements NamespaceHandler {
+
+    public URL getSchemaLocation(String s) {
+        return getClass().getClassLoader().getResource("/schemas/blueprint/coloc-feature.xsd");
+    }
+
+    public Set<Class> getManagedClasses() {
+        return null;
+    }
+
+    public Metadata parse(Element element, ParserContext context) {
+        return new SimpleBPBeanDefinitionParser(ColocFeature.class).parse(element, context);
+    }
+
+    public ComponentMetadata decorate(Node node, ComponentMetadata componentMetadata, ParserContext context) {
+        return null;
+    }
+}

Propchange: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=1087905&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml (added)
+++ cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml Fri Apr  1 21:28:42 2011
@@ -0,0 +1,32 @@
+<!--
+  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.
+  -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           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">
+
+  <service interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/binding/coloc"/>
+    </service-properties>
+    <bean class="org.apache.cxf.binding.coloc.blueprint.ColocBPNamespaceHandler"/>
+  </service>
+</blueprint>
+

Propchange: cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/blueprint/coloc-feature.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

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

Added: 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/blueprint/coloc-feature.xsd?rev=1087905&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd (added)
+++ cxf/trunk/rt/bindings/coloc/src/main/resources/schemas/blueprint/coloc-feature.xsd Fri Apr  1 21:28:42 2011
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  -->
+
+<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"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+  <xs:element name="enableColoc">
+    <xs:complexType>
+      <xs:sequence/>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
\ No newline at end of file

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

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

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