Return-Path: 
 <cxf-commits-return-3219-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org
Received: (qmail 21666 invoked from network); 16 Oct 2007 02:28:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Oct 2007 02:28:20 -0000
Received: (qmail 72569 invoked by uid 500); 16 Oct 2007 02:28:08 -0000
Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org
Received: (qmail 72501 invoked by uid 500); 16 Oct 2007 02:28:08 -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 72492 invoked by uid 99); 16 Oct 2007 02:28:08 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2007 19:28:08 -0700
X-ASF-Spam-Status: No, hits=-100.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; Tue, 16 Oct 2007 02:28:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 596531A9832; Mon, 15 Oct 2007 19:27:29 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r584999 - in /incubator/cxf/branches/2.0.x-fixes: ./
 integration/jbi/pom.xml parent/pom.xml rt/bindings/jbi/pom.xml
 rt/transports/jbi/pom.xml systests/pom.xml
Date: Tue, 16 Oct 2007 02:27:28 -0000
To: cxf-commits@incubator.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071016022729.596531A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Mon Oct 15 19:27:24 2007
New Revision: 584999

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

........
  r583933 | dkulp | 2007-10-11 15:43:09 -0400 (Thu, 11 Oct 2007) | 2 lines
  
  Upgrade to ServiceMix 3.1.2 (non-incubator version!) and remove references to incubator repository since its now not-needed.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml
    incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml
    incubator/cxf/branches/2.0.x-fixes/systests/pom.xml

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

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml?rev=584999&r1=584998&r2=584999&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml Mon Oct 15 19:27:24 2007
@@ -56,55 +56,33 @@
             <version>${project.version}</version>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-jbi</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jbi</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
- 
-        
-
-
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
-            <version>${servicemix.version}</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>servicemix</groupId>
-                    <artifactId>jaxp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-
-
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-
-
     </dependencies>
 
     <scm>

Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=584999&r1=584998&r2=584999&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Mon Oct 15 19:27:24 2007
@@ -61,7 +61,7 @@
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
 
         <downloadSources>true</downloadSources>
-        <servicemix.version>3.1-incubating</servicemix.version>
+        <servicemix.version>3.1.2</servicemix.version>
     </properties>
 
 
@@ -128,7 +128,7 @@
                     <version>1.1</version>
                     <dependencies>
                         <dependency>
-		             <groupId>org.apache.cxf</groupId>
+                            <groupId>org.apache.cxf</groupId>
                              <artifactId>cxf-xjc-dv</artifactId>
                              <version>${project.version}</version>
                         </dependency>
@@ -358,6 +358,23 @@
                 <groupId>ant</groupId>
                 <artifactId>ant-nodeps</artifactId>
                 <version>1.6.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.servicemix</groupId>
+                <artifactId>servicemix-jbi</artifactId>
+                <version>${servicemix.version}</version>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>servicemix</groupId>
+                        <artifactId>jaxp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>mx4j</groupId>
+                        <artifactId>mx4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml?rev=584999&r1=584998&r2=584999&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml Mon Oct 15 19:27:24 2007
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
-            <version>${servicemix.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -117,10 +117,4 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi</developerConnection>
   </scm>
 
-    <repositories>
-        <repository>
-            <id>apache-incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
 </project>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml?rev=584999&r1=584998&r2=584999&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml Mon Oct 15 19:27:24 2007
@@ -63,10 +63,8 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
-            <version>${servicemix.version}</version>
+            <scope>provided</scope>
         </dependency>
- 
-     
     </dependencies>
 
     <build>

Modified: incubator/cxf/branches/2.0.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/pom.xml?rev=584999&r1=584998&r2=584999&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/pom.xml Mon Oct 15 19:27:24 2007
@@ -50,8 +50,8 @@
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/wsdl/pizza_service.wsdl</wsdl>
                                     <extraargs>
-                                      <extraarg>-exsh</extraarg>
-                                      <extraarg>true</extraarg>
+                                        <extraarg>-exsh</extraarg>
+                                        <extraarg>true</extraarg>
                                       <extraarg>-V</extraarg>
                                     </extraargs>
                                 </wsdlOption>
@@ -397,12 +397,5 @@
     <properties>
         <surefire.fork.mode>pertest</surefire.fork.mode>
     </properties>
-
-    <repositories>
-        <repository>
-            <id>apache-incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
 
 </project>