Return-Path: 
 <commits-return-6921-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 88142 invoked from network); 9 Jan 2009 16:32:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Jan 2009 16:32:32 -0000
Received: (qmail 30878 invoked by uid 500); 9 Jan 2009 16:32:32 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 30769 invoked by uid 500); 9 Jan 2009 16:32:32 -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 30760 invoked by uid 99); 9 Jan 2009 16:32:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jan 2009 08:32:32 -0800
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, 09 Jan 2009 16:32:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 487962388995; Fri,  9 Jan 2009 08:32:08 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r733075 - in /cxf/sandbox/dosgi: parent/
 samples/greeter/client/
 samples/greeter/impl/ systests/ systests/basic/
 systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/
 systests/equinox_libs/ systests/equinox_libs/3.5m4/
Date: Fri, 09 Jan 2009 16:32:07 -0000
To: commits@cxf.apache.org
From: davidb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090109163208.487962388995@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: davidb
Date: Fri Jan  9 08:32:07 2009
New Revision: 733075

URL: http://svn.apache.org/viewvc?rev=733075&view=rev
Log:
Switched to Equinox for the system tests as Felix 1.4.1 currently doesn't work with spring-osgi-test.
Since Equinox is not available via Maven, the jar file was temporarily checked in with the system tests. Filed CXF-1966 to keep track of this issue.

Added:
    cxf/sandbox/dosgi/systests/equinox_libs/
    cxf/sandbox/dosgi/systests/equinox_libs/3.5m4/
    cxf/sandbox/dosgi/systests/equinox_libs/3.5m4/org.eclipse.osgi_3.5.0.v20081201-1815.jar   (with props)
Modified:
    cxf/sandbox/dosgi/parent/pom.xml
    cxf/sandbox/dosgi/samples/greeter/client/pom.xml
    cxf/sandbox/dosgi/samples/greeter/impl/pom.xml
    cxf/sandbox/dosgi/systests/basic/pom.xml
    cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
    cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
    cxf/sandbox/dosgi/systests/pom.xml

Modified: cxf/sandbox/dosgi/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/parent/pom.xml?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/parent/pom.xml (original)
+++ cxf/sandbox/dosgi/parent/pom.xml Fri Jan  9 08:32:07 2009
@@ -17,6 +17,7 @@
 
     <properties>
         <cxf.version>2.2-SNAPSHOT</cxf.version>
+        <felix.version>1.4.1</felix.version>
         <spring.version>2.5.5</spring.version>
         <spring.osgi.version>1.1.2</spring.osgi.version>
 

Modified: cxf/sandbox/dosgi/samples/greeter/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/client/pom.xml?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/greeter/client/pom.xml (original)
+++ cxf/sandbox/dosgi/samples/greeter/client/pom.xml Fri Jan  9 08:32:07 2009
@@ -39,9 +39,9 @@
     
     <dependencies>
         <dependency>
-   	   <groupId>org.apache.cxf</groupId>
-	   <artifactId>cxf-bundle-minimal</artifactId>
-	   <version>${cxf.version}</version>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-bundle-minimal</artifactId>
+            <version>${cxf.version}</version>
         </dependency>
         <dependency> 
             <groupId>org.apache.cxf</groupId>
@@ -51,7 +51,7 @@
         <dependency> 
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>1.1.0-cxf_dosgi-SNAPSHOT</version>
+            <version>${felix.version}</version>
         </dependency> 
         <dependency>
            <groupId>junit</groupId>

Modified: cxf/sandbox/dosgi/samples/greeter/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/impl/pom.xml?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/greeter/impl/pom.xml (original)
+++ cxf/sandbox/dosgi/samples/greeter/impl/pom.xml Fri Jan  9 08:32:07 2009
@@ -40,8 +40,8 @@
     <dependencies>
         <dependency> 
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>1.1.0-cxf_dosgi-SNAPSHOT</version>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.2.0</version>
         </dependency> 
         <dependency> 
             <groupId>org.apache.cxf</groupId>

Modified: cxf/sandbox/dosgi/systests/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/pom.xml?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/basic/pom.xml (original)
+++ cxf/sandbox/dosgi/systests/basic/pom.xml Fri Jan  9 08:32:07 2009
@@ -41,21 +41,28 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-impl</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency> 
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-client</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.apache.felix.framework</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency> 
-        <dependency> 
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
-            <version>${project.version}</version>
-        </dependency>  
         <dependency>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
