From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 10 Dec 2011 16:13:21 +0000 (+0000)
Subject: Fix OSGi boot
X-Git-Tag: argeo-commons-2.1.30~1048
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=aacd48dc5f6d3e748e9dd8058b19beac5b367939;p=lgpl%2Fargeo-commons.git

Fix OSGi boot
Fix depednencies

git-svn-id: https://svn.argeo.org/commons/trunk@4944 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
index 029801b2e..94fccdcee 100644
--- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
@@ -94,10 +94,11 @@ public class OsgiBoot {
 	 * (last part of the URL). The goal is to stay closer from Eclipse PDE way
 	 * of installing target platform bundles.
 	 */
-	private boolean installInLexicographicOrder = Boolean.valueOf(
-			System.getProperty(
-					PROP_ARGEO_OSGI_BOOT_INSTALL_IN_LEXICOGRAPHIC_ORDER,
-					"false")).booleanValue();;
+	private boolean installInLexicographicOrder = Boolean
+			.valueOf(
+					System.getProperty(
+							PROP_ARGEO_OSGI_BOOT_INSTALL_IN_LEXICOGRAPHIC_ORDER,
+							"true")).booleanValue();;
 
 	/** Default is 10s (set in constructor) */
 	private long defaultTimeout;
@@ -793,6 +794,14 @@ public class OsgiBoot {
 		this.modulesUrlSeparator = modulesUrlSeparator;
 	}
 
+	public boolean isExcludeSvn() {
+		return excludeSvn;
+	}
+
+	public void setExcludeSvn(boolean excludeSvn) {
+		this.excludeSvn = excludeSvn;
+	}
+
 	/*
 	 * INTERNAL CLASSES
 	 */
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
index 198547850..19fc12eea 100644
--- a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
@@ -35,6 +35,7 @@ public class OsgiBootNoRuntimeTest extends TestCase {
 				+ "/myotherdir/myotherfile";
 
 		OsgiBoot osgiBoot = new OsgiBoot(null);
+		osgiBoot.setExcludeSvn(true);
 		List urls = osgiBoot.getLocationsUrls(baseUrl, locations);
 		assertEquals(2, urls.size());
 		assertEquals("file:/mydir/myfile", urls.get(0));
@@ -46,6 +47,7 @@ public class OsgiBootNoRuntimeTest extends TestCase {
 		String baseUrl = "file:";
 		String bundles = BUNDLES;
 		OsgiBoot osgiBoot = new OsgiBoot(null);
+		osgiBoot.setExcludeSvn(true);
 		List urls = osgiBoot.getBundlesUrls(baseUrl, bundles);
 		for (int i = 0; i < urls.size(); i++)
 			System.out.println(urls.get(i));
diff --git a/pom.xml b/pom.xml
index db30af814..d9930cd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<packaging>pom</packaging>
 	<properties>
 		<developmentCycle>0.3</developmentCycle>
-		<version.argeo-distribution>1.1.6-SNAPSHOT</version.argeo-distribution>
+		<version.argeo-distribution>1.1.6</version.argeo-distribution>
 		<version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
 		<version.equinox>3.6.2</version.equinox>
 		<!-- maven -->
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 33352351d..a8073c02e 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -116,14 +116,14 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.context.support</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.springframework</groupId> -->
+<!-- 			<artifactId>org.springframework.orm</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.springframework</groupId> -->
+<!-- 			<artifactId>org.springframework.jdbc</artifactId> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.jms</artifactId>