cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r441951 - in /incubator/cxf/trunk: api/ api/src/main/resources/config-metadata/ api/src/main/resources/schemas/configuration/ api/src/main/resources/schemas/wsdl/ codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ common/src/test/jav...
Date Sun, 10 Sep 2006 13:29:22 GMT
Author: andreasmyth
Date: Sun Sep 10 06:29:20 2006
New Revision: 441951

URL: http://svn.apache.org/viewvc?view=rev&rev=441951
Log:
* Removed "bus" from target namespace in security.xsd.
* Removed global element definitions from security.xsd, http-conf.xsd.
* Removed globalBindings element from security.xsd - used external binding file instead.
* Added properties extension (boolean), catalog (String), extensionArgs (list) to XsdOption.
* Added apache "header" to some pom, cfg and schema files where it was missing.

Added:
    incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xjb
Modified:
    incubator/cxf/trunk/api/pom.xml
    incubator/cxf/trunk/api/src/main/resources/config-metadata/http-client-config.xml
    incubator/cxf/trunk/api/src/main/resources/config-metadata/http-listener-config.xml
    incubator/cxf/trunk/api/src/main/resources/config-metadata/http-server-config.xml
    incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xsd
    incubator/cxf/trunk/api/src/main/resources/schemas/wsdl/http-conf.xsd
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
    incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
    incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-jaxb-property-types.xml
    incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-property-editors.xml
    incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf.xml
    incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
    incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
    incubator/cxf/trunk/common/src/test/resources/schemas/configuration/foo.xsd
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduitConfiguration.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPListenerConfiguration.java
    incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml
    incubator/cxf/trunk/tools/xjc/cfg-test/src/test/resources/schemas/configuration/foo.xsd
    incubator/cxf/trunk/tools/xjc/cfg/pom.xml
    incubator/cxf/trunk/tools/xjc/cfg/src/main/java/org/apache/cxf/xjc/cfg/ConfigurableBeansPlugin.java
    incubator/cxf/trunk/tools/xjc/dv-test/pom.xml
    incubator/cxf/trunk/tools/xjc/dv-test/src/test/resources/schemas/configuration/foo.xsd
    incubator/cxf/trunk/tools/xjc/dv/pom.xml
    incubator/cxf/trunk/tools/xjc/pom.xml

Modified: incubator/cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Sun Sep 10 06:29:20 2006
@@ -111,6 +111,7 @@
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
+                                    <bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile>
                                 </xsdOption>
                                 <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>

Modified: incubator/cxf/trunk/api/src/main/resources/config-metadata/http-client-config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/config-metadata/http-client-config.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/config-metadata/http-client-config.xml (original)
+++ incubator/cxf/trunk/api/src/main/resources/config-metadata/http-client-config.xml Sun
Sep 10 06:29:20 2006
@@ -20,14 +20,14 @@
 <cm:config
     xmlns:cm="http://cxf.apache.org/configuration/metadata"
     xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
-    xmlns:sec="http://cxf.apache.org/bus/configuration/security"
+    xmlns:sec="http://cxf.apache.org/configuration/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     namespace="http://cxf.apache.org/configuration/transport/http-client"
 >
 
     <cm:configImport namespace="http://cxf.apache.org/transports/http/configuration" location="schemas/wsdl/http-conf.xsd"/>
-    <cm:configImport namespace="http://cxf.apache.org/bus/configuration/security" location="schemas/configuration/security.xsd"/>
+    <cm:configImport namespace="http://cxf.apache.org/configuration/security" location="schemas/configuration/security.xsd"/>
 
     <cm:configItem>
         <cm:name>httpClient</cm:name>
@@ -37,7 +37,6 @@
         </cm:description>
         <cm:lifecyclePolicy>bus</cm:lifecyclePolicy>
         <!-- attribute values are defaulted -->
-        <http-conf:client></http-conf:client>
     </cm:configItem>
 
     <cm:configItem>
@@ -60,6 +59,5 @@
         <cm:description>Policies for controlling SSL encryption</cm:description>
         <cm:lifecyclePolicy>bus</cm:lifecyclePolicy>
         <!-- attribute values are defaulted -->
-        <sec:sslClient></sec:sslClient>
     </cm:configItem>
 </cm:config>

