Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 40881 invoked from network); 11 Sep 2009 17:41:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Sep 2009 17:41:41 -0000 Received: (qmail 96348 invoked by uid 500); 11 Sep 2009 17:41:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 96274 invoked by uid 500); 11 Sep 2009 17:41:40 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 96265 invoked by uid 99); 11 Sep 2009 17:41:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Sep 2009 17:41:40 +0000 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Sep 2009 17:41:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0139523888E9; Fri, 11 Sep 2009 17:41:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r813946 - in /cxf/branches/2.1.x-fixes: ./ api/src/test/java/org/apache/cxf/jaxws/handlers/ common/common/src/test/resources/META-INF/ common/xjc/dv-test/src/main/resources/ distribution/src/main/release/samples/mtosi_1.1/code_gen/src/ inte... Date: Fri, 11 Sep 2009 17:41:15 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090911174116.0139523888E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Sep 11 17:41:14 2009 New Revision: 813946 URL: http://svn.apache.org/viewvc?rev=813946&view=rev Log: Merged revisions 813911 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r813911 | dkulp | 2009-09-11 12:19:56 -0400 (Fri, 11 Sep 2009) | 9 lines Merged revisions 813656 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r813656 | dkulp | 2009-09-10 23:04:41 -0400 (Thu, 10 Sep 2009) | 2 lines Remove a bunch of empty directories ........ ................ Removed: cxf/branches/2.1.x-fixes/api/src/test/java/org/apache/cxf/jaxws/handlers/ cxf/branches/2.1.x-fixes/common/common/src/test/resources/META-INF/ cxf/branches/2.1.x-fixes/common/xjc/dv-test/src/main/resources/ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/mtosi_1.1/code_gen/src/ cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/org/ cxf/branches/2.1.x-fixes/integration/jbi/src/main/resources/META-INF/ cxf/branches/2.1.x-fixes/integration/jbi/src/test/java/org/apache/cxf/jbi/transport/ cxf/branches/2.1.x-fixes/integration/jbi/src/test/resources/service-assemblies/cxf-demo-service-assembly/version_1/sus/CXFServiceEngine/JBIDemoSE_AProvider/org/apache/hello_world/types/ cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/resources/ cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/test/java/ cxf/branches/2.1.x-fixes/rt/bindings/coloc/src/test/resources/ cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/test/resources/ cxf/branches/2.1.x-fixes/rt/bindings/object/src/test/resources/ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/resources/org/apache/cxf/bindings/soap/ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/codehaus/xfire/aegis/type/ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/endpoint/dynamic/ cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/resources/META-INF/services/ cxf/branches/2.1.x-fixes/rt/testsupport/src/test/java/org/apache/cxf/testsupport/ cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/ cxf/branches/2.1.x-fixes/rt/transports/jbi/src/test/resources/ cxf/branches/2.1.x-fixes/rt/transports/local/src/java/ cxf/branches/2.1.x-fixes/rt/ws/policy/src/test/resources/schemas/ cxf/branches/2.1.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/ cxf/branches/2.1.x-fixes/tools/common/src/main/resources/META-INF/ cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl20/ cxf/branches/2.1.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/processor/ cxf/branches/2.1.x-fixes/tools/validator/src/main/resources/ cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/test/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/resources/META-INF/ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/main/ Modified: cxf/branches/2.1.x-fixes/ (props changed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.