You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/24 19:48:54 UTC

[2/2] git commit: [CXF-6061] Allow parameterized booleans for the public/start attributes

[CXF-6061] Allow parameterized booleans for the public/start attributes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/702a29a6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/702a29a6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/702a29a6

Branch: refs/heads/3.0.x-fixes
Commit: 702a29a6969fffc96e1992dafb3c109bfba555e1
Parents: d00cfb2
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Oct 24 13:19:19 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Oct 24 13:48:39 2014 -0400

----------------------------------------------------------------------
 .../jaxws/src/main/resources/schemas/blueprint/jaxws.xsd  |  8 ++++++--
 rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd    | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/702a29a6/rt/frontend/jaxws/src/main/resources/schemas/blueprint/jaxws.xsd
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/resources/schemas/blueprint/jaxws.xsd b/rt/frontend/jaxws/src/main/resources/schemas/blueprint/jaxws.xsd
index f27ac4e..2c233ee 100644
--- a/rt/frontend/jaxws/src/main/resources/schemas/blueprint/jaxws.xsd
+++ b/rt/frontend/jaxws/src/main/resources/schemas/blueprint/jaxws.xsd
@@ -22,12 +22,16 @@
   xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0"
   xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:pt="http://cxf.apache.org/configuration/parameterized-types" 
+
   targetNamespace="http://cxf.apache.org/blueprint/jaxws" 
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"  >
 
   <xsd:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0" schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
   <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+  <xsd:import namespace="http://cxf.apache.org/configuration/parameterized-types"
+             schemaLocation="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"/>
 
   <xsd:element name="endpoint">
     <xsd:annotation>
@@ -135,7 +139,7 @@
                 with the ref bean which is wrapped by using Spring AOP.</xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="publish" type="xsd:boolean" default="true">
+          <xsd:attribute name="publish" type="pt:ParameterizedBoolean" default="true">
             <xsd:annotation>
               <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation>
             </xsd:annotation>
@@ -274,7 +278,7 @@
                 classpath.</xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="start" type="xsd:boolean" default="true">
+          <xsd:attribute name="start" type="pt:ParameterizedBoolean" default="true">
             <xsd:annotation>
               <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation>
             </xsd:annotation>

http://git-wip-us.apache.org/repos/asf/cxf/blob/702a29a6/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd b/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
index 08a59cd..17ef16c 100644
--- a/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
+++ b/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
@@ -21,13 +21,17 @@
   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   xmlns:beans="http://www.springframework.org/schema/beans"
   xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:pt="http://cxf.apache.org/configuration/parameterized-types" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   targetNamespace="http://cxf.apache.org/jaxws" 
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"  >
 
   <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
   <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+  <xsd:import namespace="http://cxf.apache.org/configuration/parameterized-types"
+             schemaLocation="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"/>
+
 
   <xsd:element name="endpoint">
     <xsd:annotation>
@@ -135,7 +139,7 @@
                 with the ref bean which is wrapped by using Spring AOP.</xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="publish" type="xsd:boolean" default="true">
+          <xsd:attribute name="publish" type="pt:ParameterizedBoolean" default="true">
             <xsd:annotation>
               <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation>
             </xsd:annotation>
@@ -274,7 +278,7 @@
                 classpath.</xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="start" type="xsd:boolean" default="true">
+          <xsd:attribute name="start" type="pt:ParameterizedBoolean" default="true">
             <xsd:annotation>
               <xsd:documentation>Specifies if the service should be automatically published.</xsd:documentation>
             </xsd:annotation>