Modified: incubator/cxf/trunk/api/src/main/resources/config-metadata/http-listener-config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/config-metadata/http-listener-config.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/config-metadata/http-listener-config.xml (original)
+++ incubator/cxf/trunk/api/src/main/resources/config-metadata/http-listener-config.xml Sun
Sep 10 06:29:20 2006
@@ -20,14 +20,14 @@
 <cm:config
     xmlns:cm="http://cxf.apache.org/configuration/metadata"
     xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
-    xmlns:sec="http://cxf.apache.org/bus/configuration/security"
+    xmlns:sec="http://cxf.apache.org/configuration/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     namespace="http://cxf.apache.org/configuration/transport/http-listener"
 >
 
     <cm:configImport namespace="http://cxf.apache.org/transports/http/configuration" location="schemas/wsdl/http-conf.xsd"/>
-    <cm:configImport namespace="http://cxf.apache.org/bus/configuration/security" location="schemas/configuration/security.xsd"/>
+    <cm:configImport namespace="http://cxf.apache.org/configuration/security" location="schemas/configuration/security.xsd"/>
 
     <cm:configItem>
         <cm:name>httpListener</cm:name>
@@ -36,7 +36,6 @@
         </cm:description>
         <cm:lifecyclePolicy>bus</cm:lifecyclePolicy>
         <!-- attribute values are defaulted -->
-        <http-conf:listener></http-conf:listener>
     </cm:configItem>
     <cm:configItem>
         <cm:name>sslServer</cm:name>

Modified: incubator/cxf/trunk/api/src/main/resources/config-metadata/http-server-config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/config-metadata/http-server-config.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/config-metadata/http-server-config.xml (original)
+++ incubator/cxf/trunk/api/src/main/resources/config-metadata/http-server-config.xml Sun
Sep 10 06:29:20 2006
@@ -20,14 +20,14 @@
 <cm:config
     xmlns:cm="http://cxf.apache.org/configuration/metadata"
     xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
-    xmlns:sec="http://cxf.apache.org/bus/configuration/security"
+    xmlns:sec="http://cxf.apache.org/configuration/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     namespace="http://cxf.apache.org/configuration/transport/http-server"
 >
 
     <cm:configImport namespace="http://cxf.apache.org/transports/http/configuration" location="schemas/wsdl/http-conf.xsd"/>
-    <cm:configImport namespace="http://cxf.apache.org/bus/configuration/security" location="schemas/configuration/security.xsd"/>
+    <cm:configImport namespace="http://cxf.apache.org/configuration/security" location="schemas/configuration/security.xsd"/>
     <cm:configImport location="schemas/configuration/std-types.xsd" namespace="http://cxf.apache.org/configuration/types"/>
     
     <cm:configItem>
@@ -38,7 +38,6 @@
         </cm:description>
         <cm:lifecyclePolicy>bus</cm:lifecyclePolicy>
         <!-- attribute values are defaulted -->
-        <http-conf:server></http-conf:server>
     </cm:configItem>
 
     <cm:configItem>
@@ -55,7 +54,6 @@
         <cm:description>Policies for controlling SSL encryption</cm:description>
         <cm:lifecyclePolicy>bus</cm:lifecyclePolicy>
         <!-- attribute values are defaulted -->
-        <sec:sslServer></sec:sslServer>
     </cm:configItem>
 
     <cm:configItem>

Added: incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xjb?view=auto&rev=441951
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xjb (added)
+++ incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xjb Sun Sep
10 06:29:20 2006
@@ -0,0 +1,27 @@
+<!--
+  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.
+-->
+<jaxb:bindings version="1.0" 
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
+    <jaxb:bindings schemaLocation="security.xsd" node="/xs:schema">
+        <jaxb:globalBindings generateIsSetMethod="true"/>
+    </jaxb:bindings>
+    
+</jaxb:bindings>

Modified: incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xsd?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xsd (original)
+++ incubator/cxf/trunk/api/src/main/resources/schemas/configuration/security.xsd Sun Sep
10 06:29:20 2006
@@ -18,20 +18,14 @@
   under the License.
 -->
 
-<xs:schema targetNamespace="http://cxf.apache.org/bus/configuration/security"
+<xs:schema targetNamespace="http://cxf.apache.org/configuration/security"
            xmlns:xs="http://www.w3.org/2001/XMLSchema" 
            elementFormDefault="qualified" 
            attributeFormDefault="unqualified"
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-           xmlns:tns="http://cxf.apache.org/bus/configuration/security"
+           xmlns:tns="http://cxf.apache.org/configuration/security"
            jaxb:version="2.0">
 
