Return-Path: 
 <cxf-commits-return-4754-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org
Received: (qmail 26594 invoked from network); 21 Mar 2008 14:09:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Mar 2008 14:09:34 -0000
Received: (qmail 60725 invoked by uid 500); 21 Mar 2008 14:09:32 -0000
Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org
Received: (qmail 60675 invoked by uid 500); 21 Mar 2008 14:09:32 -0000
Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:cxf-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cxf-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cxf-commits@incubator.apache.org>
List-Id: <cxf-commits.incubator.apache.org>
Reply-To: cxf-dev@incubator.apache.org
Delivered-To: mailing list cxf-commits@incubator.apache.org
Received: (qmail 60666 invoked by uid 99); 21 Mar 2008 14:09:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2008 07:09:32 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2008 14:08:43 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 50B601A9832; Fri, 21 Mar 2008 07:09:02 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r639651 - in /incubator/cxf/trunk: distribution/
 distribution/bundle/pom.xml
 distribution/src/main/appended-resources/META-INF/LICENSE.vm
 distribution/src/main/assembly/src.xml parent/pom.xml pom.xml
Date: Fri, 21 Mar 2008 14:08:57 -0000
To: cxf-commits@incubator.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080321140902.50B601A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Fri Mar 21 07:08:41 2008
New Revision: 639651

URL: http://svn.apache.org/viewvc?rev=639651&view=rev
Log:
Updates for latest legal requirements

Added:
    incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm   (with props)
Modified:
    incubator/cxf/trunk/distribution/   (props changed)
    incubator/cxf/trunk/distribution/bundle/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/src.xml
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/pom.xml

Propchange: incubator/cxf/trunk/distribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 21 07:08:41 2008
@@ -7,3 +7,4 @@
 .project
 .wtpmodules
 maven-build.xml
+velocity.log

Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?rev=639651&r1=639650&r2=639651&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Fri Mar 21 07:08:41 2008
@@ -37,7 +37,6 @@
         <maven.test.skip>true</maven.test.skip>
         <cxf.version>${pom.version}</cxf.version>
         <createSourcesJar>false</createSourcesJar>
-        <shade.version>1.0</shade.version>
     </properties>
 
     <dependencies>
@@ -297,7 +296,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>${shade.version}</version>
+                <version>1.0.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

Added: incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm?rev=639651&view=auto
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm Fri Mar 21 07:08:41 2008
@@ -0,0 +1,38 @@
+##
+## 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.
+##
+## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
+##
+
+Apache CXF includes a number of components and librarie with separate 
+copyright notices and license terms. Your use of those components are 
+subject to the terms and conditions of the following licenses. 
+
+#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
+
+#foreach ( $project in $projects )
+#foreach ( $license in $project.licenses)
+#if ( ! ($apacheTxt == $license.name) ) 
+
+$project.name #if ($project.url)($project.url)#end $project.artifact
+    License: $license.name #if ($license.url) ($license.url)#end
+
+#end
+#end
+#end
+

Propchange: incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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?rev=639651&r1=639650&r2=639651&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/src.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/src.xml Fri Mar 21 07:08:41 2008
@@ -69,6 +69,7 @@
                 <exclude>**/.wtpmodules</exclude>
                 <exclude>**/surefire*</exclude>
                 <exclude>**/cobertura.ser</exclude>
+                <exclude>**/velocity.log</exclude>
                 <exclude>bin</exclude>
                 <exclude>bin/*</exclude>
                 <exclude>**/var/journal</exclude>

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=639651&r1=639650&r2=639651&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Fri Mar 21 07:08:41 2008
@@ -285,7 +285,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0-beta-2</version>
+                <version>1.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.cxf</groupId>
@@ -301,14 +301,12 @@
                         <configuration>
                             <resourceBundles>
                                 <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
                             </resourceBundles>
                             <supplementalModels>
                                 <supplementalModel>notice-supplements.xml</supplementalModel>
                             </supplementalModels>
                             <properties>
-                                <addLicense>true</addLicense>
-                                <addArtifact>true</addArtifact>
                                 <projectName>Apache CXF</projectName>
                             </properties>
                         </configuration>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=639651&r1=639650&r2=639651&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Mar 21 07:08:41 2008
@@ -376,7 +376,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.4</version>
                     <configuration>
                         <attach>true</attach>
                         <quiet>true</quiet>