Return-Path: 
 <commits-return-18349-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E3537926F
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu, 23 Feb 2012 16:39:32 +0000 (UTC)
Received: (qmail 49767 invoked by uid 500); 23 Feb 2012 16:39:32 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 49718 invoked by uid 500); 23 Feb 2012 16:39:32 -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 49710 invoked by uid 99); 23 Feb 2012 16:39:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2012 16:39:32 +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; Thu, 23 Feb 2012 16:39:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B118323889E2;
	Thu, 23 Feb 2012 16:39:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1292849 - in /cxf/branches/2.5.x-fixes: ./ api/
 api/src/main/java/org/apache/cxf/security/blueprint/
 api/src/main/resources/OSGI-INF/ rt/transports/http/
 rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/
 rt/transpor...
Date: Thu, 23 Feb 2012 16:39:11 -0000
To: commits@cxf.apache.org
From: ay@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120223163911.B118323889E2@eris.apache.org>

Author: ay
Date: Thu Feb 23 16:39:10 2012
New Revision: 1292849

URL: http://svn.apache.org/viewvc?rev=1292849&view=rev
Log:
Merged revisions 1292839 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1292839 | ay | 2012-02-23 17:14:59 +0100 (Thu, 23 Feb 2012) | 1 line
  
  [CXF-4084] Blueprint http (part 1 HTTPConduit)
........

Added:
    cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/security/blueprint/
      - copied from r1292839, cxf/trunk/api/src/main/java/org/apache/cxf/security/blueprint/
    cxf/branches/2.5.x-fixes/api/src/main/resources/OSGI-INF/
      - copied from r1292839, cxf/trunk/api/src/main/resources/OSGI-INF/
    cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/
      - copied from r1292839, cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/
    cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/OSGI-INF/blueprint/cxf-http.xml
      - copied unchanged from r1292839, cxf/trunk/rt/transports/http/src/main/resources/OSGI-INF/blueprint/cxf-http.xml
Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/api/pom.xml
    cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml
    cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 16:39:10 2012
@@ -1 +1 @@
-/cxf/trunk:1291943,1292763,1292792
+/cxf/trunk:1291943,1292763,1292792,1292839

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/pom.xml?rev=1292849&r1=1292848&r2=1292849&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/api/pom.xml Thu Feb 23 16:39:10 2012
@@ -84,6 +84,14 @@
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
+        <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>
     </dependencies>
 
     <build>

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml?rev=1292849&r1=1292848&r2=1292849&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/pom.xml Thu Feb 23 16:39:10 2012
@@ -68,6 +68,10 @@
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=1292849&r1=1292848&r2=1292849&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd Thu Feb 23 16:39:10 2012
@@ -25,23 +25,24 @@
            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
            xmlns:sec="http://cxf.apache.org/configuration/security"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:beans="http://www.springframework.org/schema/beans" 
            xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
            elementFormDefault="qualified" 
            attributeFormDefault="unqualified"
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
            jaxb:version="2.0">
 
-    <xs:include schemaLocation="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"/> 
+    <xs:include schemaLocation="../wsdl/http-conf.xsd"/> 
     <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" 
                schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
     <xs:import namespace="http://cxf.apache.org/configuration/security" 
                schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
-    <xs:import namespace="http://www.springframework.org/schema/beans" 
-               schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
     <xs:import namespace="http://cxf.apache.org/configuration/beans" 
                schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
+    <xs:complexType name="identifiedType" abstract="true">
+      <xs:attribute name="id" type="xs:ID"/>
+    </xs:complexType>
+
     <!-- Conduit Specific Items -->
 
     <xs:element name="authorization"       type="sec:AuthorizationPolicy"/>
@@ -53,7 +54,7 @@
     <xs:element name="conduit">
       <xs:complexType>
         <xs:complexContent>
-          <xs:extension base="beans:identifiedType">
+          <xs:extension base="http-conf:identifiedType">
             <xs:all>
                 <xs:element ref="http-conf:client" minOccurs="0">
                    <xs:annotation>
@@ -127,7 +128,7 @@
     <xs:element name="destination">
       <xs:complexType>
         <xs:complexContent>
-          <xs:extension base="beans:identifiedType">
+          <xs:extension base="http-conf:identifiedType">
             <xs:all>
 	            <xs:element ref="http-conf:server" minOccurs="0">
 	               <xs:annotation>