cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r614001 - in /incubator/cxf/trunk: rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ systests/src/test/java/org/apache/cxf/cxf1226/ systests/src/test/java...
Date Mon, 21 Jan 2008 20:32:25 GMT
Author: dkulp
Date: Mon Jan 21 12:32:23 2008
New Revision: 614001

URL: http://svn.apache.org/viewvc?rev=614001&view=rev
Log:
[CXF-1226] Honor qualification from package-info
Add apache header to a bunch of things

Modified:
    incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml
    incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml
Mon Jan 21 12:32:23 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the v Software Foundation (ASF) under one
+  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

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml
Mon Jan 21 12:32:23 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the v Software Foundation (ASF) under one
+  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

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Mon Jan 21 12:32:23 2008
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Set;
 import javax.wsdl.Operation;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Action;
@@ -321,8 +323,17 @@
             jaxWsConfiguration = new JaxWsServiceConfiguration();
             jaxWsConfiguration.setServiceFactory(this);
             getServiceConfigurations().add(0, jaxWsConfiguration);
+            
+            Class<?> seiClass = ii.getEndpointClass();
+            if (seiClass != null) {
+                XmlSchema schema = seiClass.getPackage().getAnnotation(XmlSchema.class);
+                if (schema != null && XmlNsForm.QUALIFIED.equals(schema.elementFormDefault()))
{
+                    setQualifyWrapperSchema(true);
+                }
+            }
         }
         setMethodDispatcher(new JAXWSMethodDispatcher(implInfo));
+        
     }
 
     public List<WebServiceFeature> getWsFeatures() {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
Mon Jan 21 12:32:23 2008
@@ -44,7 +44,6 @@
     protected void additionalSpringConfiguration(GenericApplicationContext context) throws
Exception {
     }
     
-    @org.junit.Ignore
     @Test
     public void lookForMissingNamespace() throws Exception {
         EndpointImpl endpoint = (EndpointImpl) getBean(EndpointImpl.class, "helloWorld");

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml Mon Jan 21
12:32:23 2008
@@ -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:jaxws="http://cxf.apache.org/jaxws" 

Modified: incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl
(original)
+++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl
Mon Jan 21 12:32:23 2008
@@ -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.
+-->
 <wsdl:definitions name="BaseDataTypesRpcLitService" targetNamespace="http://tempuri.org/"

 		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
 		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 

Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl?rev=614001&r1=614000&r2=614001&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl
(original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl
Mon Jan 21 12:32:23 2008
@@ -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.
+-->
 <definitions name="AddNumbers"  targetNamespace="http://example.com/" xmlns:tns="http://example.com/"
 	     xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"



Mime
View raw message