X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi%2Fruntime%2Forg.argeo.osgi.boot%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fosgi%2Fboot%2FOsgiBoot.java;h=6b51038718bb28e35cd14b830c56ded2669e1506;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=029801b2e2932cc12831933e7cb49cc5610cc31d;hpb=8c645414f508739725b57436d694e3a3d3372df6;p=lgpl%2Fargeo-commons.git

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..6b5103871 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Mathieu Baudier
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.osgi.boot;
 
 import java.io.BufferedReader;
@@ -94,10 +93,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;
@@ -635,10 +635,11 @@ public class OsgiBoot {
 			File baseDir = new File(base.replace('/', File.separatorChar));
 			File[] files = baseDir.listFiles();
 
-			if (files == null && debug) {
-				OsgiBootUtils.warn("Base dir " + baseDir
-						+ " has no children, exists=" + baseDir.exists()
-						+ ", isDirectory=" + baseDir.isDirectory());
+			if (files == null) {
+				if (debug)
+					OsgiBootUtils.warn("Base dir " + baseDir
+							+ " has no children, exists=" + baseDir.exists()
+							+ ", isDirectory=" + baseDir.isDirectory());
 				return;
 			}
 
@@ -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
 	 */