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 2009/01/05 16:40:11 UTC
svn commit: r731600 - in /servicemix/smx4/kernel/trunk: ./
gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/
gshell/gshell-core/ gshell/gshell-core/src/main/resources/META-INF/spring/
gshell/gshell-features/src/test/java/org/apache/servicemi...
Author: gnodet
Date: Mon Jan 5 07:40:11 2009
New Revision: 731600
URL: http://svn.apache.org/viewvc?rev=731600&view=rev
Log:
SMX4KNL-147, SMX4KNL-167, SMX4KNL-168: upgrade to spring-dm 1.2.0-m2, spring-2.5.6, downgrade to junit-3.8.2
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
servicemix/smx4/kernel/trunk/testing/support/src/test/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTestTest.java
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java Mon Jan 5 07:40:11 2009
@@ -18,16 +18,11 @@
import java.io.File;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.apache.servicemix.jpm.impl.ScriptUtils;
+import junit.framework.TestCase;
-public class ProcessTest {
+public class ProcessTest extends TestCase {
- @Test
public void testCreate() throws Exception {
String javaPath = new File(System.getProperty("java.home"), "bin/java" + (ScriptUtils.isWindows() ? ".exe" : "")).getCanonicalPath();
System.err.println(javaPath);
@@ -60,8 +55,8 @@
}
/*
- @Test
- @Ignore("When the process creation fails, no error is reported by the script")
+ * When the process creation fails, no error is reported by the script
+ *
public void testFailure() throws Exception {
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newBuilder();
Process p = builder.command("ec").start();
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Mon Jan 5 07:40:11 2009
@@ -39,9 +39,11 @@
<properties>
<gshell.osgi.import>
+ org.springframework.aop,
org.springframework.aop.framework,
org.springframework.beans.factory.annotation,
org.springframework.context.annotation,
+ org.springframework.osgi.service.importer,
org.aopalliance.aop,
org.apache.commons.vfs.provider.temp,
org.apache.commons.vfs.provider.ram,
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml Mon Jan 5 07:40:11 2009
@@ -19,12 +19,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ctx="http://www.springframework.org/schema/context"
xmlns:osgi="http://www.springframework.org/schema/osgi"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/osgi
@@ -59,14 +62,14 @@
<osgi:service ref="localShell" interface="org.apache.geronimo.gshell.shell.Shell">
</osgi:service>
- <osgix:property-placeholder persistent-id="org.apache.servicemix.shell">
- <osgix:default-properties>
- <prop key="startLocalConsole">true</prop>
- <prop key="startRemoteShell">true</prop>
- <prop key="sshPort">8101</prop>
- <prop key="sshRealm">servicemix</prop>
- <prop key="hostKey">${servicemix.base}/etc/host.key</prop>
- </osgix:default-properties>
- </osgix:property-placeholder>
+ <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.shell">
+ <prop key="startLocalConsole">true</prop>
+ <prop key="startRemoteShell">true</prop>
+ <prop key="sshPort">8101</prop>
+ <prop key="sshRealm">servicemix</prop>
+ <prop key="hostKey">${servicemix.base}/etc/host.key</prop>
+ </osgix:cm-properties>
+
+ <ctx:property-placeholder properties-ref="cmProps" />
</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java Mon Jan 5 07:40:11 2009
@@ -20,18 +20,16 @@
import java.io.InputStream;
import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-import org.junit.Test;
import org.apache.servicemix.kernel.gshell.features.internal.FeaturesServiceImpl;
import org.easymock.EasyMock;
import org.osgi.service.prefs.PreferencesService;
import org.osgi.service.prefs.Preferences;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
+import junit.framework.TestCase;
-public class FeaturesServiceTest {
+public class FeaturesServiceTest extends TestCase {
- @Test
public void testInstallFeature() throws Exception {
URI uri = getClass().getResource("repo2.xml").toURI();
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java Mon Jan 5 07:40:11 2009
@@ -18,14 +18,12 @@
import java.net.URI;
-import static org.junit.Assert.*;
-import org.junit.Test;
import org.apache.servicemix.kernel.gshell.features.internal.RepositoryImpl;
+import junit.framework.TestCase;
-public class RepositoryTest {
+public class RepositoryTest extends TestCase {
- @Test
public void testLoad() throws Exception {
RepositoryImpl r = new RepositoryImpl(getClass().getResource("repo1.xml").toURI());
// Check repo
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Jan 5 07:40:11 2009
@@ -86,7 +86,7 @@
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<gshell.version>1.0-alpha-2-SNAPSHOT</gshell.version>
<jaxp.ri.version>1.4.2_1-SNAPSHOT</jaxp.ri.version>
- <junit.version>4.4_1</junit.version>
+ <junit.version>3.8.2_1-SNAPSHOT</junit.version>
<jline.version>0.9.94_1-SNAPSHOT</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.7_1-SNAPSHOT</mina.version>
@@ -95,8 +95,8 @@
<pax.url.version>0.3.2</pax.url.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.2-SNAPSHOT</servicemix.specs.version>
- <spring.osgi.version>1.1.0</spring.osgi.version>
- <spring.version>2.5.5</spring.version>
+ <spring.osgi.version>1.2.0-m2</spring.osgi.version>
+ <spring.version>2.5.6</spring.version>
<sshd.version>0.1</sshd.version>
<woodstox.version>3.2.7_1</woodstox.version>
</properties>
@@ -150,6 +150,19 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <!-- Spring milestones repository -->
+ <!-- TODO: remove this repo when spring-dm 1.2.0 is out -->
+ <repository>
+ <id>spring-milestone</id>
+ <name>Spring Portfolio Milestone Repository</name>
+ <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
Modified: servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java (original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java Mon Jan 5 07:40:11 2009
@@ -42,6 +42,7 @@
try {
File f = new File("target/smx4");
f.mkdirs();
+ System.setProperty("servicemix.name", "root");
System.setProperty("servicemix.home", f.getAbsolutePath());
System.setProperty("servicemix.base", f.getAbsolutePath());
System.setProperty("org.apache.servicemix.filemonitor.configDir", new File(f, "etc").getAbsolutePath());
Modified: servicemix/smx4/kernel/trunk/testing/support/src/test/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTestTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/test/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTestTest.java?rev=731600&r1=731599&r2=731600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/test/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTestTest.java (original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/test/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTestTest.java Mon Jan 5 07:40:11 2009
@@ -16,14 +16,11 @@
*/
package org.apache.servicemix.kernel.testing.support;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
+import junit.framework.TestCase;
-public class AbstractIntegrationTestTest {
- @Test
+public class AbstractIntegrationTestTest extends TestCase {
+
public void testSnapshotVersion() {
assertTrue(AbstractIntegrationTest.isTimestamped("0.9.0-20070713.230317-1"));
assertTrue(AbstractIntegrationTest.isSnapshot("0.9.0-SNAPSHOT"));