-    <xs:annotation>
-        <xs:appinfo>
-            <jaxb:globalBindings generateIsSetMethod="true"/>
-        </xs:appinfo>
-    </xs:annotation>
-
     <xs:complexType name="AuthorizationPolicy">
         <xs:annotation>
             <xs:documentation>
@@ -81,11 +75,6 @@
             </xs:element>
         </xs:sequence>
     </xs:complexType>
-    <xs:element name="authorization" type="tns:AuthorizationPolicy"/>
-    
-
-
-
 
     <xs:complexType name="SSLServerPolicy">
         <xs:annotation>
@@ -373,9 +362,5 @@
 
     	</xs:sequence>
     </xs:complexType>
-
-
-    <xs:element name="sslServer" type="tns:SSLServerPolicy"/>
-    <xs:element name="sslClient" type="tns:SSLClientPolicy"/>
 
 </xs:schema>

Modified: incubator/cxf/trunk/api/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/schemas/wsdl/http-conf.xsd?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/schemas/wsdl/http-conf.xsd (original)
+++ incubator/cxf/trunk/api/src/main/resources/schemas/wsdl/http-conf.xsd Sun Sep 10 06:29:20
2006
@@ -136,7 +136,6 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:element name="server" type="http-conf:HTTPServerPolicy"/>
 
 
     <xs:complexType name="HTTPClientPolicy">
@@ -332,7 +331,6 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
     
     <xs:complexType name="HTTPListenerPolicy">
     	<xs:sequence>
@@ -366,7 +364,6 @@
     		</xs:element>
     	</xs:sequence>
     </xs:complexType>
-    <xs:element name="listener" type="http-conf:HTTPListenerPolicy"/>
 
   
     <xs:simpleType name="serverCacheControlType">

Modified: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
(original)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Sun Sep 10 06:29:20 2006
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.plugin.AbstractMojo;
@@ -70,20 +71,9 @@
         if (xsdOptions == null) {
             throw new MojoExecutionException("Must specify xsdOptions");           
         }
