Return-Path: 
 <commits-return-23318-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4B686D87F
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 19 Nov 2012 17:47:09 +0000 (UTC)
Received: (qmail 90573 invoked by uid 500); 19 Nov 2012 17:47:09 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 90523 invoked by uid 500); 19 Nov 2012 17:47:09 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 90512 invoked by uid 99); 19 Nov 2012 17:47:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 17:47:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 17:47:06 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B52D12388980;
	Mon, 19 Nov 2012 17:46:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1411329 - in /cxf/branches/2.6.x-fixes: ./
 distribution/src/main/release/samples/js_browser_client_java_first/
 distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/
 distribution/src/main/release/samples/js_...
Date: Mon, 19 Nov 2012 17:46:45 -0000
To: commits@cxf.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121119174645.B52D12388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmazza
Date: Mon Nov 19 17:46:44 2012
New Revision: 1411329

URL: http://svn.apache.org/viewvc?rev=1411329&view=rev
Log:
Merged revisions 1411327 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1411327 | gmazza | 2012-11-19 12:45:18 -0500 (Mon, 19 Nov 2012) | 1 line
  
  Updated sample to remove antrun plugin.
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/
      - copied from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
      - copied unchanged from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/
      - copied from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/Beverages.html
      - copied unchanged from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/Beverages.html
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/staticContent/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml

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

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml?rev=1411329&r1=1411328&r2=1411329&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml Mon Nov 19 17:46:44 2012
@@ -42,24 +42,6 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copyxmlfiles</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${basedir}/staticContent/Beverages.html" todir="${basedir}/target/classes/staticContent" />
-                                <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -111,7 +93,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.0.6.RELEASE</version>
         </dependency>
     </dependencies>
 </project>