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 2007/11/05 18:40:38 UTC

svn commit: r592101 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/assembly/ etc/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ systests/src/test/java/org/apache/cxf/systest/http_jetty/ testutils/src/main/resourc...

Author: dkulp
Date: Mon Nov  5 09:40:36 2007
New Revision: 592101

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

........
  r592097 | dkulp | 2007-11-05 12:32:48 -0500 (Mon, 05 Nov 2007) | 5 lines
  
  Update packaging and Apache headers
  * Add apache headers to files where it's missing
  * Update etc/rat.unknowns.txt to reflect latest stuff
  * Update src assembly to not grab the eclipse hidden files
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
    incubator/cxf/branches/2.0.x-fixes/etc/rat.unknowns.txt
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/package.html
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/test.html
    incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema.xsd
    incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema2.xsd
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog.xml
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog2.xml

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

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml Mon Nov  5 09:40:36 2007
@@ -60,6 +60,9 @@
                 <exclude>**/build</exclude>
                 <exclude>**/build/**/*</exclude>
                 <exclude>**/.settings</exclude>
+                <exclude>**/.pmd</exclude>
+                <exclude>**/.checkstyle</exclude>
+                <exclude>**/.ruleset</exclude>
                 <exclude>**/pmd-eclipse.log</exclude>
                 <exclude>**/.classpath</exclude>
                 <exclude>**/.project</exclude>

Modified: incubator/cxf/branches/2.0.x-fixes/etc/rat.unknowns.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/etc/rat.unknowns.txt?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/etc/rat.unknowns.txt (original)
+++ incubator/cxf/branches/2.0.x-fixes/etc/rat.unknowns.txt Mon Nov  5 09:40:36 2007
@@ -27,6 +27,7 @@
  !????? ./rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension
  !????? ./rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension
  !????? ./rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension
+ !????? ./rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf.extension
  !????? ./rt/management/src/main/resources/META-INF/cxf/cxf.extension
  !????? ./rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension
  !????? ./rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension
@@ -75,6 +76,7 @@
  !????? ./tools/jdee/src/main/java/org/apache/cxf/maven_plugin/jdee/prj.vm
  !????? ./tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/namespace2package.cfg
  !????? ./tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavaexclude.cfg
+ !????? ./systests/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem
  !????? ./systests/src/test/java/org/apache/cxf/systest/mtom/nonmtom.xml
  !????? ./systests/src/test/java/org/apache/cxf/systest/mtom/request
  !????? ./systests/src/test/java/org/apache/cxf/systest/mtom/request-url-attachment
@@ -190,9 +192,7 @@
  !????? ./distribution/src/main/release/samples/wsdl_first_https/certs/wibble.chain
  !????? ./distribution/src/main/release/samples/wsdl_first_https/src/demo/hw_https/resources/abigcompany_ca.pem 
  !????? ./rt/transports/http/src/test/java/org/apache/cxf/transport/https/resources/abigcompany_ca.pem
- !????? ./rt/ws/security/src/test/java/META-INF/cxf/request.xml
  !????? ./rt/ws/security/src/test/java/META-INF/cxf/key.rsa
- !????? ./rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/in_enc.xml
  !????? ./rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed.xml
  !????? ./rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_invalid.xml
  !????? ./rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/wsse-request-clean.xml

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/package.html
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/package.html?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/package.html (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/package.html Mon Nov  5 09:40:36 2007
@@ -1,3 +1,22 @@
-<html><body><p>
+<html>
+<!--
+  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.
+-->
+<body><p>
 This package contains tests of the XMLTypeCreator with regard to maps.
 </p></body></html>

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/test.html
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/test.html?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/test.html (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/test.html Mon Nov  5 09:40:36 2007
@@ -1,4 +1,22 @@
 <html>
+<!--
+  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.
+-->
 <body>
 Test
 </body>

Modified: incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema.xsd?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema.xsd (original)
+++ incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema.xsd Mon Nov  5 09:40:36 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+    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.
+-->
 <schema
             xmlns="http://www.w3.org/2001/XMLSchema"
             xmlns:x1="http://apache.org/hello_world/types"

Modified: incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema2.xsd?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema2.xsd (original)
+++ incubator/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/hello_world_schema2.xsd Mon Nov  5 09:40:36 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+    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.
+-->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://apache.org/hello_world/types2"
             elementFormDefault="qualified">

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog.xml?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog.xml Mon Nov  5 09:40:36 2007
@@ -1,3 +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.
+-->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
     prefer="system">
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog2.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog2.xml?rev=592101&r1=592100&r2=592101&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog2.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1112/jax-ws-catalog2.xml Mon Nov  5 09:40:36 2007
@@ -1,3 +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.
+-->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
     prefer="system">