+     
         for (int x = 0; x < xsdOptions.length; x++) {
-            List list = new ArrayList();
-            if (xsdOptions[x].getPackagename() != null) {
-                list.add("-p");
-                list.add(xsdOptions[x].getPackagename());
-            }
-            if (xsdOptions[x].getBindingFile() != null) {
-                list.add("-b");
-                list.add(xsdOptions[x].getBindingFile());
-            }
-            list.add("-quiet");
-            list.add("-d");
-            list.add(outputDir);
-            list.add(xsdOptions[x].getXsd());
+            String[] args = getArguments(xsdOptions[x], outputDir);
             
             File file = new File(xsdOptions[x].getXsd());
             File doneFile = new File(outputDirFile, "." + file.getName() + ".DONE");
@@ -109,7 +99,7 @@
                     try {
                         System.setSecurityManager(new NoExitSecurityManager());
                         
-                        com.sun.tools.xjc.Driver.main((String[])list.toArray(new String[list.size()]));
+                        com.sun.tools.xjc.Driver.main(args);
                        
                     } catch (ExitException e) {
                         if (e.getStatus() == 0) {
@@ -144,6 +134,38 @@
         if (project != null && testSourceRoot != null) {
             project.addTestCompileSourceRoot(testSourceRoot);
         }
+    }
+    
+    private String[] getArguments(XsdOption option, String outputDir) {
+        List list = new ArrayList();
+        if (option.getPackagename() != null) {
+            list.add("-p");
+            list.add(option.getPackagename());
+        }
+        if (option.getBindingFile() != null) {
+            list.add("-b");
+            list.add(option.getBindingFile());
+        }
+        if (option.getCatalog() != null) {
+            list.add("-catalog");
+            list.add(option.getCatalog());
+        }
+        if (option.isExtension()) {
+            list.add("-extension");
+        }
+        if (option.getExtensionArgs() != null) {
+            Iterator it = option.getExtensionArgs().iterator();
+            while (it.hasNext()) {
+                list.add(it.next().toString());
+            }
+        }           
+        list.add("-quiet");
+        list.add("-d");
+        list.add(outputDir);
+        list.add(option.getXsd());
+       
+        return (String[])list.toArray(new String[list.size()]);
+        
     }
     
     private boolean deleteDir(File f) {

Modified: incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
(original)
+++ incubator/cxf/trunk/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/XsdOption.java
Sun Sep 10 06:29:20 2006
@@ -20,6 +20,7 @@
 package org.apache.cxf.maven_plugin;
 
 import java.io.File;
+import java.util.List;
 
 public class XsdOption {
     String xsd;
@@ -27,6 +28,9 @@
     String bindingFile;
     File dependencies[];
     File redundantDirs[];
+    boolean extension;    
+    List extensionArgs;
+    String catalog;
     
     public String getPackagename() {
         return packagename;
@@ -45,7 +49,7 @@
     }
     public void setBindingFile(String bf) {
         this.bindingFile = bf;
-    }
+    }    
     public void setDependencies(File files[]) {
         dependencies = files;
     }
@@ -59,4 +63,24 @@
     public File[] getDeleteDirs() {
         return redundantDirs;
     }
+    public List getExtensionArgs() {
+        return extensionArgs;
+    }
+    public void setExtensionArgs(List extensionArgs) {
+        this.extensionArgs = extensionArgs;
+    }    
+    public boolean isExtension() {
+        return extension;
+    }
+    public void setExtension(boolean extension) {
+        this.extension = extension;
+    }
+    public String getCatalog() {
+        return catalog;
+    }
+    public void setCatalogFile(String c) {
+        catalog = c;
+    }
+    
+    
 }

Modified: incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-jaxb-property-types.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-jaxb-property-types.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-jaxb-property-types.xml
(original)
+++ incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-jaxb-property-types.xml
Sun Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:foo="http://cxf.apache.org/configuration/foo"

Modified: incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-property-editors.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-property-editors.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-property-editors.xml
(original)
+++ incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf-property-editors.xml
Sun Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:foo="http://cxf.apache.org/configuration/foo"

Modified: incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf.xml (original)
+++ incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/cxf.xml Sun
Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:foo="http://cxf.apache.org/configuration/foo"

Modified: incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
(original)
+++ incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
Sun Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="

Modified: incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
(original)
+++ incubator/cxf/trunk/common/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
Sun Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:foo="http://cxf.apache.org/configuration/foo"

Modified: incubator/cxf/trunk/common/src/test/resources/schemas/configuration/foo.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/src/test/resources/schemas/configuration/foo.xsd?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/common/src/test/resources/schemas/configuration/foo.xsd (original)
+++ incubator/cxf/trunk/common/src/test/resources/schemas/configuration/foo.xsd Sun Sep 10
06:29:20 2006
@@ -1,4 +1,22 @@
 <?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:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/configuration/foo"
targetNamespace="http://cxf.apache.org/configuration/foo" elementFormDefault="qualified">
 
     <xs:complexType name="foo">        

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduitConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduitConfiguration.java?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduitConfiguration.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduitConfiguration.java
Sun Sep 10 06:29:20 2006
@@ -28,9 +28,9 @@
 import javax.xml.ws.BindingProvider;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.configuration.security.AuthorizationPolicy;
-import org.apache.cxf.bus.configuration.security.SSLClientPolicy;
 import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.configuration.security.SSLClientPolicy;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.oldcfg.CompoundName;
 import org.apache.cxf.oldcfg.Configuration;

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPListenerConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPListenerConfiguration.java?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPListenerConfiguration.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPListenerConfiguration.java
Sun Sep 10 06:29:20 2006
@@ -20,7 +20,7 @@
 package org.apache.cxf.transport.http;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.configuration.security.SSLServerPolicy;
+import org.apache.cxf.configuration.security.SSLServerPolicy;
 import org.apache.cxf.oldcfg.CompoundName;
 import org.apache.cxf.oldcfg.Configuration;
 import org.apache.cxf.oldcfg.ConfigurationBuilder;
@@ -42,6 +42,9 @@
     public HTTPListenerConfiguration(Bus bus, String protocol, int port) {
         config = createConfiguration(bus, port);
         policy = config.getObject(HTTPListenerPolicy.class, "httpListener");
+        if (policy == null) {
+            policy = new HTTPListenerPolicy();
+        }
         sslPolicy = config.getObject(SSLServerPolicy.class, "sslServer");
         if (sslPolicy == null && "https".equals(protocol)) {
             sslPolicy = new SSLServerPolicy();

Modified: incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/cfg-test/pom.xml Sun Sep 10 06:29:20 2006
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: incubator/cxf/trunk/tools/xjc/cfg-test/src/test/resources/schemas/configuration/foo.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/cfg-test/src/test/resources/schemas/configuration/foo.xsd?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/cfg-test/src/test/resources/schemas/configuration/foo.xsd
(original)
+++ incubator/cxf/trunk/tools/xjc/cfg-test/src/test/resources/schemas/configuration/foo.xsd
Sun Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:ci="http://jaxb.dev.java.net/plugin/code-injector"
@@ -15,7 +33,7 @@
     <xs:complexType name="foo">        
         <xs:annotation>
             <xs:appinfo>                
-                <cfg:configuration></cfg:configuration>
+                <cfg:configurable/>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>

Modified: incubator/cxf/trunk/tools/xjc/cfg/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/cfg/pom.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/cfg/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/cfg/pom.xml Sun Sep 10 06:29:20 2006
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: incubator/cxf/trunk/tools/xjc/cfg/src/main/java/org/apache/cxf/xjc/cfg/ConfigurableBeansPlugin.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/cfg/src/main/java/org/apache/cxf/xjc/cfg/ConfigurableBeansPlugin.java?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/cfg/src/main/java/org/apache/cxf/xjc/cfg/ConfigurableBeansPlugin.java
(original)
+++ incubator/cxf/trunk/tools/xjc/cfg/src/main/java/org/apache/cxf/xjc/cfg/ConfigurableBeansPlugin.java
Sun Sep 10 06:29:20 2006
@@ -66,10 +66,10 @@
 public class ConfigurableBeansPlugin extends Plugin {
 
     private static final String CFG_NAMESPACE_URI = "http://cxf.apache.org/configuration/cfg";
-    private static final String CFG_CONFIGURATION_ELEM_NAME = "configuration";
+    private static final String CFG_CONFIGURABLE_ELEM_NAME = "configurable";
 
     public ConfigurableBeansPlugin() {
-    }
+    }    
 
     public String getOptionName() {
         return "Xcfg";
@@ -84,15 +84,14 @@
     }
 
     public boolean isCustomizationTagName(String nsUri, String localName) {
-        return nsUri.equals(CFG_NAMESPACE_URI) && localName.equals(CFG_CONFIGURATION_ELEM_NAME);
+        return nsUri.equals(CFG_NAMESPACE_URI) && localName.equals(CFG_CONFIGURABLE_ELEM_NAME);
     }
 
     public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
-        System.out.println("Running configurable beans plugin.");
        
         for (ClassOutline co : outline.getClasses()) {
             CPluginCustomization cust = co.target.getCustomizations().find(CFG_NAMESPACE_URI,
-                                                                           CFG_CONFIGURATION_ELEM_NAME);
+                                                                           CFG_CONFIGURABLE_ELEM_NAME);
             if (null == cust) {
                 continue;
             }

Modified: incubator/cxf/trunk/tools/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/dv-test/pom.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/dv-test/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/dv-test/pom.xml Sun Sep 10 06:29:20 2006
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: incubator/cxf/trunk/tools/xjc/dv-test/src/test/resources/schemas/configuration/foo.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/dv-test/src/test/resources/schemas/configuration/foo.xsd?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/dv-test/src/test/resources/schemas/configuration/foo.xsd
(original)
+++ incubator/cxf/trunk/tools/xjc/dv-test/src/test/resources/schemas/configuration/foo.xsd
Sun Sep 10 06:29:20 2006
@@ -1,4 +1,22 @@
 <?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:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/configuration/foo"
targetNamespace="http://cxf.apache.org/configuration/foo" elementFormDefault="qualified">
 
     <xs:element name="foo" type="tns:foo"/>

Modified: incubator/cxf/trunk/tools/xjc/dv/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/dv/pom.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/dv/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/dv/pom.xml Sun Sep 10 06:29:20 2006
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: incubator/cxf/trunk/tools/xjc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/pom.xml?view=diff&rev=441951&r1=441950&r2=441951
==============================================================================
--- incubator/cxf/trunk/tools/xjc/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/pom.xml Sun Sep 10 06:29:20 2006
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>



Mime
View raw message