cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r448275 - in /incubator/cxf/trunk: common/metacode/ common/metacode/src/main/resources/schemas/configuration/ rt/transports/http/ rt/transports/http/src/main/resources/schemas/configuration/
Date Wed, 20 Sep 2006 17:24:27 GMT
Author: andreasmyth
Date: Wed Sep 20 10:24:27 2006
New Revision: 448275

URL: http://svn.apache.org/viewvc?view=rev&rev=448275
Log:
Moved security.xsd from rt-transports-http back into common-metacode - as it's also used by
the jaxws frontend now.

Added:
    incubator/cxf/trunk/common/metacode/src/main/resources/schemas/configuration/security.xjb
      - copied unchanged from r448258, incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/security.xjb
    incubator/cxf/trunk/common/metacode/src/main/resources/schemas/configuration/security.xsd
      - copied unchanged from r448258, incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/security.xsd
Removed:
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/security.xjb
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/security.xsd
Modified:
    incubator/cxf/trunk/common/metacode/pom.xml
    incubator/cxf/trunk/rt/transports/http/pom.xml
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conduit.xsd
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-destination.xsd
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd

Modified: incubator/cxf/trunk/common/metacode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/pom.xml?view=diff&rev=448275&r1=448274&r2=448275
==============================================================================
--- incubator/cxf/trunk/common/metacode/pom.xml (original)
+++ incubator/cxf/trunk/common/metacode/pom.xml Wed Sep 20 10:24:27 2006
@@ -116,6 +116,10 @@
 				<xsdOption>
 				    <xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
 				</xsdOption>
+				<xsdOption>
+				    <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
+				    <bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
+				</xsdOption>
 			    </xsdOptions>
 			</configuration>
 			<goals>

Modified: incubator/cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/pom.xml?view=diff&rev=448275&r1=448274&r2=448275
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/pom.xml Wed Sep 20 10:24:27 2006
@@ -108,6 +108,7 @@
                                     </extensionArgs>
                                     <deleteDirs>
                                         <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
+                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security</deleteDir>
                                     </deleteDirs>
                                 </xsdOption>
                                 <xsdOption>
@@ -119,6 +120,7 @@
                                     </extensionArgs>
                                     <deleteDirs>
                                         <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
+                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security</deleteDir>
                                     </deleteDirs>
                                 </xsdOption>
                                 <xsdOption>
@@ -130,6 +132,7 @@
                                     </extensionArgs>
                                     <deleteDirs>
                                         <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
+                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security</deleteDir>
                                     </deleteDirs>
                                 </xsdOption>
                             </xsdOptions>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conduit.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conduit.xsd?view=diff&rev=448275&r1=448274&r2=448275
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conduit.xsd
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conduit.xsd
Wed Sep 20 10:24:27 2006
@@ -31,7 +31,7 @@
            jaxb:version="2.0">
 
     <xs:import namespace="http://cxf.apache.org/transports/http/configuration" schemaLocation="../wsdl/http-conf.xsd"/>
-    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="security.xsd"/>
+    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="../../../../../../../../common/metacode/src/main/resources/schemas/configuration/security.xsd"/>
 
     <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
     <xs:element name="authorization" type="sec:AuthorizationPolicy"/>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-destination.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-destination.xsd?view=diff&rev=448275&r1=448274&r2=448275
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-destination.xsd
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-destination.xsd
Wed Sep 20 10:24:27 2006
@@ -31,7 +31,7 @@
            jaxb:version="2.0">
 
     <xs:import namespace="http://cxf.apache.org/transports/http/configuration" schemaLocation="../wsdl/http-conf.xsd"/>
-    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="security.xsd"/>
+    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="../../../../../../../../common/metacode/src/main/resources/schemas/configuration/security.xsd"/>
 
     <xs:element name="server" type="http-conf:HTTPServerPolicy"/>
     <xs:element name="authorization" type="sec:AuthorizationPolicy"/>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd?view=diff&rev=448275&r1=448274&r2=448275
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
Wed Sep 20 10:24:27 2006
@@ -31,7 +31,7 @@
            jaxb:version="2.0">
 
     <xs:import namespace="http://cxf.apache.org/transports/http/configuration" schemaLocation="../wsdl/http-conf.xsd"/>
-    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="security.xsd"/>
+    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="../../../../../../../../common/metacode/src/main/resources/schemas/configuration/security.xsd"/>
 
     <xs:element name="listener" type="http-conf:HTTPListenerPolicy"/>
     <xs:element name="sslServer" type="sec:SSLServerPolicy"/>



Mime
View raw message