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 029801b2e2932cc12831933e7cb49cc5610cc31d..94fccdcee2058cfa913c3f5f97194a8aaeb98175 100644 (file)
--- 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 19854785095aa93db08e6b4fbb7ab5866ad95a73..19fc12eea2aba7d4b90442eb878eb9eda9365a51 100644 (file)
--- 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 db30af814b5b05f6175bb45261cd582d86e8be00..d9930cd8b89adb090ef114b05a921ade25bdc04b 100644 (file)
--- 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 33352351d0000fcadbd5fdbf485bf3beb7d09dee..a8073c02e6e1ede9fe8c09512dce7c560b10eacd 100644 (file)
--- 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>