cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r903715 - in /cxf/dosgi/trunk/systests2: multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/ multi-bundle/src/test/resources/ single-bundle/src/test/resources/
Date Wed, 27 Jan 2010 16:33:17 GMT
Author: davidb
Date: Wed Jan 27 16:33:16 2010
New Revision: 903715

URL: http://svn.apache.org/viewvc?rev=903715&view=rev
Log:
Optimization to system tests.

Removed:
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/
    cxf/dosgi/trunk/systests2/single-bundle/src/test/resources/
Modified:
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=903715&r1=903714&r2=903715&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
(original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
Wed Jan 27 16:33:16 2010
@@ -56,7 +56,10 @@
                     File fullDir = new File(distroDir, val.substring("file:".length()));
                     bundles.put(i, fullDir.toURI().toASCIIString());
                 } else {
-                    bundles.put(i, val);
+                    if (!val.contains("org.osgi.compendium")) {
+                        // We're skipping that one as it's pulled in explicitly in the test
+                        bundles.put(i, val);
+                    }
                 }
             }
         }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=903715&r1=903714&r2=903715&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
(original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
Wed Jan 27 16:33:16 2010
@@ -45,6 +45,7 @@
         
         List<Option> opts = new ArrayList<Option>();
         opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value(""
+ startLevel));
+        opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
         for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
             opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey()));
         }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=903715&r1=903714&r2=903715&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
(original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
Wed Jan 27 16:33:16 2010
@@ -45,6 +45,7 @@
         
         List<Option> opts = new ArrayList<Option>();
         opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value(""
+ startLevel));
+        opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject());
         for(Map.Entry<Integer, String> entry : bundles.entrySet()) {
             opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey()));
         }



Mime
View raw message