-           <scope>test</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies> 
 

Modified: cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java (original)
+++ cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java Fri Jan  9 08:32:07 2009
@@ -36,15 +36,8 @@
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ManagedService;
-import org.springframework.osgi.test.platform.Platforms;
 
 public class BasicPublishHookTest extends AbstractIntegrationTest  {
-
-        
-    protected String getPlatformName() {
-        return Platforms.FELIX;
-    }
-    
     protected Manifest getManifest() {
         // let the testing framework create/load the manifest
         Manifest mf = super.getManifest();

Modified: cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java (original)
+++ cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java Fri Jan  9 08:32:07 2009
@@ -18,13 +18,12 @@
   */
 package org.apache.cxf.dosgi.systests.basic;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 import java.util.jar.Manifest;
 
-
 import org.apache.cxf.aegis.databinding.AegisDatabinding;
 import org.apache.cxf.dosgi.samples.greeter.GreeterException;
 import org.apache.cxf.dosgi.samples.greeter.GreeterService;
@@ -36,16 +35,10 @@
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
-import org.springframework.osgi.test.platform.Platforms;
 
-public class ListenerHookServiceListenerTest extends AbstractIntegrationTest  {
-        
+public class ListenerHookServiceListenerTest extends AbstractIntegrationTest  {       
     private FutureTask<Map<GreetingPhrase, String>> task;
-    
-    protected String getPlatformName() {
-        return Platforms.FELIX;
-    }
-    
+        
     protected Manifest getManifest() {
         // let the testing framework create/load the manifest
         Manifest mf = super.getManifest();

Added: cxf/sandbox/dosgi/systests/equinox_libs/3.5m4/org.eclipse.osgi_3.5.0.v20081201-1815.jar
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/equinox_libs/3.5m4/org.eclipse.osgi_3.5.0.v20081201-1815.jar?rev=733075&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cxf/sandbox/dosgi/systests/equinox_libs/3.5m4/org.eclipse.osgi_3.5.0.v20081201-1815.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cxf/sandbox/dosgi/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/pom.xml?rev=733075&r1=733074&r2=733075&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/pom.xml (original)
+++ cxf/sandbox/dosgi/systests/pom.xml Fri Jan  9 08:32:07 2009
@@ -35,14 +35,21 @@
 
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
-        <osgi.test.platform>org.springframework.osgi.test.platform.FelixPlatform</osgi.test.platform>
+        <osgi.test.platform>org.springframework.osgi.test.platform.EquinoxPlatform</osgi.test.platform>
         <servicemix.kernel.version>1.0.0</servicemix.kernel.version>
         <servicemix.depends.plugin.version>1.0.0-rc1</servicemix.depends.plugin.version>
     </properties>
     
     <dependencies>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.5m4</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/${topDirectoryLocation}/systests/equinox_libs/3.5m4/org.eclipse.osgi_3.5.0.v20081201-1815.jar</systemPath>
+        </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.servicemix.kernel.testing</groupId>
             <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
             <version>1.0.0</version>
@@ -53,20 +60,21 @@
                     <artifactId>orgi_R4_core</artifactId>
                 </exclusion>
                 <exclusion>
-                   <groupId>org.apache.felix</groupId>
-                   <artifactId>org.apache.felix.framework</artifactId>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.apache.felix.framework</artifactId>
                 </exclusion>
                 <exclusion>
-                   <groupId>org.apache.felix</groupId>
-                   <artifactId>org.apache.felix.main</artifactId>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.apache.felix.main</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.springframework.osgi</groupId>
                 </exclusion>
-                
+
             </exclusions>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
@@ -86,7 +94,7 @@
                  <artifactId>org.apache.felix.bundlerepository</artifactId>
                </exclusion>
              </exclusions>
-        </dependency>  
+           </dependency> -->
 
 
         <dependency>
@@ -100,16 +108,16 @@
             <version>${project.version}</version>
         </dependency> 
         <dependency>
-   	   <groupId>org.apache.cxf</groupId>
-	   <artifactId>cxf-bundle-minimal</artifactId>
-	   <version>${cxf.version}</version>
-           <exclusions>
-               <exclusion>
-                 <groupId>xalan</groupId>
-                 <artifactId>xalan</artifactId>
-               </exclusion>
-          </exclusions>
-       </dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-bundle-minimal</artifactId>
+            <version>${cxf.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
        <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-core</artifactId>