You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/12/20 22:39:29 UTC
svn commit: r606034 - in /servicemix/smx4/runtime/trunk: ./
gshell/gshell-core/src/main/resources/META-INF/spring/
gshell/gshell-features/src/main/resources/META-INF/spring/ testing/support/
testing/support/src/main/java/org/apache/servicemix/runtime/t...
Author: gnodet
Date: Thu Dec 20 13:39:26 2007
New Revision: 606034
URL: http://svn.apache.org/viewvc?rev=606034&view=rev
Log:
Switch to spring-osgi 1.0-rc1
Modified:
servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
servicemix/smx4/runtime/trunk/pom.xml
servicemix/smx4/runtime/trunk/testing/support/pom.xml
servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=606034&r1=606033&r2=606034&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml Thu Dec 20 13:39:26 2007
@@ -30,7 +30,7 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
<osgi:list id="commands" interface="org.apache.geronimo.gshell.command.Command">
<osgi:listener ref="commandRegistry" bind-method="register" unbind-method="unregister" />
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml?rev=606034&r1=606033&r2=606034&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml Thu Dec 20 13:39:26 2007
@@ -30,7 +30,7 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
<bean id="addUrl" class="org.apache.servicemix.gshell.features.internal.commands.AddUrlCommand" />
Modified: servicemix/smx4/runtime/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/pom.xml?rev=606034&r1=606033&r2=606034&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/pom.xml Thu Dec 20 13:39:26 2007
@@ -80,7 +80,7 @@
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6-r602102</mina.version>
<pax.logging.version>1.0-RC2</pax.logging.version>
- <spring.osgi.version>1.0-m3</spring.osgi.version>
+ <spring.osgi.version>1.0-rc1</spring.osgi.version>
<spring.version>2.5</spring.version>
<xstream.version>1.2.2</xstream.version>
</properties>
Modified: servicemix/smx4/runtime/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/support/pom.xml?rev=606034&r1=606033&r2=606034&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/testing/support/pom.xml Thu Dec 20 13:39:26 2007
@@ -94,6 +94,10 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>asm.osgi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>junit.osgi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java?rev=606034&r1=606033&r2=606034&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java (original)
+++ servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java Thu Dec 20 13:39:26 2007
@@ -27,9 +27,9 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
-import org.springframework.core.io.Resource;
import org.springframework.core.io.FileSystemResource;
-import org.springframework.osgi.internal.util.concurrent.Counter;
+import org.springframework.core.io.Resource;
+import org.springframework.osgi.extender.internal.util.concurrent.Counter;
import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
import org.springframework.osgi.test.provisioning.ArtifactLocator;
import org.springframework.osgi.util.OsgiFilterUtils;