servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r701303 - in /servicemix/smx4/kernel/trunk: ./ assembly/src/main/distribution/text/etc/ main/src/main/resources/ testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/ testing/support/src/main/resources/org/apache/service...
Date Fri, 03 Oct 2008 05:32:39 GMT
Author: gertv
Date: Thu Oct  2 22:32:39 2008
New Revision: 701303

URL: http://svn.apache.org/viewvc?rev=701303&view=rev
Log:
SMX4-126: Upgrading to Felix 1.2.1 fixes Dynamic-Imports

Modified:
    servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
    servicemix/smx4/kernel/trunk/main/src/main/resources/config.properties
    servicemix/smx4/kernel/trunk/pom.xml
    servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
    servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties?rev=701303&r1=701302&r2=701303&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
Thu Oct  2 22:32:39 2008
@@ -20,8 +20,8 @@
 #
 # Framework config properties.
 #
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
+org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
+ org.osgi.service.packageadmin; version=1.1.0, \
  org.osgi.service.startlevel; version=1.0.0, \
  org.osgi.service.url; version=1.0.0, \
  org.apache.servicemix.kernel.main.spi; version=1.0.0, \

Modified: servicemix/smx4/kernel/trunk/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/resources/config.properties?rev=701303&r1=701302&r2=701303&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/resources/config.properties (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/resources/config.properties Thu Oct  2 22:32:39
2008
@@ -18,9 +18,9 @@
 #
 # Framework config properties.
 #
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
+org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
  org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
  org.osgi.util.tracker; version=1.3.2 \
  ${jre-${java.specification.version}}

Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=701303&r1=701302&r2=701303&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Thu Oct  2 22:32:39 2008
@@ -68,13 +68,13 @@
         <commons.io.version>1.3.2_1</commons.io.version>
         <commons.logging.version>1.1.1</commons.logging.version>
         <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
-        <felix.configadmin.version>1.0.0</felix.configadmin.version>
-        <felix.main.version>1.0.4</felix.main.version>
+        <felix.configadmin.version>1.0.4</felix.configadmin.version>
+        <felix.main.version>1.2.1</felix.main.version>
         <felix.plugin.version>1.4.1</felix.plugin.version>
-        <felix.framework.version>1.0.4</felix.framework.version>
-        <felix.osgi.version>1.0.1</felix.osgi.version>
-        <felix.compendium.version>1.0.1</felix.compendium.version>
-        <felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
+        <felix.framework.version>1.2.1</felix.framework.version>
+        <felix.osgi.version>1.2.0</felix.osgi.version>
+        <felix.compendium.version>1.2.0</felix.compendium.version>
+        <felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>
         <felix.prefs.version>1.0.2</felix.prefs.version>
         <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
         <gshell.version>1.0-alpha-2-r654638</gshell.version>

Modified: servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java?rev=701303&r1=701302&r2=701303&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
(original)
+++ servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
Thu Oct  2 22:32:39 2008
@@ -16,16 +16,12 @@
  */
 package org.apache.servicemix.kernel.testing.itests;
 
-import java.util.Properties;
-
 import javax.xml.stream.XMLInputFactory;
 
 import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
 
 public class SimpleTest extends AbstractIntegrationTest {
 
-    private Properties dependencies;
-
     /**
 	 * The manifest to use for the "virtual bundle" created
 	 * out of the test classes and resources in this project
@@ -59,19 +55,22 @@
 	}
 
     public void testWoodstox() throws Exception {
-        Thread.currentThread().setContextClassLoader(XMLInputFactory.class.getClassLoader());
-        System.err.println(XMLInputFactory.class.getClassLoader());
-        System.err.println(getClass().getClassLoader());
-        XMLInputFactory factory = null;
-        try {
-            factory = XMLInputFactory.newInstance();
-            fail("Factory should not have been found");
-        } catch (Throwable t) {
-            System.err.println(t.getMessage());
+        //JDK 1.6 and above ship with a StaX implementation 
+        if (System.getProperty("java.version").startsWith("1.5")) {
+            Thread.currentThread().setContextClassLoader(XMLInputFactory.class.getClassLoader());
+            System.err.println(XMLInputFactory.class.getClassLoader());
+            System.err.println(getClass().getClassLoader());
+            XMLInputFactory factory = null;
+            try {
+                factory = XMLInputFactory.newInstance();
+                fail("Factory should not have been found");
+            } catch (Throwable t) {
+                System.err.println(t.getMessage());
+            }
+            assertNull(factory);
+            installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox",
null, "jar");
+            assertNotNull(XMLInputFactory.newInstance());
         }
-        assertNull(factory);
-        installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox",
null, "jar");
-        assertNotNull(XMLInputFactory.newInstance());
     }
 
 }

Modified: servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties?rev=701303&r1=701302&r2=701303&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
(original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
Thu Oct  2 22:32:39 2008
@@ -20,9 +20,9 @@
 #
 # Framework config properties.
 #
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
+org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
  org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
  org.apache.servicemix.kernel.main.spi, \
  com.sun.management, \



Mime
View raw message