cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r545243 [1/3] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/service/model/ api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/ benchmark/benchmark1/ benchmark/benchmark1/src/org/apache/cxf/performance/client/ benchmark/be...
Date Thu, 07 Jun 2007 16:58:49 GMT
Author: dkulp
Date: Thu Jun  7 09:58:41 2007
New Revision: 545243

URL: http://svn.apache.org/viewvc?view=rev&rev=545243
Log:
Release prep updates
* Add Apache license to a BUNCH of files that were missing it
* Rename the maven artifact id for "cxf-distribution" to "apache-cxf" so the deployed names are exactly what they will be shipped as
* Change the directory installed into from cxf-VERSION to apache-cxf-VERSION to make the IPMC folks happy
* Add Rhino and xbeans into the distribution
* Add a bunch of missing licenses


Added:
    incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt   (with props)
    incubator/cxf/trunk/distribution/src/main/release/licenses/bouncy-castle.txt   (with props)
    incubator/cxf/trunk/distribution/src/main/release/licenses/jaxen.txt   (with props)
    incubator/cxf/trunk/distribution/src/main/release/licenses/sl4j.txt   (with props)
Removed:
    incubator/cxf/trunk/bin/installSunJars
    incubator/cxf/trunk/distribution/src/main/release/DISCLAIMER
    incubator/cxf/trunk/distribution/src/main/release/LICENSE
Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties
    incubator/cxf/trunk/benchmark/benchmark1/build.xml
    incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
    incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
    incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
    incubator/cxf/trunk/benchmark/performance/base/build.xml
    incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client
    incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client.bat
    incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server
    incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server.bat
    incubator/cxf/trunk/benchmark/performance/basic_type/build.xml
    incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client
    incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client.bat
    incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server
    incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server.bat
    incubator/cxf/trunk/benchmark/performance/complex_type/build.xml
    incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
    incubator/cxf/trunk/bin/pom-version.pl
    incubator/cxf/trunk/codegen-plugin/pom.xml
    incubator/cxf/trunk/common/common/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/distribution/bundle/pom.xml
    incubator/cxf/trunk/distribution/manifest/pom.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/distribution/src/main/assembly/src.xml
    incubator/cxf/trunk/distribution/src/main/release/release_notes.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/cxf.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/bin/gencerts.sh
    incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/test.html
    incubator/cxf/trunk/integration/jbi/src/test/resources/service-assemblies/cxf-demo-service-assembly/state.xml
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/rt/bindings/coloc/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/bindings/http/src/test/resources/schemas/person.xsd
    incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/Messages.properties
    incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/bindings/object/src/main/resources/org/apache/cxf/binding/object/spring/object.xsd
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/Messages.properties
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/soap.xsd
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/core/src/test/resources/DiffPortTypeNs-Import.wsdl
    incubator/cxf/trunk/rt/core/src/test/resources/DiffPortTypeNs.wsdl
    incubator/cxf/trunk/rt/databinding/aegis/pom.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/wsdl/jaxb/misc_test.xsd
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/resources/schemas/jaxws.xsd
    incubator/cxf/trunk/rt/frontend/js/pom.xml
    incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd
    incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/conduit.xml
    incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/destination.xml
    incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/serverenginefactory.xml
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/ws/policy/src/test/resources/attachment/wsdl11/test100.wsdl
    incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/Messages.properties
    incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/ws/security/pom.xml
    incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/Messages.properties
    incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/client.properties
    incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/insecurity.properties
    incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/outsecurity.properties
    incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/service_enc.xml
    incubator/cxf/trunk/rt/ws/security/src/test/java/META-INF/cxf/service_sgn.xml
    incubator/cxf/trunk/systests/pom.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/trivial_soap_handler.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy-optional.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd
    incubator/cxf/trunk/testutils/pom.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/factory_pattern.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/header.xsd
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/header_doc_lit.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb_element_test.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/soapheader2.wsdl
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Messages.properties
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd
    incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/plugin.xml
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/no_port_or_service.wsdl
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/pizza.wsdl
    incubator/cxf/trunk/wsdlgen-plugin/pom.xml

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java Thu Jun  7 09:58:41 2007
@@ -128,7 +128,11 @@
 
     public SchemaInfo getSchema(String namespaceURI) {
         for (SchemaInfo s : schemas) {
-            if (s.getNamespaceURI().equals(namespaceURI)) {
+            if (namespaceURI != null) {
+                if (namespaceURI.equals(s.getNamespaceURI())) {
+                    return s;
+                }
+            } else if (s.getNamespaceURI() == null) {
                 return s;
             }
         }

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties Thu Jun  7 09:58:41 2007
@@ -1 +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.
+#
+#
 UNMARSHAL_ELEMENT_EXC = Failed to unmarshal element.

Modified: incubator/cxf/trunk/benchmark/benchmark1/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/benchmark1/build.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/benchmark1/build.xml (original)
+++ incubator/cxf/trunk/benchmark/benchmark1/build.xml Thu Jun  7 09:58:41 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.
+-->
 <project name="test.Benchmark" default="build" basedir=".">
     <import file="../performance/etc/common_build.xml"/>
     <property name="wsdl.dir" location="${basedir}/wsdl"/>

Modified: incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java (original)
+++ incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java Thu Jun  7 09:58:41 2007
@@ -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.
+ */
 package org.apache.cxf.performance.client;
 
 import edu.indiana.extreme.wsdl.benchmark1.Benchmark;

Modified: incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java (original)
+++ incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java Thu Jun  7 09:58:41 2007
@@ -1,4 +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.
+ */
 
 package org.apache.cxf.performance.server;
 

Modified: incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java (original)
+++ incubator/cxf/trunk/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java Thu Jun  7 09:58:41 2007
@@ -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.
+ */
 /* Generated by WSDLToJava Compiler. */
 package org.apache.cxf.performance.server;
 

Modified: incubator/cxf/trunk/benchmark/performance/base/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/base/build.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/base/build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/base/build.xml Thu Jun  7 09:58:41 2007
@@ -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 name="cxf-performance-testcase-base" default="base.compile" basedir=".">
   <import file="../etc/common_build.xml"/>
   <property name="jar.name"  value="performance_base.jar"/>  

Modified: incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client Thu Jun  7 09:58:41 2007
@@ -1,5 +1,22 @@
 #!/bin/bash
 
+# 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.
+
 OPERARTION=echoString
 BASEDON=Time
 AMOUNT=30

Modified: incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client.bat?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client.bat (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client.bat Thu Jun  7 09:58:41 2007
@@ -1,6 +1,24 @@
 @echo off
 @setlocal
 
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements. See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership. The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License. You may obtain a copy of the License at
+rem 
+rem  http://www.apache.org/licenses/LICENSE-2.0
+rem 
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied. See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+
+
 cd ..
 
 set BASEDON=Time

Modified: incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server Thu Jun  7 09:58:41 2007
@@ -1,2 +1,18 @@
+# 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.
 cd ../
 ant server

Modified: incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server.bat?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server.bat (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_server.bat Thu Jun  7 09:58:41 2007
@@ -1,2 +1,21 @@
+echo off
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements. See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership. The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License. You may obtain a copy of the License at
+rem 
+rem  http://www.apache.org/licenses/LICENSE-2.0
+rem 
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied. See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+
+
 cd ..
 ant server

Modified: incubator/cxf/trunk/benchmark/performance/basic_type/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/build.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/build.xml Thu Jun  7 09:58:41 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.
+-->
 <project name="test.basic_type" default="build" basedir=".">
     <import file="../etc/common_build.xml"/>
     <property name="wsdl.dir" location="${basedir}/wsdl"/>

Modified: incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client (original)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client Thu Jun  7 09:58:41 2007
@@ -1,5 +1,22 @@
 #!/bin/bash
 
+# 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.
+
 OPERARTION=sendReceiveData
 BASEDON=Time
 AMOUNT=30

Modified: incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client.bat?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client.bat (original)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_client.bat Thu Jun  7 09:58:41 2007
@@ -1,6 +1,24 @@
 @echo off
 @setlocal
 
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements. See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership. The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License. You may obtain a copy of the License at
+rem 
+rem  http://www.apache.org/licenses/LICENSE-2.0
+rem 
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied. See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+
+
 cd ..
 
 set BASEDON=Time

Modified: incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server (original)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server Thu Jun  7 09:58:41 2007
@@ -1,2 +1,19 @@
+# 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.
+
 cd ../
 ant server

Modified: incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server.bat?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server.bat (original)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/bin/run_server.bat Thu Jun  7 09:58:41 2007
@@ -1,2 +1,22 @@
+echo off
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements. See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership. The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License. You may obtain a copy of the License at
+rem 
+rem  http://www.apache.org/licenses/LICENSE-2.0
+rem 
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied. See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+
+
+
 cd ..
 ant server

Modified: incubator/cxf/trunk/benchmark/performance/complex_type/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/build.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/build.xml Thu Jun  7 09:58:41 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.
+-->
 <project name="test.complex_type" default="build" basedir=".">
 
   <import file="../etc/common_build.xml"/>    

Modified: incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/etc/common_build.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/etc/common_build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/etc/common_build.xml Thu Jun  7 09:58:41 2007
@@ -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 name="CXF common build file" default="build">
 
 

Modified: incubator/cxf/trunk/bin/pom-version.pl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/bin/pom-version.pl?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/bin/pom-version.pl (original)
+++ incubator/cxf/trunk/bin/pom-version.pl Thu Jun  7 09:58:41 2007
@@ -1,5 +1,25 @@
 #!/usr/bin/env perl
 
+
+#  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.
+
+
+
 use strict;
 use File::Find;
 use XML::Parser;

Modified: incubator/cxf/trunk/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/pom.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/pom.xml (original)
+++ incubator/cxf/trunk/codegen-plugin/pom.xml Thu Jun  7 09:58:41 2007
@@ -1,3 +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.
+-->
 <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>
     <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/common/common/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/resources/META-INF/spring.schemas?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/common/common/src/main/resources/META-INF/spring.schemas Thu Jun  7 09:58:41 2007
@@ -1 +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.
+#
+#
 http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd

Modified: incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas Thu Jun  7 09:58:41 2007
@@ -1,3 +1,23 @@
+#
+#
+#    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.
+#
+#
 http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
 http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
 http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd

Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Thu Jun  7 09:58:41 2007
@@ -1,3 +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.
+-->
 <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>
 	<groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/manifest/pom.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/distribution/manifest/pom.xml (original)
+++ incubator/cxf/trunk/distribution/manifest/pom.xml Thu Jun  7 09:58:41 2007
@@ -1,3 +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.
+-->
 <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>
     <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Thu Jun  7 09:58:41 2007
@@ -19,7 +19,7 @@
 <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>
     <groupId>org.apache.cxf</groupId>
-    <artifactId>cxf-distribution</artifactId>
+    <artifactId>apache-cxf</artifactId>
     <packaging>pom</packaging>
     <name>Apache CXF Distribution</name>
     <version>2.0-incubator-SNAPSHOT</version>
@@ -315,7 +315,6 @@
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>cxf-${pom.version}</finalName>
                         </configuration>
                     </execution>
                 </executions>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Thu Jun  7 09:58:41 2007
@@ -1,197 +1,197 @@
 <?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.
+    * 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.
 -->
 <assembly>
-	<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-	<id></id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
+    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+    <id></id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
         <format>dir</format>
-		<format>tar.gz</format>
-		<format>zip</format>
-	</formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
 
-	<fileSets>
-		<fileSet>
-			<directory>src/main/release</directory>
-			<outputDirectory>cxf-${cxf.version}</outputDirectory>
-			<includes>
-				<include>DISCLAIMER</include>
-				<include>LICENSE</include>
-				<include>licenses/*.*</include>
-				<include>lib/*</include>
-				<include>release_notes.txt</include>
-				<include>README</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target/maven-shared-archive-resources/META-INF</directory>
-			<outputDirectory>cxf-${cxf.version}</outputDirectory>
-			<includes>
-				<include>NOTICE</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/release/bin</directory>
-			<outputDirectory>cxf-${cxf.version}/bin</outputDirectory>
-			<fileMode>755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/release/etc</directory>
-			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
-			<includes>
-				<include>logging.properties</include>
-				<include>ejb_servants.properties</include>
-				<include>web.xml</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/release/docs</directory>
-			<outputDirectory>cxf-${cxf.version}/docs</outputDirectory>
-			<includes>
-				<include>**/*.pdf</include>
-				<include>release_notes.txt</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/release/samples</directory>
-			<outputDirectory>cxf-${cxf.version}/samples</outputDirectory>
-			<excludes>
-				<exclude>**/build</exclude>
-				<exclude>**/build/**/*</exclude>
-				<exclude>integration/JBI/**/build.properties</exclude>
-        <exclude>**/colocated/**/*</exclude>
-        <exclude>**/colocated</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>target/javadoc</directory>
-			<outputDirectory>cxf-${cxf.version}/docs/api</outputDirectory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target/additional-libs</directory>
-			<outputDirectory>cxf-${cxf.version}/modules/integration</outputDirectory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-			<excludes>
-			    <exclude>cxf-bundle*.jar</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>manifest/target</directory>
-			<outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
-			<includes>
-				<include>cxf-manifest-incubator.jar</include>
-			</includes>
-		</fileSet>
-    <fileSet>
-      <directory>manifest/target</directory>
-      <outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
-      <includes>
-        <include>cxf-manifest-incubator.jar</include>
-      </includes>
-    </fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
-			<includes>
-				<include>version.properties</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>../integration/jca/src/main/rar/META-INF</directory>
-			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
-			<includes>
-				<include>ra.xml</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc</outputDirectory>
-			<includes>
-				<include>jbi.xml</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>cxf-${cxf.version}/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc</outputDirectory>
-			<includes>
-				<include>jbi.xml</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>cxf-${cxf.version}/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc</outputDirectory>
-			<includes>
-				<include>jbi.xml</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>cxf-${cxf.version}/samples/integration/JBI/external_provider_external_consumer/service-engine/etc</outputDirectory>
-			<includes>
-				<include>jbi.xml</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc</outputDirectory>
-			<includes>
-				<include>jbi.xml</include>
-			</includes>
-		</fileSet>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>apache-cxf-${cxf.version}</outputDirectory>
+            <includes>
+                <include>DISCLAIMER</include>
+                <include>LICENSE</include>
+                <include>licenses/*.*</include>
+                <include>lib/*</include>
+                <include>release_notes.txt</include>
+                <include>README</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>apache-cxf-${cxf.version}</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/release/bin</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/release/etc</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/etc</outputDirectory>
+            <includes>
+                <include>logging.properties</include>
+                <include>ejb_servants.properties</include>
+                <include>web.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/release/docs</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/docs</outputDirectory>
+            <includes>
+                <include>**/*.pdf</include>
+                <include>release_notes.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/release/samples</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/samples</outputDirectory>
+            <excludes>
+                <exclude>**/build</exclude>
+                <exclude>**/build/**/*</exclude>
+                <exclude>integration/JBI/**/build.properties</exclude>
+                <exclude>**/colocated/**/*</exclude>
+                <exclude>**/colocated</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>target/javadoc</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/docs/api</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/additional-libs</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/modules/integration</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <excludes>
+                <exclude>cxf-bundle*.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>manifest/target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
+            <includes>
+                <include>cxf-manifest-incubator.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>manifest/target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
+            <includes>
+                <include>cxf-manifest-incubator.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/etc</outputDirectory>
+            <includes>
+                <include>version.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../integration/jca/src/main/rar/META-INF</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/etc</outputDirectory>
+            <includes>
+                <include>ra.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/external_provider_external_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
 
-	</fileSets>
-	<dependencySets>
-		<dependencySet>
-			<outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
-			<unpack>false</unpack>
-			<excludes>
-		        <exclude>org.apache.cxf:*</exclude>
-      </excludes>
-			<scope>runtime</scope>
-		</dependencySet>
+    </fileSets>
+    <dependencySets>
         <dependencySet>
-		    <outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
-		    <unpack>false</unpack>
-		    <includes>
-		        <include>org.apache.cxf:*</include>
-		    </includes>
-        <excludes>
-              <exclude>org.apache.cxf:cxf-bundle</exclude>
-        </excludes>
-		    <scope>runtime</scope>
-		</dependencySet>
-		<dependencySet>
-		    <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
-		    <unpack>false</unpack>
-		    <includes>
-		        <include>org.apache.cxf:cxf-bundle</include>
-		    </includes>
-		    <scope>runtime</scope>
-		    <outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>
-		</dependencySet>
-		
-	</dependencySets>
-	
+            <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
+            <unpack>false</unpack>
+            <excludes>
+                <exclude>org.apache.cxf:*</exclude>
+            </excludes>
+            <scope>runtime</scope>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
+                <include>org.apache.cxf:*</include>
+            </includes>
+            <excludes>
+                <exclude>org.apache.cxf:cxf-bundle</exclude>
+            </excludes>
+            <scope>runtime</scope>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
+                <include>org.apache.cxf:cxf-bundle</include>
+            </includes>
+            <scope>runtime</scope>
+            <outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>
+        </dependencySet>
+
+    </dependencySets>
+
 </assembly>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/src.xml?view=diff&rev=545243&r1=545242&r2=545243
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/src.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/src.xml Thu Jun  7 09:58:41 2007
@@ -29,10 +29,8 @@
     <fileSets>
         <fileSet>
             <directory>src/main/release</directory>
-            <outputDirectory>cxf-${cxf.version}-src</outputDirectory>
+            <outputDirectory>apache-cxf-${cxf.version}-src</outputDirectory>
             <includes>
-                <include>DISCLAIMER</include>
-                <include>LICENSE</include>
                 <include>licenses/*.*</include>
                 <include>README</include>
                 <include>BUILDING.txt</include>
@@ -40,14 +38,14 @@
         </fileSet>
         <fileSet>
             <directory>target/maven-shared-archive-resources/META-INF</directory>
-            <outputDirectory>cxf-${cxf.version}-src</outputDirectory>
+            <outputDirectory>apache-cxf-${cxf.version}-src</outputDirectory>
             <includes>
-                <include>NOTICE</include>
+                <include>*</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>..</directory>
-            <outputDirectory>cxf-${cxf.version}-src</outputDirectory>
+            <outputDirectory>apache-cxf-${cxf.version}-src</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>

Added: incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt?view=auto&rev=545243
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt (added)
+++ incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt Thu Jun  7 09:58:41 2007
@@ -0,0 +1,470 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (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.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+

Propchange: incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/licenses/MPL-1.1.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message