Move to Commons Base
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 17 Jul 2012 12:33:41 +0000 (12:33 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 17 Jul 2012 12:33:41 +0000 (12:33 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@5481 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

46 files changed:
base/runtime/org.argeo.osgi.boot/.classpath [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/.project [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/build.properties [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/pom.xml [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java [new file with mode: 0644]
base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java [new file with mode: 0644]
osgi/runtime/org.argeo.osgi.boot/.classpath [deleted file]
osgi/runtime/org.argeo.osgi.boot/.project [deleted file]
osgi/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs [deleted file]
osgi/runtime/org.argeo.osgi.boot/build.properties [deleted file]
osgi/runtime/org.argeo.osgi.boot/pom.xml [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java [deleted file]
osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java [deleted file]

diff --git a/base/runtime/org.argeo.osgi.boot/.classpath b/base/runtime/org.argeo.osgi.boot/.classpath
new file mode 100644 (file)
index 0000000..2f7e966
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/base/runtime/org.argeo.osgi.boot/.project b/base/runtime/org.argeo.osgi.boot/.project
new file mode 100644 (file)
index 0000000..e145e96
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.osgi.boot</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>
diff --git a/base/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs b/base/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..ba812fb
--- /dev/null
@@ -0,0 +1,12 @@
+#Fri Jun 26 11:15:56 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/base/runtime/org.argeo.osgi.boot/build.properties b/base/runtime/org.argeo.osgi.boot/build.properties
new file mode 100644 (file)
index 0000000..f17a582
--- /dev/null
@@ -0,0 +1 @@
+additional.bundles = junit
diff --git a/base/runtime/org.argeo.osgi.boot/pom.xml b/base/runtime/org.argeo.osgi.boot/pom.xml
new file mode 100644 (file)
index 0000000..be34419
--- /dev/null
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.commons.osgi</groupId>
+               <version>1.1.4-SNAPSHOT</version>
+               <artifactId>runtime</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.osgi.boot</artifactId>
+       <packaging>jar</packaging>
+       <name>Commons OSGi Boot</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <configuration>
+                                       <source>1.4</source>
+                                       <target>1.4</target>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Activator>org.argeo.osgi.boot.Activator</Bundle-Activator>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
+                                               <Import-Package>org.eclipse.*;resolution:=optional,*</Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
+               <!-- TEST -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java
new file mode 100644 (file)
index 0000000..76ff70e
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.osgi.boot;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * An OSGi configurator. See <a
+ * href="http://wiki.eclipse.org/Configurator">http:
+ * //wiki.eclipse.org/Configurator</a>
+ */
+public class Activator implements BundleActivator {
+
+       public void start(final BundleContext bundleContext) throws Exception {
+               // admin thread
+               Thread adminThread = new AdminThread(bundleContext);
+               adminThread.start();
+
+               // bootstrap
+               OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
+               osgiBoot.bootstrap();
+       }
+
+       public void stop(BundleContext context) throws Exception {
+       }
+}
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java
new file mode 100644 (file)
index 0000000..9b3c9eb
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.osgi.boot;
+
+import java.io.File;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.launch.Framework;
+
+/** Monitors the runtime and can shut it down. */
+public class AdminThread extends Thread {
+       public final static String PROP_ARGEO_OSGI_SHUTDOWN_FILE = "argeo.osgi.shutdownFile";
+       private File shutdownFile;
+       private final BundleContext bundleContext;
+
+       public AdminThread(BundleContext bundleContext) {
+               super("OSGi Boot Admin");
+               this.bundleContext = bundleContext;
+               if (System.getProperty(PROP_ARGEO_OSGI_SHUTDOWN_FILE) != null) {
+                       shutdownFile = new File(
+                                       System.getProperty(PROP_ARGEO_OSGI_SHUTDOWN_FILE));
+                       if (!shutdownFile.exists()) {
+                               shutdownFile = null;
+                               OsgiBootUtils.warn("Shutdown file " + shutdownFile
+                                               + " not found, feature deactivated");
+                       }
+               }
+       }
+
+       public void run() {
+               if (shutdownFile != null) {
+                       // wait for file to be removed
+                       while (shutdownFile.exists()) {
+                               try {
+                                       Thread.sleep(1000);
+                               } catch (InterruptedException e) {
+                                       e.printStackTrace();
+                               }
+                       }
+
+                       Framework framework = (Framework) bundleContext.getBundle(0);
+                       try {
+                               // shutdown framework
+                               framework.stop();
+                               // wait 10 mins for shutdown
+                               framework.waitForStop(10 * 60 * 1000);
+                               // close VM
+                               System.exit(0);
+                       } catch (Exception e) {
+                               e.printStackTrace();
+                               System.exit(1);
+                       }
+               }
+       }
+}
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java
new file mode 100644 (file)
index 0000000..4d08b76
--- /dev/null
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.osgi.boot;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Vector;
+
+import org.eclipse.core.runtime.adaptor.EclipseStarter;
+import org.osgi.framework.BundleContext;
+
+/** Command line interface. */
+public class Launcher {
+
+       public static void main(String[] args) {
+               // Try to load system properties
+               String systemPropertiesFilePath = OsgiBootUtils
+                               .getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_SYSTEM_PROPERTIES_FILE);
+               if (systemPropertiesFilePath != null) {
+                       FileInputStream in;
+                       try {
+                               in = new FileInputStream(systemPropertiesFilePath);
+                               System.getProperties().load(in);
+                       } catch (IOException e1) {
+                               throw new RuntimeException(
+                                               "Cannot load system properties from "
+                                                               + systemPropertiesFilePath, e1);
+                       }
+                       if (in != null) {
+                               try {
+                                       in.close();
+                               } catch (Exception e) {
+                                       // silent
+                               }
+                       }
+               }
+
+               // Start main class
+               startMainClass();
+
+               // Start Equinox
+               BundleContext bundleContext = null;
+               try {
+                       bundleContext = EclipseStarter.startup(args, null);
+               } catch (Exception e) {
+                       throw new RuntimeException("Cannot start Equinox.", e);
+               }
+
+               // OSGi bootstrap
+               OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
+               osgiBoot.bootstrap();
+       }
+
+       protected static void startMainClass() {
+               String className = OsgiBootUtils
+                               .getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_APPCLASS);
+               if (className == null)
+                       return;
+
+               String line = System.getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_APPARGS,
+                               "");
+
+               String[] uiArgs = readArgumentsFromLine(line);
+
+               try {
+                       // Launch main method using reflection
+                       Class clss = Class.forName(className);
+                       Class[] mainArgsClasses = new Class[] { uiArgs.getClass() };
+                       Object[] mainArgs = { uiArgs };
+                       Method mainMethod = clss.getMethod("main", mainArgsClasses);
+                       mainMethod.invoke(null, mainArgs);
+               } catch (Exception e) {
+                       throw new RuntimeException("Cannot start main class.", e);
+               }
+
+       }
+
+       /**
+        * Transform a line into an array of arguments, taking "" as single
+        * arguments. (nested \" are not supported)
+        */
+       private static String[] readArgumentsFromLine(String lineOrig) {
+               String line = lineOrig.trim();// remove trailing spaces
+               List args = new Vector();
+               StringBuffer curr = new StringBuffer("");
+               boolean inQuote = false;
+               char[] arr = line.toCharArray();
+               for (int i = 0; i < arr.length; i++) {
+                       char c = arr[i];
+                       switch (c) {
+                       case '\"':
+                               inQuote = !inQuote;
+                               break;
+                       case ' ':
+                               if (!inQuote) {// otherwise, no break: goes to default
+                                       if (curr.length() > 0) {
+                                               args.add(curr.toString());
+                                               curr = new StringBuffer("");
+                                       }
+                                       break;
+                               }
+                       default:
+                               curr.append(c);
+                               break;
+                       }
+               }
+
+               // Add last arg
+               if (curr.length() > 0) {
+                       args.add(curr.toString());
+                       curr = null;
+               }
+
+               String[] res = new String[args.size()];
+               for (int i = 0; i < args.size(); i++) {
+                       res[i] = args.get(i).toString();
+               }
+               return res;
+       }
+
+}
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java
new file mode 100644 (file)
index 0000000..6b51038
--- /dev/null
@@ -0,0 +1,874 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.osgi.boot;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.argeo.osgi.boot.internal.springutil.AntPathMatcher;
+import org.argeo.osgi.boot.internal.springutil.PathMatcher;
+import org.argeo.osgi.boot.internal.springutil.SystemPropertyUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.ExportedPackage;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+/**
+ * Basic provisioning of an OSGi runtime via file path patterns and system
+ * properties. Java 1.4 compatible.<br>
+ * The approach is to generate list of URLs based on various methods, configured
+ * via system properties.
+ */
+public class OsgiBoot {
+       public final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.osgi.boot";
+       public final static String SYMBOLIC_NAME_EQUINOX = "org.eclipse.osgi";
+
+       public final static String PROP_ARGEO_OSGI_DATA_DIR = "argeo.osgi.data.dir";
+
+       public final static String PROP_ARGEO_OSGI_START = "argeo.osgi.start";
+       public final static String PROP_ARGEO_OSGI_BUNDLES = "argeo.osgi.bundles";
+       public final static String PROP_ARGEO_OSGI_LOCATIONS = "argeo.osgi.locations";
+       public final static String PROP_ARGEO_OSGI_BASE_URL = "argeo.osgi.baseUrl";
+       /** Use org.argeo.osgi */
+       public final static String PROP_ARGEO_OSGI_MODULES_URL = "argeo.osgi.modulesUrl";
+
+       // booleans
+       public final static String PROP_ARGEO_OSGI_BOOT_DEBUG = "argeo.osgi.boot.debug";
+       public final static String PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN = "argeo.osgi.boot.excludeSvn";
+       public final static String PROP_ARGEO_OSGI_BOOT_INSTALL_IN_LEXICOGRAPHIC_ORDER = "argeo.osgi.boot.installInLexicographicOrder";
+
+       public final static String PROP_ARGEO_OSGI_BOOT_DEFAULT_TIMEOUT = "argeo.osgi.boot.defaultTimeout";
+       public final static String PROP_ARGEO_OSGI_BOOT_MODULES_URL_SEPARATOR = "argeo.osgi.boot.modulesUrlSeparator";
+       public final static String PROP_ARGEO_OSGI_BOOT_SYSTEM_PROPERTIES_FILE = "argeo.osgi.boot.systemPropertiesFile";
+       public final static String PROP_ARGEO_OSGI_BOOT_APPCLASS = "argeo.osgi.boot.appclass";
+       public final static String PROP_ARGEO_OSGI_BOOT_APPARGS = "argeo.osgi.boot.appargs";
+
+       public final static String DEFAULT_BASE_URL = "reference:file:";
+       public final static String EXCLUDES_SVN_PATTERN = "**/.svn/**";
+
+       // OSGi system properties
+       public final static String INSTANCE_AREA_PROP = "osgi.instance.area";
+       public final static String INSTANCE_AREA_DEFAULT_PROP = "osgi.instance.area.default";
+
+       private boolean debug = Boolean.valueOf(
+                       System.getProperty(PROP_ARGEO_OSGI_BOOT_DEBUG, "false"))
+                       .booleanValue();
+       /** Exclude svn metadata implicitely(a bit costly) */
+       private boolean excludeSvn = Boolean.valueOf(
+                       System.getProperty(PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN, "false"))
+                       .booleanValue();
+
+       /**
+        * The {@link #installUrls(List)} methods won't follow the list order but
+        * order the urls according to the alphabetical order of the file names
+        * (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,
+                                                       "true")).booleanValue();;
+
+       /** Default is 10s (set in constructor) */
+       private long defaultTimeout;
+
+       /** Default is ',' (set in constructor) */
+       private String modulesUrlSeparator = ",";
+
+       private final BundleContext bundleContext;
+
+       /*
+        * INITIALIZATION
+        */
+       /** Constructor */
+       public OsgiBoot(BundleContext bundleContext) {
+               this.bundleContext = bundleContext;
+               defaultTimeout = Long.parseLong(OsgiBootUtils.getProperty(
+                               PROP_ARGEO_OSGI_BOOT_DEFAULT_TIMEOUT, "10000"));
+               modulesUrlSeparator = OsgiBootUtils.getProperty(
+                               PROP_ARGEO_OSGI_BOOT_MODULES_URL_SEPARATOR, ",");
+               initSystemProperties();
+       }
+
+       /**
+        * Set additional system properties, especially ${argeo.osgi.data.dir} as an
+        * OS file path (and not a file:// URL)
+        */
+       protected void initSystemProperties() {
+               String osgiInstanceArea = System.getProperty(INSTANCE_AREA_PROP);
+               String osgiInstanceAreaDefault = System
+                               .getProperty(INSTANCE_AREA_DEFAULT_PROP);
+               String tempDir = System.getProperty("java.io.tmpdir");
+
+               File dataDir = null;
+               if (osgiInstanceArea != null) {
+                       // within OSGi with -data specified
+                       osgiInstanceArea = removeFilePrefix(osgiInstanceArea);
+                       dataDir = new File(osgiInstanceArea);
+               } else if (osgiInstanceAreaDefault != null) {
+                       // within OSGi without -data specified
+                       osgiInstanceAreaDefault = removeFilePrefix(osgiInstanceAreaDefault);
+                       dataDir = new File(osgiInstanceAreaDefault);
+               } else {// outside OSGi
+                       dataDir = new File(tempDir + File.separator + "argeoOsgiData");
+               }
+               System.setProperty(PROP_ARGEO_OSGI_DATA_DIR, dataDir.getAbsolutePath());
+       }
+
+       /*
+        * HIGH-LEVEL METHODS
+        */
+       /** Bootstraps the OSGi runtime */
+       public void bootstrap() {
+               long begin = System.currentTimeMillis();
+               System.out.println();
+               OsgiBootUtils.info("OSGi bootstrap starting...");
+               OsgiBootUtils.info("Writable data directory : "
+                               + System.getProperty(PROP_ARGEO_OSGI_DATA_DIR)
+                               + " (set as system property " + PROP_ARGEO_OSGI_DATA_DIR + ")");
+               installUrls(getBundlesUrls());
+               installUrls(getLocationsUrls());
+               installUrls(getModulesUrls());
+               checkUnresolved();
+               startBundles();
+               long duration = System.currentTimeMillis() - begin;
+               OsgiBootUtils.info("OSGi bootstrap completed in "
+                               + Math.round(((double) duration) / 1000) + "s (" + duration
+                               + "ms), " + bundleContext.getBundles().length + " bundles");
+
+               // display packages exported twice
+               if (debug) {
+                       Map /* <String,Set<String>> */duplicatePackages = findPackagesExportedTwice();
+                       if (duplicatePackages.size() > 0) {
+                               OsgiBootUtils.info("Packages exported twice:");
+                               Iterator it = duplicatePackages.keySet().iterator();
+                               while (it.hasNext()) {
+                                       String pkgName = it.next().toString();
+                                       OsgiBootUtils.info(pkgName);
+                                       Set bdles = (Set) duplicatePackages.get(pkgName);
+                                       Iterator bdlesIt = bdles.iterator();
+                                       while (bdlesIt.hasNext())
+                                               OsgiBootUtils.info("  " + bdlesIt.next());
+                               }
+                       }
+               }
+
+               System.out.println();
+       }
+
+       /*
+        * INSTALLATION
+        */
+       /** Install the bundles at this URL list. */
+       public void installUrls(List urls) {
+               Map installedBundles = getBundlesByLocation();
+
+               if (installInLexicographicOrder) {
+                       SortedMap map = new TreeMap();
+                       // reorder
+                       for (int i = 0; i < urls.size(); i++) {
+                               String url = (String) urls.get(i);
+                               int index = url.lastIndexOf('/');
+                               String fileName;
+                               if (index >= 0)
+                                       fileName = url.substring(index + 1);
+                               else
+                                       fileName = url;
+                               map.put(fileName, url);
+                       }
+
+                       // install
+                       Iterator keys = map.keySet().iterator();
+                       while (keys.hasNext()) {
+                               Object key = keys.next();
+                               String url = map.get(key).toString();
+                               installUrl(url, installedBundles);
+                       }
+               } else {
+                       for (int i = 0; i < urls.size(); i++) {
+                               String url = (String) urls.get(i);
+                               installUrl(url, installedBundles);
+                       }
+               }
+
+       }
+
+       /** Actually install the provided URL */
+       protected void installUrl(String url, Map installedBundles) {
+               try {
+                       if (installedBundles.containsKey(url)) {
+                               Bundle bundle = (Bundle) installedBundles.get(url);
+                               // bundle.update();
+                               if (debug)
+                                       debug("Bundle " + bundle.getSymbolicName()
+                                                       + " already installed from " + url);
+                       } else {
+                               Bundle bundle = bundleContext.installBundle(url);
+                               if (debug)
+                                       debug("Installed bundle " + bundle.getSymbolicName()
+                                                       + " from " + url);
+                       }
+               } catch (BundleException e) {
+                       String message = e.getMessage();
+                       if ((message.contains("Bundle \"" + SYMBOLIC_NAME_OSGI_BOOT + "\"") || message
+                                       .contains("Bundle \"" + SYMBOLIC_NAME_EQUINOX + "\""))
+                                       && message.contains("has already been installed")) {
+                               // silent, in order to avoid warnings: we know that both
+                               // have already been installed...
+                       } else {
+                               OsgiBootUtils.warn("Could not install bundle from " + url
+                                               + ": " + message);
+                       }
+                       if (debug)
+                               e.printStackTrace();
+               }
+       }
+
+       /* @deprecated Doesn't seem to be used anymore. */
+       // public void installOrUpdateUrls(Map urls) {
+       // Map installedBundles = getBundles();
+       //
+       // for (Iterator modules = urls.keySet().iterator(); modules.hasNext();) {
+       // String moduleName = (String) modules.next();
+       // String urlStr = (String) urls.get(moduleName);
+       // if (installedBundles.containsKey(moduleName)) {
+       // Bundle bundle = (Bundle) installedBundles.get(moduleName);
+       // InputStream in;
+       // try {
+       // URL url = new URL(urlStr);
+       // in = url.openStream();
+       // bundle.update(in);
+       // OsgiBootUtils.info("Updated bundle " + moduleName
+       // + " from " + urlStr);
+       // } catch (Exception e) {
+       // throw new RuntimeException("Cannot update " + moduleName
+       // + " from " + urlStr);
+       // }
+       // if (in != null)
+       // try {
+       // in.close();
+       // } catch (IOException e) {
+       // e.printStackTrace();
+       // }
+       // } else {
+       // try {
+       // Bundle bundle = bundleContext.installBundle(urlStr);
+       // if (debug)
+       // debug("Installed bundle " + bundle.getSymbolicName()
+       // + " from " + urlStr);
+       // } catch (BundleException e) {
+       // OsgiBootUtils.warn("Could not install bundle from "
+       // + urlStr + ": " + e.getMessage());
+       // }
+       // }
+       // }
+       //
+       // }
+
+       /*
+        * START
+        */
+       public void startBundles() {
+               String bundlesToStart = OsgiBootUtils
+                               .getProperty(PROP_ARGEO_OSGI_START);
+               startBundles(bundlesToStart);
+       }
+
+       /** Convenience method accepting a comma-separated list of bundle to start */
+       public void startBundles(String bundlesToStartStr) {
+               if (bundlesToStartStr == null)
+                       return;
+
+               StringTokenizer st = new StringTokenizer(bundlesToStartStr, ",");
+               List bundlesToStart = new ArrayList();
+               while (st.hasMoreTokens()) {
+                       String name = st.nextToken().trim();
+                       bundlesToStart.add(name);
+               }
+               startBundles(bundlesToStart);
+       }
+
+       /** Start the provided list of bundles */
+       public void startBundles(List bundlesToStart) {
+               if (bundlesToStart.size() == 0)
+                       return;
+
+               // used to log the bundles not found
+               List notFoundBundles = new ArrayList(bundlesToStart);
+
+               Bundle[] bundles = bundleContext.getBundles();
+               long startBegin = System.currentTimeMillis();
+               for (int i = 0; i < bundles.length; i++) {
+                       Bundle bundle = bundles[i];
+                       String symbolicName = bundle.getSymbolicName();
+                       if (bundlesToStart.contains(symbolicName))
+                               try {
+                                       try {
+                                               bundle.start();
+                                               if (debug)
+                                                       debug("Bundle " + symbolicName + " started");
+                                       } catch (Exception e) {
+                                               OsgiBootUtils.warn("Start of bundle " + symbolicName
+                                                               + " failed because of " + e
+                                                               + ", maybe bundle is not yet resolved,"
+                                                               + " waiting and trying again.");
+                                               waitForBundleResolvedOrActive(startBegin, bundle);
+                                               bundle.start();
+                                       }
+                                       notFoundBundles.remove(symbolicName);
+                               } catch (Exception e) {
+                                       OsgiBootUtils.warn("Bundle " + symbolicName
+                                                       + " cannot be started: " + e.getMessage());
+                                       if (debug)
+                                               e.printStackTrace();
+                                       // was found even if start failed
+                                       notFoundBundles.remove(symbolicName);
+                               }
+               }
+
+               for (int i = 0; i < notFoundBundles.size(); i++)
+                       OsgiBootUtils.warn("Bundle " + notFoundBundles.get(i)
+                                       + " not started because it was not found.");
+       }
+
+       /*
+        * DIAGNOSTICS
+        */
+       /** Check unresolved bundles */
+       protected void checkUnresolved() {
+               // Refresh
+               ServiceReference packageAdminRef = bundleContext
+                               .getServiceReference(PackageAdmin.class.getName());
+               PackageAdmin packageAdmin = (PackageAdmin) bundleContext
+                               .getService(packageAdminRef);
+               packageAdmin.resolveBundles(null);
+
+               Bundle[] bundles = bundleContext.getBundles();
+               List /* Bundle */unresolvedBundles = new ArrayList();
+               for (int i = 0; i < bundles.length; i++) {
+                       int bundleState = bundles[i].getState();
+                       if (!(bundleState == Bundle.ACTIVE
+                                       || bundleState == Bundle.RESOLVED || bundleState == Bundle.STARTING))
+                               unresolvedBundles.add(bundles[i]);
+               }
+
+               if (unresolvedBundles.size() != 0) {
+                       OsgiBootUtils.warn("Unresolved bundles " + unresolvedBundles);
+               }
+       }
+
+       /** List packages exported twice. */
+       public Map findPackagesExportedTwice() {
+               ServiceReference paSr = bundleContext
+                               .getServiceReference(PackageAdmin.class.getName());
+               PackageAdmin packageAdmin = (PackageAdmin) bundleContext
+                               .getService(paSr);
+
+               // find packages exported twice
+               Bundle[] bundles = bundleContext.getBundles();
+               Map /* <String,Set<String>> */exportedPackages = new TreeMap();
+               for (int i = 0; i < bundles.length; i++) {
+                       Bundle bundle = bundles[i];
+                       ExportedPackage[] pkgs = packageAdmin.getExportedPackages(bundle);
+                       if (pkgs != null)
+                               for (int j = 0; j < pkgs.length; j++) {
+                                       String pkgName = pkgs[j].getName();
+                                       if (!exportedPackages.containsKey(pkgName)) {
+                                               exportedPackages.put(pkgName, new TreeSet());
+                                       }
+                                       ((Set) exportedPackages.get(pkgName)).add(bundle
+                                                       .getSymbolicName() + "_" + bundle.getVersion());
+                               }
+               }
+               Map /* <String,Set<String>> */duplicatePackages = new TreeMap();
+               Iterator it = exportedPackages.keySet().iterator();
+               while (it.hasNext()) {
+                       String pkgName = it.next().toString();
+                       Set bdles = (Set) exportedPackages.get(pkgName);
+                       if (bdles.size() > 1)
+                               duplicatePackages.put(pkgName, bdles);
+               }
+               return duplicatePackages;
+       }
+
+       /** Waits for a bundle to become active or resolved */
+       protected void waitForBundleResolvedOrActive(long startBegin, Bundle bundle)
+                       throws Exception {
+               int originalState = bundle.getState();
+               if ((originalState == Bundle.RESOLVED)
+                               || (originalState == Bundle.ACTIVE))
+                       return;
+
+               String originalStateStr = OsgiBootUtils.stateAsString(originalState);
+
+               int currentState = bundle.getState();
+               while (!(currentState == Bundle.RESOLVED || currentState == Bundle.ACTIVE)) {
+                       long now = System.currentTimeMillis();
+                       if ((now - startBegin) > defaultTimeout)
+                               throw new Exception("Bundle " + bundle.getSymbolicName()
+                                               + " was not RESOLVED or ACTIVE after "
+                                               + (now - startBegin) + "ms (originalState="
+                                               + originalStateStr + ", currentState="
+                                               + OsgiBootUtils.stateAsString(currentState) + ")");
+
+                       try {
+                               Thread.sleep(100l);
+                       } catch (InterruptedException e) {
+                               // silent
+                       }
+                       currentState = bundle.getState();
+               }
+       }
+
+       /*
+        * EXPLICIT LOCATIONS INSTALLATION
+        */
+       /** Gets the list of resolved explicit URL locations. */
+       public List getLocationsUrls() {
+               String baseUrl = OsgiBootUtils.getProperty(PROP_ARGEO_OSGI_BASE_URL,
+                               DEFAULT_BASE_URL);
+               String bundleLocations = OsgiBootUtils
+                               .getProperty(PROP_ARGEO_OSGI_LOCATIONS);
+               return getLocationsUrls(baseUrl, bundleLocations);
+       }
+
+       /**
+        * Gets a list of URLs based on explicit locations, resolving placeholder
+        * ${...} containing system properties, e.g. ${user.home}.
+        */
+       public List getLocationsUrls(String baseUrl, String bundleLocations) {
+               List urls = new ArrayList();
+
+               if (bundleLocations == null)
+                       return urls;
+               bundleLocations = SystemPropertyUtils
+                               .resolvePlaceholders(bundleLocations);
+               if (debug)
+                       debug(PROP_ARGEO_OSGI_LOCATIONS + "=" + bundleLocations);
+
+               StringTokenizer st = new StringTokenizer(bundleLocations,
+                               File.pathSeparator);
+               while (st.hasMoreTokens()) {
+                       urls.add(locationToUrl(baseUrl, st.nextToken().trim()));
+               }
+               return urls;
+       }
+
+       /*
+        * BUNDLE PATTERNS INSTALLATION
+        */
+       /**
+        * Computes a list of URLs based on Ant-like incluide/exclude patterns
+        * defined by ${argeo.osgi.bundles} with the following format:<br>
+        * <code>/base/directory;in=*.jar;in=**;ex=org.eclipse.osgi_*;jar</code><br>
+        * WARNING: <code>/base/directory;in=*.jar,\</code> at the end of a file,
+        * without a new line causes a '.' to be appended with unexpected side
+        * effects.
+        */
+       public List getBundlesUrls() {
+               String baseUrl = OsgiBootUtils.getProperty(PROP_ARGEO_OSGI_BASE_URL,
+                               DEFAULT_BASE_URL);
+               String bundlePatterns = OsgiBootUtils
+                               .getProperty(PROP_ARGEO_OSGI_BUNDLES);
+               return getBundlesUrls(baseUrl, bundlePatterns);
+       }
+
+       /** Implements the path matching logic */
+       public List getBundlesUrls(String baseUrl, String bundlePatterns) {
+               List urls = new ArrayList();
+               if (bundlePatterns == null)
+                       return urls;
+
+               bundlePatterns = SystemPropertyUtils
+                               .resolvePlaceholders(bundlePatterns);
+               if (debug)
+                       debug(PROP_ARGEO_OSGI_BUNDLES + "=" + bundlePatterns
+                                       + " (excludeSvn=" + excludeSvn + ")");
+
+               StringTokenizer st = new StringTokenizer(bundlePatterns, ",");
+               List bundlesSets = new ArrayList();
+               while (st.hasMoreTokens()) {
+                       bundlesSets.add(new BundlesSet(st.nextToken()));
+               }
+
+               // find included
+               List included = new ArrayList();
+               PathMatcher matcher = new AntPathMatcher();
+               for (int i = 0; i < bundlesSets.size(); i++) {
+                       BundlesSet bundlesSet = (BundlesSet) bundlesSets.get(i);
+                       for (int j = 0; j < bundlesSet.getIncludes().size(); j++) {
+                               String pattern = (String) bundlesSet.getIncludes().get(j);
+                               match(matcher, included, bundlesSet.getDir(), null, pattern);
+                       }
+               }
+
+               // find excluded
+               List excluded = new ArrayList();
+               for (int i = 0; i < bundlesSets.size(); i++) {
+                       BundlesSet bundlesSet = (BundlesSet) bundlesSets.get(i);
+                       for (int j = 0; j < bundlesSet.getExcludes().size(); j++) {
+                               String pattern = (String) bundlesSet.getExcludes().get(j);
+                               match(matcher, excluded, bundlesSet.getDir(), null, pattern);
+                       }
+               }
+
+               // construct list
+               for (int i = 0; i < included.size(); i++) {
+                       String fullPath = (String) included.get(i);
+                       if (!excluded.contains(fullPath))
+                               urls.add(locationToUrl(baseUrl, fullPath));
+               }
+
+               return urls;
+       }
+
+       /*
+        * MODULES LIST INSTALLATION (${argeo.osgi.modulesUrl})
+        */
+       /**
+        * Downloads a list of URLs in CSV format from ${argeo.osgi.modulesUrl}:<br>
+        * <code>Bundle-SymbolicName,Bundle-Version,url</code>)<br>
+        * If ${argeo.osgi.baseUrl} is set, URLs will be considered relative paths
+        * and be concatenated with the base URL, typically the root of a Maven
+        * repository.
+        */
+       public List getModulesUrls() {
+               List urls = new ArrayList();
+               String modulesUrlStr = OsgiBootUtils
+                               .getProperty(PROP_ARGEO_OSGI_MODULES_URL);
+               if (modulesUrlStr == null)
+                       return urls;
+
+               String baseUrl = OsgiBootUtils.getProperty(PROP_ARGEO_OSGI_BASE_URL);
+
+               Map installedBundles = getBundlesBySymbolicName();
+
+               BufferedReader reader = null;
+               try {
+                       URL modulesUrl = new URL(modulesUrlStr);
+                       reader = new BufferedReader(new InputStreamReader(
+                                       modulesUrl.openStream()));
+                       String line = null;
+                       while ((line = reader.readLine()) != null) {
+                               StringTokenizer st = new StringTokenizer(line,
+                                               modulesUrlSeparator);
+                               String moduleName = st.nextToken();
+                               String moduleVersion = st.nextToken();
+                               String url = st.nextToken();
+                               if (baseUrl != null)
+                                       url = baseUrl + url;
+
+                               if (installedBundles.containsKey(moduleName)) {
+                                       Bundle bundle = (Bundle) installedBundles.get(moduleName);
+                                       String bundleVersion = bundle.getHeaders()
+                                                       .get(Constants.BUNDLE_VERSION).toString();
+                                       int comp = OsgiBootUtils.compareVersions(bundleVersion,
+                                                       moduleVersion);
+                                       if (comp > 0) {
+                                               OsgiBootUtils.warn("Installed version " + bundleVersion
+                                                               + " of bundle " + moduleName
+                                                               + " is newer than  provided version "
+                                                               + moduleVersion);
+                                       } else if (comp < 0) {
+                                               urls.add(url);
+                                               OsgiBootUtils.info("Updated bundle " + moduleName
+                                                               + " with version " + moduleVersion
+                                                               + " (old version was " + bundleVersion + ")");
+                                       } else {
+                                               // do nothing
+                                       }
+                               } else {
+                                       urls.add(url);
+                               }
+                       }
+               } catch (Exception e1) {
+                       throw new RuntimeException("Cannot read url " + modulesUrlStr, e1);
+               } finally {
+                       if (reader != null)
+                               try {
+                                       reader.close();
+                               } catch (IOException e) {
+                                       e.printStackTrace();
+                               }
+               }
+               return urls;
+       }
+
+       /*
+        * HIGH LEVEL UTILITIES
+        */
+       /** Actually performs the matching logic. */
+       protected void match(PathMatcher matcher, List matched, String base,
+                       String currentPath, String pattern) {
+               if (currentPath == null) {
+                       // Init
+                       File baseDir = new File(base.replace('/', File.separatorChar));
+                       File[] files = baseDir.listFiles();
+
+                       if (files == null) {
+                               if (debug)
+                                       OsgiBootUtils.warn("Base dir " + baseDir
+                                                       + " has no children, exists=" + baseDir.exists()
+                                                       + ", isDirectory=" + baseDir.isDirectory());
+                               return;
+                       }
+
+                       for (int i = 0; i < files.length; i++)
+                               match(matcher, matched, base, files[i].getName(), pattern);
+               } else {
+                       String fullPath = base + '/' + currentPath;
+                       if (matched.contains(fullPath))
+                               return;// don't try deeper if already matched
+
+                       boolean ok = matcher.match(pattern, currentPath);
+                       // if (debug)
+                       // debug(currentPath + " " + (ok ? "" : " not ")
+                       // + " matched with " + pattern);
+                       if (ok) {
+                               matched.add(fullPath);
+                               return;
+                       } else {
+                               String newFullPath = relativeToFullPath(base, currentPath);
+                               File newFile = new File(newFullPath);
+                               File[] files = newFile.listFiles();
+                               if (files != null) {
+                                       for (int i = 0; i < files.length; i++) {
+                                               String newCurrentPath = currentPath + '/'
+                                                               + files[i].getName();
+                                               if (files[i].isDirectory()) {
+                                                       if (matcher.matchStart(pattern, newCurrentPath)) {
+                                                               // recurse only if start matches
+                                                               match(matcher, matched, base, newCurrentPath,
+                                                                               pattern);
+                                                       } else {
+                                                               if (debug)
+                                                                       debug(newCurrentPath
+                                                                                       + " does not start match with "
+                                                                                       + pattern);
+
+                                                       }
+                                               } else {
+                                                       boolean nonDirectoryOk = matcher.match(pattern,
+                                                                       newCurrentPath);
+                                                       if (debug)
+                                                               debug(currentPath + " " + (ok ? "" : " not ")
+                                                                               + " matched with " + pattern);
+                                                       if (nonDirectoryOk)
+                                                               matched.add(relativeToFullPath(base,
+                                                                               newCurrentPath));
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+
+       protected void matchFile() {
+
+       }
+
+       /*
+        * LOW LEVEL UTILITIES
+        */
+       /**
+        * The bundles already installed. Key is location (String) , value is a
+        * {@link Bundle}
+        */
+       public Map getBundlesByLocation() {
+               Map installedBundles = new HashMap();
+               Bundle[] bundles = bundleContext.getBundles();
+               for (int i = 0; i < bundles.length; i++) {
+                       installedBundles.put(bundles[i].getLocation(), bundles[i]);
+               }
+               return installedBundles;
+       }
+
+       /**
+        * The bundles already installed. Key is symbolic name (String) , value is a
+        * {@link Bundle}
+        */
+       public Map getBundlesBySymbolicName() {
+               Map namedBundles = new HashMap();
+               Bundle[] bundles = bundleContext.getBundles();
+               for (int i = 0; i < bundles.length; i++) {
+                       namedBundles.put(bundles[i].getSymbolicName(), bundles[i]);
+               }
+               return namedBundles;
+       }
+
+       /** Creates an URL from a location */
+       protected String locationToUrl(String baseUrl, String location) {
+               int extInd = location.lastIndexOf('.');
+               String ext = null;
+               if (extInd > 0)
+                       ext = location.substring(extInd);
+
+               if (baseUrl.startsWith("reference:") && ".jar".equals(ext))
+                       return "file:" + location;
+               else
+                       return baseUrl + location;
+       }
+
+       /** Transforms a relative path in a full system path. */
+       protected String relativeToFullPath(String basePath, String relativePath) {
+               return (basePath + '/' + relativePath).replace('/', File.separatorChar);
+       }
+
+       private String removeFilePrefix(String url) {
+               if (url.startsWith("file:"))
+                       return url.substring("file:".length());
+               else if (url.startsWith("reference:file:"))
+                       return url.substring("reference:file:".length());
+               else
+                       return url;
+       }
+
+       /**
+        * Convenience method to avoid cluttering the code with
+        * OsgiBootUtils.debug()
+        */
+       protected void debug(Object obj) {
+               OsgiBootUtils.debug(obj);
+       }
+
+       /*
+        * BEAN METHODS
+        */
+
+       public boolean getDebug() {
+               return debug;
+       }
+
+       public void setDebug(boolean debug) {
+               this.debug = debug;
+       }
+
+       public BundleContext getBundleContext() {
+               return bundleContext;
+       }
+
+       public void setInstallInLexicographicOrder(
+                       boolean installInAlphabeticalOrder) {
+               this.installInLexicographicOrder = installInAlphabeticalOrder;
+       }
+
+       public boolean isInstallInLexicographicOrder() {
+               return installInLexicographicOrder;
+       }
+
+       public void setDefaultTimeout(long defaultTimeout) {
+               this.defaultTimeout = defaultTimeout;
+       }
+
+       public void setModulesUrlSeparator(String modulesUrlSeparator) {
+               this.modulesUrlSeparator = modulesUrlSeparator;
+       }
+
+       public boolean isExcludeSvn() {
+               return excludeSvn;
+       }
+
+       public void setExcludeSvn(boolean excludeSvn) {
+               this.excludeSvn = excludeSvn;
+       }
+
+       /*
+        * INTERNAL CLASSES
+        */
+
+       /** Intermediary structure used by path matching */
+       protected class BundlesSet {
+               private String baseUrl = "reference:file";// not used yet
+               private final String dir;
+               private List includes = new ArrayList();
+               private List excludes = new ArrayList();
+
+               public BundlesSet(String def) {
+                       StringTokenizer st = new StringTokenizer(def, ";");
+
+                       if (!st.hasMoreTokens())
+                               throw new RuntimeException("Base dir not defined.");
+                       try {
+                               String dirPath = st.nextToken();
+
+                               if (dirPath.startsWith("file:"))
+                                       dirPath = dirPath.substring("file:".length());
+
+                               dir = new File(dirPath.replace('/', File.separatorChar))
+                                               .getCanonicalPath();
+                               if (debug)
+                                       debug("Base dir: " + dir);
+                       } catch (IOException e) {
+                               throw new RuntimeException("Cannot convert to absolute path", e);
+                       }
+
+                       while (st.hasMoreTokens()) {
+                               String tk = st.nextToken();
+                               StringTokenizer stEq = new StringTokenizer(tk, "=");
+                               String type = stEq.nextToken();
+                               String pattern = stEq.nextToken();
+                               if ("in".equals(type) || "include".equals(type)) {
+                                       includes.add(pattern);
+                               } else if ("ex".equals(type) || "exclude".equals(type)) {
+                                       excludes.add(pattern);
+                               } else if ("baseUrl".equals(type)) {
+                                       baseUrl = pattern;
+                               } else {
+                                       System.err.println("Unkown bundles pattern type " + type);
+                               }
+                       }
+
+                       if (excludeSvn && !excludes.contains(EXCLUDES_SVN_PATTERN)) {
+                               excludes.add(EXCLUDES_SVN_PATTERN);
+                       }
+               }
+
+               public String getDir() {
+                       return dir;
+               }
+
+               public List getIncludes() {
+                       return includes;
+               }
+
+               public List getExcludes() {
+                       return excludes;
+               }
+
+               public String getBaseUrl() {
+                       return baseUrl;
+               }
+
+       }
+
+}
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java
new file mode 100644 (file)
index 0000000..f316655
--- /dev/null
@@ -0,0 +1,142 @@
+/*\r
+ * Copyright (C) 2007-2012 Mathieu Baudier\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+package org.argeo.osgi.boot;\r
+\r
+import java.text.DateFormat;\r
+import java.text.SimpleDateFormat;\r
+import java.util.ArrayList;\r
+import java.util.Date;\r
+import java.util.List;\r
+import java.util.StringTokenizer;\r
+\r
+import org.osgi.framework.Bundle;\r
+\r
+/** Utilities, mostly related to logging. */\r
+public class OsgiBootUtils {\r
+       /** ISO8601 (as per log4j) and difference to UTC */\r
+       private static DateFormat dateFormat = new SimpleDateFormat(\r
+                       "yyyy-MM-dd HH:mm:ss,SSS Z");\r
+\r
+       public static void info(Object obj) {\r
+               System.out.println("# OSGiBOOT      # " + dateFormat.format(new Date())\r
+                               + " # " + obj);\r
+       }\r
+\r
+       public static void debug(Object obj) {\r
+               System.out.println("# OSGiBOOT DBG  # " + dateFormat.format(new Date())\r
+                               + " # " + obj);\r
+       }\r
+\r
+       public static void warn(Object obj) {\r
+               System.out.println("# OSGiBOOT WARN # " + dateFormat.format(new Date())\r
+                               + " # " + obj);\r
+       }\r
+\r
+       /**\r
+        * Gets a property value\r
+        * \r
+        * @return null when defaultValue is ""\r
+        */\r
+       public static String getProperty(String name, String defaultValue) {\r
+               final String value;\r
+               if (defaultValue != null)\r
+                       value = System.getProperty(name, defaultValue);\r
+               else\r
+                       value = System.getProperty(name);\r
+\r
+               if (value == null || value.equals(""))\r
+                       return null;\r
+               else\r
+                       return value;\r
+       }\r
+\r
+       public static String getProperty(String name) {\r
+               return getProperty(name, null);\r
+       }\r
+\r
+       public static String stateAsString(int state) {\r
+               switch (state) {\r
+               case Bundle.UNINSTALLED:\r
+                       return "UNINSTALLED";\r
+               case Bundle.INSTALLED:\r
+                       return "INSTALLED";\r
+               case Bundle.RESOLVED:\r
+                       return "RESOLVED";\r
+               case Bundle.STARTING:\r
+                       return "STARTING";\r
+               case Bundle.ACTIVE:\r
+                       return "ACTIVE";\r
+               case Bundle.STOPPING:\r
+                       return "STOPPING";\r
+               default:\r
+                       return Integer.toString(state);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * @return ==0: versions are identical, <0: tested version is newer, >0:\r
+        *         currentVersion is newer.\r
+        */\r
+       public static int compareVersions(String currentVersion,\r
+                       String testedVersion) {\r
+               List cToks = new ArrayList();\r
+               StringTokenizer cSt = new StringTokenizer(currentVersion, ".");\r
+               while (cSt.hasMoreTokens())\r
+                       cToks.add(cSt.nextToken());\r
+               List tToks = new ArrayList();\r
+               StringTokenizer tSt = new StringTokenizer(currentVersion, ".");\r
+               while (tSt.hasMoreTokens())\r
+                       tToks.add(tSt.nextToken());\r
+       \r
+               int comp = 0;\r
+               comp: for (int i = 0; i < cToks.size(); i++) {\r
+                       if (tToks.size() <= i) {\r
+                               // equals until then, tested shorter\r
+                               comp = 1;\r
+                               break comp;\r
+                       }\r
+       \r
+                       String c = (String) cToks.get(i);\r
+                       String t = (String) tToks.get(i);\r
+       \r
+                       try {\r
+                               int cInt = Integer.parseInt(c);\r
+                               int tInt = Integer.parseInt(t);\r
+                               if (cInt == tInt)\r
+                                       continue comp;\r
+                               else {\r
+                                       comp = (cInt - tInt);\r
+                                       break comp;\r
+                               }\r
+                       } catch (NumberFormatException e) {\r
+                               if (c.equals(t))\r
+                                       continue comp;\r
+                               else {\r
+                                       comp = c.compareTo(t);\r
+                                       break comp;\r
+                               }\r
+                       }\r
+               }\r
+       \r
+               if (comp == 0 && tToks.size() > cToks.size()) {\r
+                       // equals until then, current shorter\r
+                       comp = -1;\r
+               }\r
+       \r
+               return comp;\r
+       }\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java
new file mode 100644 (file)
index 0000000..0b9ad1a
--- /dev/null
@@ -0,0 +1,411 @@
+/*\r
+ * Copyright 2002-2007 the original author or authors.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.argeo.osgi.boot.internal.springutil;\r
+\r
+/**\r
+ * PathMatcher implementation for Ant-style path patterns.\r
+ * Examples are provided below.\r
+ *\r
+ * <p>Part of this mapping code has been kindly borrowed from\r
+ * <a href="http://ant.apache.org">Apache Ant</a>.\r
+ *\r
+ * <p>The mapping matches URLs using the following rules:<br>\r
+ * <ul>\r
+ * <li>? matches one character</li>\r
+ * <li>* matches zero or more characters</li>\r
+ * <li>** matches zero or more 'directories' in a path</li>\r
+ * </ul>\r
+ *\r
+ * <p>Some examples:<br>\r
+ * <ul>\r
+ * <li><code>com/t?st.jsp</code> - matches <code>com/test.jsp</code> but also\r
+ * <code>com/tast.jsp</code> or <code>com/txst.jsp</code></li>\r
+ * <li><code>com/*.jsp</code> - matches all <code>.jsp</code> files in the\r
+ * <code>com</code> directory</li>\r
+ * <li><code>com/&#42;&#42;/test.jsp</code> - matches all <code>test.jsp</code>\r
+ * files underneath the <code>com</code> path</li>\r
+ * <li><code>org/springframework/&#42;&#42;/*.jsp</code> - matches all <code>.jsp</code>\r
+ * files underneath the <code>org/springframework</code> path</li>\r
+ * <li><code>org/&#42;&#42;/servlet/bla.jsp</code> - matches\r
+ * <code>org/springframework/servlet/bla.jsp</code> but also\r
+ * <code>org/springframework/testing/servlet/bla.jsp</code> and\r
+ * <code>org/servlet/bla.jsp</code></li>\r
+ * </ul>\r
+ *\r
+ * @author Alef Arendsen\r
+ * @author Juergen Hoeller\r
+ * @author Rob Harrop\r
+ * @since 16.07.2003\r
+ */\r
+public class AntPathMatcher implements PathMatcher {\r
+\r
+       /** Default path separator: "/" */\r
+       public static final String DEFAULT_PATH_SEPARATOR = "/";\r
+\r
+       private String pathSeparator = DEFAULT_PATH_SEPARATOR;\r
+\r
+\r
+       /**\r
+        * Set the path separator to use for pattern parsing.\r
+        * Default is "/", as in Ant.\r
+        */\r
+       public void setPathSeparator(String pathSeparator) {\r
+               this.pathSeparator = (pathSeparator != null ? pathSeparator : DEFAULT_PATH_SEPARATOR);\r
+       }\r
+\r
+\r
+       public boolean isPattern(String path) {\r
+               return (path.indexOf('*') != -1 || path.indexOf('?') != -1);\r
+       }\r
+\r
+       public boolean match(String pattern, String path) {\r
+               return doMatch(pattern, path, true);\r
+       }\r
+\r
+       public boolean matchStart(String pattern, String path) {\r
+               return doMatch(pattern, path, false);\r
+       }\r
+\r
+\r
+       /**\r
+        * Actually match the given <code>path</code> against the given <code>pattern</code>.\r
+        * @param pattern the pattern to match against\r
+        * @param path the path String to test\r
+        * @param fullMatch whether a full pattern match is required\r
+        * (else a pattern match as far as the given base path goes is sufficient)\r
+        * @return <code>true</code> if the supplied <code>path</code> matched,\r
+        * <code>false</code> if it didn't\r
+        */\r
+       protected boolean doMatch(String pattern, String path, boolean fullMatch) {\r
+               if (path.startsWith(this.pathSeparator) != pattern.startsWith(this.pathSeparator)) {\r
+                       return false;\r
+               }\r
+\r
+               String[] pattDirs = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);\r
+               String[] pathDirs = StringUtils.tokenizeToStringArray(path, this.pathSeparator);\r
+\r
+               int pattIdxStart = 0;\r
+               int pattIdxEnd = pattDirs.length - 1;\r
+               int pathIdxStart = 0;\r
+               int pathIdxEnd = pathDirs.length - 1;\r
+\r
+               // Match all elements up to the first **\r
+               while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {\r
+                       String patDir = pattDirs[pattIdxStart];\r
+                       if ("**".equals(patDir)) {\r
+                               break;\r
+                       }\r
+                       if (!matchStrings(patDir, pathDirs[pathIdxStart])) {\r
+                               return false;\r
+                       }\r
+                       pattIdxStart++;\r
+                       pathIdxStart++;\r
+               }\r
+\r
+               if (pathIdxStart > pathIdxEnd) {\r
+                       // Path is exhausted, only match if rest of pattern is * or **'s\r
+                       if (pattIdxStart > pattIdxEnd) {\r
+                               return (pattern.endsWith(this.pathSeparator) ?\r
+                                               path.endsWith(this.pathSeparator) : !path.endsWith(this.pathSeparator));\r
+                       }\r
+                       if (!fullMatch) {\r
+                               return true;\r
+                       }\r
+                       if (pattIdxStart == pattIdxEnd && pattDirs[pattIdxStart].equals("*") &&\r
+                                       path.endsWith(this.pathSeparator)) {\r
+                               return true;\r
+                       }\r
+                       for (int i = pattIdxStart; i <= pattIdxEnd; i++) {\r
+                               if (!pattDirs[i].equals("**")) {\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+               else if (pattIdxStart > pattIdxEnd) {\r
+                       // String not exhausted, but pattern is. Failure.\r
+                       return false;\r
+               }\r
+               else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {\r
+                       // Path start definitely matches due to "**" part in pattern.\r
+                       return true;\r
+               }\r
+\r
+               // up to last '**'\r
+               while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {\r
+                       String patDir = pattDirs[pattIdxEnd];\r
+                       if (patDir.equals("**")) {\r
+                               break;\r
+                       }\r
+                       if (!matchStrings(patDir, pathDirs[pathIdxEnd])) {\r
+                               return false;\r
+                       }\r
+                       pattIdxEnd--;\r
+                       pathIdxEnd--;\r
+               }\r
+               if (pathIdxStart > pathIdxEnd) {\r
+                       // String is exhausted\r
+                       for (int i = pattIdxStart; i <= pattIdxEnd; i++) {\r
+                               if (!pattDirs[i].equals("**")) {\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+\r
+               while (pattIdxStart != pattIdxEnd && pathIdxStart <= pathIdxEnd) {\r
+                       int patIdxTmp = -1;\r
+                       for (int i = pattIdxStart + 1; i <= pattIdxEnd; i++) {\r
+                               if (pattDirs[i].equals("**")) {\r
+                                       patIdxTmp = i;\r
+                                       break;\r
+                               }\r
+                       }\r
+                       if (patIdxTmp == pattIdxStart + 1) {\r
+                               // '**/**' situation, so skip one\r
+                               pattIdxStart++;\r
+                               continue;\r
+                       }\r
+                       // Find the pattern between padIdxStart & padIdxTmp in str between\r
+                       // strIdxStart & strIdxEnd\r
+                       int patLength = (patIdxTmp - pattIdxStart - 1);\r
+                       int strLength = (pathIdxEnd - pathIdxStart + 1);\r
+                       int foundIdx = -1;\r
+\r
+                       strLoop:\r
+                           for (int i = 0; i <= strLength - patLength; i++) {\r
+                                   for (int j = 0; j < patLength; j++) {\r
+                                           String subPat = (String) pattDirs[pattIdxStart + j + 1];\r
+                                           String subStr = (String) pathDirs[pathIdxStart + i + j];\r
+                                           if (!matchStrings(subPat, subStr)) {\r
+                                                   continue strLoop;\r
+                                           }\r
+                                   }\r
+                                   foundIdx = pathIdxStart + i;\r
+                                   break;\r
+                           }\r
+\r
+                       if (foundIdx == -1) {\r
+                               return false;\r
+                       }\r
+\r
+                       pattIdxStart = patIdxTmp;\r
+                       pathIdxStart = foundIdx + patLength;\r
+               }\r
+\r
+               for (int i = pattIdxStart; i <= pattIdxEnd; i++) {\r
+                       if (!pattDirs[i].equals("**")) {\r
+                               return false;\r
+                       }\r
+               }\r
+\r
+               return true;\r
+       }\r
+\r
+       /**\r
+        * Tests whether or not a string matches against a pattern.\r
+        * The pattern may contain two special characters:<br>\r
+        * '*' means zero or more characters<br>\r
+        * '?' means one and only one character\r
+        * @param pattern pattern to match against.\r
+        * Must not be <code>null</code>.\r
+        * @param str string which must be matched against the pattern.\r
+        * Must not be <code>null</code>.\r
+        * @return <code>true</code> if the string matches against the\r
+        * pattern, or <code>false</code> otherwise.\r
+        */\r
+       private boolean matchStrings(String pattern, String str) {\r
+               char[] patArr = pattern.toCharArray();\r
+               char[] strArr = str.toCharArray();\r
+               int patIdxStart = 0;\r
+               int patIdxEnd = patArr.length - 1;\r
+               int strIdxStart = 0;\r
+               int strIdxEnd = strArr.length - 1;\r
+               char ch;\r
+\r
+               boolean containsStar = false;\r
+               for (int i = 0; i < patArr.length; i++) {\r
+                       if (patArr[i] == '*') {\r
+                               containsStar = true;\r
+                               break;\r
+                       }\r
+               }\r
+\r
+               if (!containsStar) {\r
+                       // No '*'s, so we make a shortcut\r
+                       if (patIdxEnd != strIdxEnd) {\r
+                               return false; // Pattern and string do not have the same size\r
+                       }\r
+                       for (int i = 0; i <= patIdxEnd; i++) {\r
+                               ch = patArr[i];\r
+                               if (ch != '?') {\r
+                                       if (ch != strArr[i]) {\r
+                                               return false;// Character mismatch\r
+                                       }\r
+                               }\r
+                       }\r
+                       return true; // String matches against pattern\r
+               }\r
+\r
+\r
+               if (patIdxEnd == 0) {\r
+                       return true; // Pattern contains only '*', which matches anything\r
+               }\r
+\r
+               // Process characters before first star\r
+               while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd) {\r
+                       if (ch != '?') {\r
+                               if (ch != strArr[strIdxStart]) {\r
+                                       return false;// Character mismatch\r
+                               }\r
+                       }\r
+                       patIdxStart++;\r
+                       strIdxStart++;\r
+               }\r
+               if (strIdxStart > strIdxEnd) {\r
+                       // All characters in the string are used. Check if only '*'s are\r
+                       // left in the pattern. If so, we succeeded. Otherwise failure.\r
+                       for (int i = patIdxStart; i <= patIdxEnd; i++) {\r
+                               if (patArr[i] != '*') {\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+\r
+               // Process characters after last star\r
+               while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd) {\r
+                       if (ch != '?') {\r
+                               if (ch != strArr[strIdxEnd]) {\r
+                                       return false;// Character mismatch\r
+                               }\r
+                       }\r
+                       patIdxEnd--;\r
+                       strIdxEnd--;\r
+               }\r
+               if (strIdxStart > strIdxEnd) {\r
+                       // All characters in the string are used. Check if only '*'s are\r
+                       // left in the pattern. If so, we succeeded. Otherwise failure.\r
+                       for (int i = patIdxStart; i <= patIdxEnd; i++) {\r
+                               if (patArr[i] != '*') {\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+\r
+               // process pattern between stars. padIdxStart and patIdxEnd point\r
+               // always to a '*'.\r
+               while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {\r
+                       int patIdxTmp = -1;\r
+                       for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {\r
+                               if (patArr[i] == '*') {\r
+                                       patIdxTmp = i;\r
+                                       break;\r
+                               }\r
+                       }\r
+                       if (patIdxTmp == patIdxStart + 1) {\r
+                               // Two stars next to each other, skip the first one.\r
+                               patIdxStart++;\r
+                               continue;\r
+                       }\r
+                       // Find the pattern between padIdxStart & padIdxTmp in str between\r
+                       // strIdxStart & strIdxEnd\r
+                       int patLength = (patIdxTmp - patIdxStart - 1);\r
+                       int strLength = (strIdxEnd - strIdxStart + 1);\r
+                       int foundIdx = -1;\r
+                       strLoop:\r
+                       for (int i = 0; i <= strLength - patLength; i++) {\r
+                               for (int j = 0; j < patLength; j++) {\r
+                                       ch = patArr[patIdxStart + j + 1];\r
+                                       if (ch != '?') {\r
+                                               if (ch != strArr[strIdxStart + i + j]) {\r
+                                                       continue strLoop;\r
+                                               }\r
+                                       }\r
+                               }\r
+\r
+                               foundIdx = strIdxStart + i;\r
+                               break;\r
+                       }\r
+\r
+                       if (foundIdx == -1) {\r
+                               return false;\r
+                       }\r
+\r
+                       patIdxStart = patIdxTmp;\r
+                       strIdxStart = foundIdx + patLength;\r
+               }\r
+\r
+               // All characters in the string are used. Check if only '*'s are left\r
+               // in the pattern. If so, we succeeded. Otherwise failure.\r
+               for (int i = patIdxStart; i <= patIdxEnd; i++) {\r
+                       if (patArr[i] != '*') {\r
+                               return false;\r
+                       }\r
+               }\r
+\r
+               return true;\r
+       }\r
+\r
+       /**\r
+        * Given a pattern and a full path, determine the pattern-mapped part.\r
+        * <p>For example:\r
+        * <ul>\r
+        * <li>'<code>/docs/cvs/commit.html</code>' and '<code>/docs/cvs/commit.html</code> -> ''</li>\r
+        * <li>'<code>/docs/*</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>\r
+        * <li>'<code>/docs/cvs/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>commit.html</code>'</li>\r
+        * <li>'<code>/docs/**</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>\r
+        * <li>'<code>/docs/**\/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>cvs/commit.html</code>'</li>\r
+        * <li>'<code>/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>docs/cvs/commit.html</code>'</li>\r
+        * <li>'<code>*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>\r
+        * <li>'<code>*</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>\r
+        * </ul>\r
+        * <p>Assumes that {@link #match} returns <code>true</code> for '<code>pattern</code>'\r
+        * and '<code>path</code>', but does <strong>not</strong> enforce this.\r
+        */\r
+       public String extractPathWithinPattern(String pattern, String path) {\r
+               String[] patternParts = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);\r
+               String[] pathParts = StringUtils.tokenizeToStringArray(path, this.pathSeparator);\r
+\r
+               StringBuffer buffer = new StringBuffer();\r
+\r
+               // Add any path parts that have a wildcarded pattern part.\r
+               int puts = 0;\r
+               for (int i = 0; i < patternParts.length; i++) {\r
+                       String patternPart = patternParts[i];\r
+                       if ((patternPart.indexOf('*') > -1 || patternPart.indexOf('?') > -1) && pathParts.length >= i + 1) {\r
+                               if (puts > 0 || (i == 0 && !pattern.startsWith(this.pathSeparator))) {\r
+                                       buffer.append(this.pathSeparator);\r
+                               }\r
+                               buffer.append(pathParts[i]);\r
+                               puts++;\r
+                       }\r
+               }\r
+\r
+               // Append any trailing path parts.\r
+               for (int i = patternParts.length; i < pathParts.length; i++) {\r
+                       if (puts > 0 || i > 0) {\r
+                               buffer.append(this.pathSeparator);\r
+                       }\r
+                       buffer.append(pathParts[i]);\r
+               }\r
+\r
+               return buffer.toString();\r
+       }\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java
new file mode 100644 (file)
index 0000000..ad01542
--- /dev/null
@@ -0,0 +1,275 @@
+/*\r
+ * Copyright 2002-2008 the original author or authors.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.argeo.osgi.boot.internal.springutil;\r
+\r
+import java.util.Arrays;\r
+import java.util.Collection;\r
+import java.util.Enumeration;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.Properties;\r
+\r
+/**\r
+ * Miscellaneous collection utility methods.\r
+ * Mainly for internal use within the framework.\r
+ *\r
+ * @author Juergen Hoeller\r
+ * @author Rob Harrop\r
+ * @since 1.1.3\r
+ */\r
+public abstract class CollectionUtils {\r
+\r
+       /**\r
+        * Return <code>true</code> if the supplied Collection is <code>null</code>\r
+        * or empty. Otherwise, return <code>false</code>.\r
+        * @param collection the Collection to check\r
+        * @return whether the given Collection is empty\r
+        */\r
+       public static boolean isEmpty(Collection collection) {\r
+               return (collection == null || collection.isEmpty());\r
+       }\r
+\r
+       /**\r
+        * Return <code>true</code> if the supplied Map is <code>null</code>\r
+        * or empty. Otherwise, return <code>false</code>.\r
+        * @param map the Map to check\r
+        * @return whether the given Map is empty\r
+        */\r
+       public static boolean isEmpty(Map map) {\r
+               return (map == null || map.isEmpty());\r
+       }\r
+\r
+       /**\r
+        * Convert the supplied array into a List. A primitive array gets\r
+        * converted into a List of the appropriate wrapper type.\r
+        * <p>A <code>null</code> source value will be converted to an\r
+        * empty List.\r
+        * @param source the (potentially primitive) array\r
+        * @return the converted List result\r
+        * @see ObjectUtils#toObjectArray(Object)\r
+        */\r
+       public static List arrayToList(Object source) {\r
+               return Arrays.asList(ObjectUtils.toObjectArray(source));\r
+       }\r
+\r
+       /**\r
+        * Merge the given array into the given Collection.\r
+        * @param array the array to merge (may be <code>null</code>)\r
+        * @param collection the target Collection to merge the array into\r
+        */\r
+       public static void mergeArrayIntoCollection(Object array, Collection collection) {\r
+               if (collection == null) {\r
+                       throw new IllegalArgumentException("Collection must not be null");\r
+               }\r
+               Object[] arr = ObjectUtils.toObjectArray(array);\r
+               for (int i = 0; i < arr.length; i++) {\r
+                       collection.add(arr[i]);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Merge the given Properties instance into the given Map,\r
+        * copying all properties (key-value pairs) over.\r
+        * <p>Uses <code>Properties.propertyNames()</code> to even catch\r
+        * default properties linked into the original Properties instance.\r
+        * @param props the Properties instance to merge (may be <code>null</code>)\r
+        * @param map the target Map to merge the properties into\r
+        */\r
+       public static void mergePropertiesIntoMap(Properties props, Map map) {\r
+               if (map == null) {\r
+                       throw new IllegalArgumentException("Map must not be null");\r
+               }\r
+               if (props != null) {\r
+                       for (Enumeration en = props.propertyNames(); en.hasMoreElements();) {\r
+                               String key = (String) en.nextElement();\r
+                               map.put(key, props.getProperty(key));\r
+                       }\r
+               }\r
+       }\r
+\r
+\r
+       /**\r
+        * Check whether the given Iterator contains the given element.\r
+        * @param iterator the Iterator to check\r
+        * @param element the element to look for\r
+        * @return <code>true</code> if found, <code>false</code> else\r
+        */\r
+       public static boolean contains(Iterator iterator, Object element) {\r
+               if (iterator != null) {\r
+                       while (iterator.hasNext()) {\r
+                               Object candidate = iterator.next();\r
+                               if (ObjectUtils.nullSafeEquals(candidate, element)) {\r
+                                       return true;\r
+                               }\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Check whether the given Enumeration contains the given element.\r
+        * @param enumeration the Enumeration to check\r
+        * @param element the element to look for\r
+        * @return <code>true</code> if found, <code>false</code> else\r
+        */\r
+       public static boolean contains(Enumeration enumeration, Object element) {\r
+               if (enumeration != null) {\r
+                       while (enumeration.hasMoreElements()) {\r
+                               Object candidate = enumeration.nextElement();\r
+                               if (ObjectUtils.nullSafeEquals(candidate, element)) {\r
+                                       return true;\r
+                               }\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Check whether the given Collection contains the given element instance.\r
+        * <p>Enforces the given instance to be present, rather than returning\r
+        * <code>true</code> for an equal element as well.\r
+        * @param collection the Collection to check\r
+        * @param element the element to look for\r
+        * @return <code>true</code> if found, <code>false</code> else\r
+        */\r
+       public static boolean containsInstance(Collection collection, Object element) {\r
+               if (collection != null) {\r
+                       for (Iterator it = collection.iterator(); it.hasNext();) {\r
+                               Object candidate = it.next();\r
+                               if (candidate == element) {\r
+                                       return true;\r
+                               }\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Return <code>true</code> if any element in '<code>candidates</code>' is\r
+        * contained in '<code>source</code>'; otherwise returns <code>false</code>.\r
+        * @param source the source Collection\r
+        * @param candidates the candidates to search for\r
+        * @return whether any of the candidates has been found\r
+        */\r
+       public static boolean containsAny(Collection source, Collection candidates) {\r
+               if (isEmpty(source) || isEmpty(candidates)) {\r
+                       return false;\r
+               }\r
+               for (Iterator it = candidates.iterator(); it.hasNext();) {\r
+                       if (source.contains(it.next())) {\r
+                               return true;\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Return the first element in '<code>candidates</code>' that is contained in\r
+        * '<code>source</code>'. If no element in '<code>candidates</code>' is present in\r
+        * '<code>source</code>' returns <code>null</code>. Iteration order is\r
+        * {@link Collection} implementation specific.\r
+        * @param source the source Collection\r
+        * @param candidates the candidates to search for\r
+        * @return the first present object, or <code>null</code> if not found\r
+        */\r
+       public static Object findFirstMatch(Collection source, Collection candidates) {\r
+               if (isEmpty(source) || isEmpty(candidates)) {\r
+                       return null;\r
+               }\r
+               for (Iterator it = candidates.iterator(); it.hasNext();) {\r
+                       Object candidate = it.next();\r
+                       if (source.contains(candidate)) {\r
+                               return candidate;\r
+                       }\r
+               }\r
+               return null;\r
+       }\r
+\r
+       /**\r
+        * Find a single value of the given type in the given Collection.\r
+        * @param collection the Collection to search\r
+        * @param type the type to look for\r
+        * @return a value of the given type found if there is a clear match,\r
+        * or <code>null</code> if none or more than one such value found\r
+        */\r
+       public static Object findValueOfType(Collection collection, Class type) {\r
+               if (isEmpty(collection)) {\r
+                       return null;\r
+               }\r
+               Object value = null;\r
+               for (Iterator it = collection.iterator(); it.hasNext();) {\r
+                       Object obj = it.next();\r
+                       if (type == null || type.isInstance(obj)) {\r
+                               if (value != null) {\r
+                                       // More than one value found... no clear single value.\r
+                                       return null;\r
+                               }\r
+                               value = obj;\r
+                       }\r
+               }\r
+               return value;\r
+       }\r
+\r
+       /**\r
+        * Find a single value of one of the given types in the given Collection:\r
+        * searching the Collection for a value of the first type, then\r
+        * searching for a value of the second type, etc.\r
+        * @param collection the collection to search\r
+        * @param types the types to look for, in prioritized order\r
+        * @return a value of one of the given types found if there is a clear match,\r
+        * or <code>null</code> if none or more than one such value found\r
+        */\r
+       public static Object findValueOfType(Collection collection, Class[] types) {\r
+               if (isEmpty(collection) || ObjectUtils.isEmpty(types)) {\r
+                       return null;\r
+               }\r
+               for (int i = 0; i < types.length; i++) {\r
+                       Object value = findValueOfType(collection, types[i]);\r
+                       if (value != null) {\r
+                               return value;\r
+                       }\r
+               }\r
+               return null;\r
+       }\r
+\r
+       /**\r
+        * Determine whether the given Collection only contains a single unique object.\r
+        * @param collection the Collection to check\r
+        * @return <code>true</code> if the collection contains a single reference or\r
+        * multiple references to the same instance, <code>false</code> else\r
+        */\r
+       public static boolean hasUniqueObject(Collection collection) {\r
+               if (isEmpty(collection)) {\r
+                       return false;\r
+               }\r
+               boolean hasCandidate = false;\r
+               Object candidate = null;\r
+               for (Iterator it = collection.iterator(); it.hasNext();) {\r
+                       Object elem = it.next();\r
+                       if (!hasCandidate) {\r
+                               hasCandidate = true;\r
+                               candidate = elem;\r
+                       }\r
+                       else if (candidate != elem) {\r
+                               return false;\r
+                       }\r
+               }\r
+               return true;\r
+       }\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java
new file mode 100644 (file)
index 0000000..223b2a1
--- /dev/null
@@ -0,0 +1,833 @@
+/*\r
+ * Copyright 2002-2007 the original author or authors.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.argeo.osgi.boot.internal.springutil;\r
+\r
+import java.lang.reflect.Array;\r
+import java.util.Arrays;\r
+\r
+/**\r
+ * Miscellaneous object utility methods. Mainly for internal use within the\r
+ * framework; consider Jakarta's Commons Lang for a more comprehensive suite\r
+ * of object utilities.\r
+ *\r
+ * @author Juergen Hoeller\r
+ * @author Keith Donald\r
+ * @author Rod Johnson\r
+ * @author Rob Harrop\r
+ * @author Alex Ruiz\r
+ * @since 19.03.2004\r
+ * @see org.apache.commons.lang.ObjectUtils\r
+ */\r
+public abstract class ObjectUtils {\r
+\r
+       private static final int INITIAL_HASH = 7;\r
+       private static final int MULTIPLIER = 31;\r
+\r
+       private static final String EMPTY_STRING = "";\r
+       private static final String NULL_STRING = "null";\r
+       private static final String ARRAY_START = "{";\r
+       private static final String ARRAY_END = "}";\r
+       private static final String EMPTY_ARRAY = ARRAY_START + ARRAY_END;\r
+       private static final String ARRAY_ELEMENT_SEPARATOR = ", ";\r
+\r
+\r
+       /**\r
+        * Return whether the given throwable is a checked exception:\r
+        * that is, neither a RuntimeException nor an Error.\r
+        * @param ex the throwable to check\r
+        * @return whether the throwable is a checked exception\r
+        * @see java.lang.Exception\r
+        * @see java.lang.RuntimeException\r
+        * @see java.lang.Error\r
+        */\r
+       public static boolean isCheckedException(Throwable ex) {\r
+               return !(ex instanceof RuntimeException || ex instanceof Error);\r
+       }\r
+\r
+       /**\r
+        * Check whether the given exception is compatible with the exceptions\r
+        * declared in a throws clause.\r
+        * @param ex the exception to checked\r
+        * @param declaredExceptions the exceptions declared in the throws clause\r
+        * @return whether the given exception is compatible\r
+        */\r
+       public static boolean isCompatibleWithThrowsClause(Throwable ex, Class[] declaredExceptions) {\r
+               if (!isCheckedException(ex)) {\r
+                       return true;\r
+               }\r
+               if (declaredExceptions != null) {\r
+                       for (int i = 0; i < declaredExceptions.length; i++) {\r
+                               if (declaredExceptions[i].isAssignableFrom(ex.getClass())) {\r
+                                       return true;\r
+                               }\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Return whether the given array is empty: that is, <code>null</code>\r
+        * or of zero length.\r
+        * @param array the array to check\r
+        * @return whether the given array is empty\r
+        */\r
+       public static boolean isEmpty(Object[] array) {\r
+               return (array == null || array.length == 0);\r
+       }\r
+\r
+       /**\r
+        * Check whether the given array contains the given element.\r
+        * @param array the array to check (may be <code>null</code>,\r
+        * in which case the return value will always be <code>false</code>)\r
+        * @param element the element to check for\r
+        * @return whether the element has been found in the given array\r
+        */\r
+       public static boolean containsElement(Object[] array, Object element) {\r
+               if (array == null) {\r
+                       return false;\r
+               }\r
+               for (int i = 0; i < array.length; i++) {\r
+                       if (nullSafeEquals(array[i], element)) {\r
+                               return true;\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Append the given Object to the given array, returning a new array\r
+        * consisting of the input array contents plus the given Object.\r
+        * @param array the array to append to (can be <code>null</code>)\r
+        * @param obj the Object to append\r
+        * @return the new array (of the same component type; never <code>null</code>)\r
+        */\r
+       public static Object[] addObjectToArray(Object[] array, Object obj) {\r
+               Class compType = Object.class;\r
+               if (array != null) {\r
+                       compType = array.getClass().getComponentType();\r
+               }\r
+               else if (obj != null) {\r
+                       compType = obj.getClass();\r
+               }\r
+               int newArrLength = (array != null ? array.length + 1 : 1);\r
+               Object[] newArr = (Object[]) Array.newInstance(compType, newArrLength);\r
+               if (array != null) {\r
+                       System.arraycopy(array, 0, newArr, 0, array.length);\r
+               }\r
+               newArr[newArr.length - 1] = obj;\r
+               return newArr;\r
+       }\r
+\r
+       /**\r
+        * Convert the given array (which may be a primitive array) to an\r
+        * object array (if necessary of primitive wrapper objects).\r
+        * <p>A <code>null</code> source value will be converted to an\r
+        * empty Object array.\r
+        * @param source the (potentially primitive) array\r
+        * @return the corresponding object array (never <code>null</code>)\r
+        * @throws IllegalArgumentException if the parameter is not an array\r
+        */\r
+       public static Object[] toObjectArray(Object source) {\r
+               if (source instanceof Object[]) {\r
+                       return (Object[]) source;\r
+               }\r
+               if (source == null) {\r
+                       return new Object[0];\r
+               }\r
+               if (!source.getClass().isArray()) {\r
+                       throw new IllegalArgumentException("Source is not an array: " + source);\r
+               }\r
+               int length = Array.getLength(source);\r
+               if (length == 0) {\r
+                       return new Object[0];\r
+               }\r
+               Class wrapperType = Array.get(source, 0).getClass();\r
+               Object[] newArray = (Object[]) Array.newInstance(wrapperType, length);\r
+               for (int i = 0; i < length; i++) {\r
+                       newArray[i] = Array.get(source, i);\r
+               }\r
+               return newArray;\r
+       }\r
+\r
+\r
+       //---------------------------------------------------------------------\r
+       // Convenience methods for content-based equality/hash-code handling\r
+       //---------------------------------------------------------------------\r
+\r
+       /**\r
+        * Determine if the given objects are equal, returning <code>true</code>\r
+        * if both are <code>null</code> or <code>false</code> if only one is\r
+        * <code>null</code>.\r
+        * <p>Compares arrays with <code>Arrays.equals</code>, performing an equality\r
+        * check based on the array elements rather than the array reference.\r
+        * @param o1 first Object to compare\r
+        * @param o2 second Object to compare\r
+        * @return whether the given objects are equal\r
+        * @see java.util.Arrays#equals\r
+        */\r
+       public static boolean nullSafeEquals(Object o1, Object o2) {\r
+               if (o1 == o2) {\r
+                       return true;\r
+               }\r
+               if (o1 == null || o2 == null) {\r
+                       return false;\r
+               }\r
+               if (o1.equals(o2)) {\r
+                       return true;\r
+               }\r
+               if (o1.getClass().isArray() && o2.getClass().isArray()) {\r
+                       if (o1 instanceof Object[] && o2 instanceof Object[]) {\r
+                               return Arrays.equals((Object[]) o1, (Object[]) o2);\r
+                       }\r
+                       if (o1 instanceof boolean[] && o2 instanceof boolean[]) {\r
+                               return Arrays.equals((boolean[]) o1, (boolean[]) o2);\r
+                       }\r
+                       if (o1 instanceof byte[] && o2 instanceof byte[]) {\r
+                               return Arrays.equals((byte[]) o1, (byte[]) o2);\r
+                       }\r
+                       if (o1 instanceof char[] && o2 instanceof char[]) {\r
+                               return Arrays.equals((char[]) o1, (char[]) o2);\r
+                       }\r
+                       if (o1 instanceof double[] && o2 instanceof double[]) {\r
+                               return Arrays.equals((double[]) o1, (double[]) o2);\r
+                       }\r
+                       if (o1 instanceof float[] && o2 instanceof float[]) {\r
+                               return Arrays.equals((float[]) o1, (float[]) o2);\r
+                       }\r
+                       if (o1 instanceof int[] && o2 instanceof int[]) {\r
+                               return Arrays.equals((int[]) o1, (int[]) o2);\r
+                       }\r
+                       if (o1 instanceof long[] && o2 instanceof long[]) {\r
+                               return Arrays.equals((long[]) o1, (long[]) o2);\r
+                       }\r
+                       if (o1 instanceof short[] && o2 instanceof short[]) {\r
+                               return Arrays.equals((short[]) o1, (short[]) o2);\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Return as hash code for the given object; typically the value of\r
+        * <code>{@link Object#hashCode()}</code>. If the object is an array,\r
+        * this method will delegate to any of the <code>nullSafeHashCode</code>\r
+        * methods for arrays in this class. If the object is <code>null</code>,\r
+        * this method returns 0.\r
+        * @see #nullSafeHashCode(Object[])\r
+        * @see #nullSafeHashCode(boolean[])\r
+        * @see #nullSafeHashCode(byte[])\r
+        * @see #nullSafeHashCode(char[])\r
+        * @see #nullSafeHashCode(double[])\r
+        * @see #nullSafeHashCode(float[])\r
+        * @see #nullSafeHashCode(int[])\r
+        * @see #nullSafeHashCode(long[])\r
+        * @see #nullSafeHashCode(short[])\r
+        */\r
+       public static int nullSafeHashCode(Object obj) {\r
+               if (obj == null) {\r
+                       return 0;\r
+               }\r
+               if (obj.getClass().isArray()) {\r
+                       if (obj instanceof Object[]) {\r
+                               return nullSafeHashCode((Object[]) obj);\r
+                       }\r
+                       if (obj instanceof boolean[]) {\r
+                               return nullSafeHashCode((boolean[]) obj);\r
+                       }\r
+                       if (obj instanceof byte[]) {\r
+                               return nullSafeHashCode((byte[]) obj);\r
+                       }\r
+                       if (obj instanceof char[]) {\r
+                               return nullSafeHashCode((char[]) obj);\r
+                       }\r
+                       if (obj instanceof double[]) {\r
+                               return nullSafeHashCode((double[]) obj);\r
+                       }\r
+                       if (obj instanceof float[]) {\r
+                               return nullSafeHashCode((float[]) obj);\r
+                       }\r
+                       if (obj instanceof int[]) {\r
+                               return nullSafeHashCode((int[]) obj);\r
+                       }\r
+                       if (obj instanceof long[]) {\r
+                               return nullSafeHashCode((long[]) obj);\r
+                       }\r
+                       if (obj instanceof short[]) {\r
+                               return nullSafeHashCode((short[]) obj);\r
+                       }\r
+               }\r
+               return obj.hashCode();\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(Object[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + nullSafeHashCode(array[i]);\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(boolean[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(byte[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + array[i];\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(char[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + array[i];\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(double[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(float[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(int[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + array[i];\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(long[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return a hash code based on the contents of the specified array.\r
+        * If <code>array</code> is <code>null</code>, this method returns 0.\r
+        */\r
+       public static int nullSafeHashCode(short[] array) {\r
+               if (array == null) {\r
+                       return 0;\r
+               }\r
+               int hash = INITIAL_HASH;\r
+               int arraySize = array.length;\r
+               for (int i = 0; i < arraySize; i++) {\r
+                       hash = MULTIPLIER * hash + array[i];\r
+               }\r
+               return hash;\r
+       }\r
+\r
+       /**\r
+        * Return the same value as <code>{@link Boolean#hashCode()}</code>.\r
+        * @see Boolean#hashCode()\r
+        */\r
+       public static int hashCode(boolean bool) {\r
+               return bool ? 1231 : 1237;\r
+       }\r
+\r
+       /**\r
+        * Return the same value as <code>{@link Double#hashCode()}</code>.\r
+        * @see Double#hashCode()\r
+        */\r
+       public static int hashCode(double dbl) {\r
+               long bits = Double.doubleToLongBits(dbl);\r
+               return hashCode(bits);\r
+       }\r
+\r
+       /**\r
+        * Return the same value as <code>{@link Float#hashCode()}</code>.\r
+        * @see Float#hashCode()\r
+        */\r
+       public static int hashCode(float flt) {\r
+               return Float.floatToIntBits(flt);\r
+       }\r
+\r
+       /**\r
+        * Return the same value as <code>{@link Long#hashCode()}</code>.\r
+        * @see Long#hashCode()\r
+        */\r
+       public static int hashCode(long lng) {\r
+               return (int) (lng ^ (lng >>> 32));\r
+       }\r
+\r
+\r
+       //---------------------------------------------------------------------\r
+       // Convenience methods for toString output\r
+       //---------------------------------------------------------------------\r
+\r
+       /**\r
+        * Return a String representation of an object's overall identity.\r
+        * @param obj the object (may be <code>null</code>)\r
+        * @return the object's identity as String representation,\r
+        * or an empty String if the object was <code>null</code>\r
+        */\r
+       public static String identityToString(Object obj) {\r
+               if (obj == null) {\r
+                       return EMPTY_STRING;\r
+               }\r
+               return obj.getClass().getName() + "@" + getIdentityHexString(obj);\r
+       }\r
+\r
+       /**\r
+        * Return a hex String form of an object's identity hash code.\r
+        * @param obj the object\r
+        * @return the object's identity code in hex notation\r
+        */\r
+       public static String getIdentityHexString(Object obj) {\r
+               return Integer.toHexString(System.identityHashCode(obj));\r
+       }\r
+\r
+       /**\r
+        * Return a content-based String representation if <code>obj</code> is\r
+        * not <code>null</code>; otherwise returns an empty String.\r
+        * <p>Differs from {@link #nullSafeToString(Object)} in that it returns\r
+        * an empty String rather than "null" for a <code>null</code> value.\r
+        * @param obj the object to build a display String for\r
+        * @return a display String representation of <code>obj</code>\r
+        * @see #nullSafeToString(Object)\r
+        */\r
+       public static String getDisplayString(Object obj) {\r
+               if (obj == null) {\r
+                       return EMPTY_STRING;\r
+               }\r
+               return nullSafeToString(obj);\r
+       }\r
+\r
+       /**\r
+        * Determine the class name for the given object.\r
+        * <p>Returns <code>"null"</code> if <code>obj</code> is <code>null</code>.\r
+        * @param obj the object to introspect (may be <code>null</code>)\r
+        * @return the corresponding class name\r
+        */\r
+       public static String nullSafeClassName(Object obj) {\r
+               return (obj != null ? obj.getClass().getName() : NULL_STRING);\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the specified Object.\r
+        * <p>Builds a String representation of the contents in case of an array.\r
+        * Returns <code>"null"</code> if <code>obj</code> is <code>null</code>.\r
+        * @param obj the object to build a String representation for\r
+        * @return a String representation of <code>obj</code>\r
+        */\r
+       public static String nullSafeToString(Object obj) {\r
+               if (obj == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               if (obj instanceof String) {\r
+                       return (String) obj;\r
+               }\r
+               if (obj instanceof Object[]) {\r
+                       return nullSafeToString((Object[]) obj);\r
+               }\r
+               if (obj instanceof boolean[]) {\r
+                       return nullSafeToString((boolean[]) obj);\r
+               }\r
+               if (obj instanceof byte[]) {\r
+                       return nullSafeToString((byte[]) obj);\r
+               }\r
+               if (obj instanceof char[]) {\r
+                       return nullSafeToString((char[]) obj);\r
+               }\r
+               if (obj instanceof double[]) {\r
+                       return nullSafeToString((double[]) obj);\r
+               }\r
+               if (obj instanceof float[]) {\r
+                       return nullSafeToString((float[]) obj);\r
+               }\r
+               if (obj instanceof int[]) {\r
+                       return nullSafeToString((int[]) obj);\r
+               }\r
+               if (obj instanceof long[]) {\r
+                       return nullSafeToString((long[]) obj);\r
+               }\r
+               if (obj instanceof short[]) {\r
+                       return nullSafeToString((short[]) obj);\r
+               }\r
+               String str = obj.toString();\r
+               return (str != null ? str : EMPTY_STRING);\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(Object[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+                       buffer.append(String.valueOf(array[i]));\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(boolean[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(byte[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(char[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+                       buffer.append("'").append(array[i]).append("'");\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(double[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(float[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(int[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(long[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+       /**\r
+        * Return a String representation of the contents of the specified array.\r
+        * <p>The String representation consists of a list of the array's elements,\r
+        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
+        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
+        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
+        * @param array the array to build a String representation for\r
+        * @return a String representation of <code>array</code>\r
+        */\r
+       public static String nullSafeToString(short[] array) {\r
+               if (array == null) {\r
+                       return NULL_STRING;\r
+               }\r
+               int length = array.length;\r
+               if (length == 0) {\r
+                       return EMPTY_ARRAY;\r
+               }\r
+               StringBuffer buffer = new StringBuffer();\r
+               for (int i = 0; i < length; i++) {\r
+                       if (i == 0) {\r
+                               buffer.append(ARRAY_START);\r
+                       }\r
+                       else {\r
+                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
+                       }\r
+                       buffer.append(array[i]);\r
+               }\r
+               buffer.append(ARRAY_END);\r
+               return buffer.toString();\r
+       }\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java
new file mode 100644 (file)
index 0000000..d7a2322
--- /dev/null
@@ -0,0 +1,91 @@
+/*\r
+ * Copyright 2002-2007 the original author or authors.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.argeo.osgi.boot.internal.springutil;\r
+\r
+/**\r
+ * Strategy interface for <code>String</code>-based path matching.\r
+ * \r
+ * <p>Used by {@link org.springframework.core.io.support.PathMatchingResourcePatternResolver},\r
+ * {@link org.springframework.web.servlet.handler.AbstractUrlHandlerMapping},\r
+ * {@link org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver},\r
+ * and {@link org.springframework.web.servlet.mvc.WebContentInterceptor}.\r
+ *\r
+ * <p>The default implementation is {@link AntPathMatcher}, supporting the\r
+ * Ant-style pattern syntax.\r
+ *\r
+ * @author Juergen Hoeller\r
+ * @since 1.2\r
+ * @see AntPathMatcher\r
+ */\r
+public interface PathMatcher {\r
+\r
+       /**\r
+        * Does the given <code>path</code> represent a pattern that can be matched\r
+        * by an implementation of this interface?\r
+        * <p>If the return value is <code>false</code>, then the {@link #match}\r
+        * method does not have to be used because direct equality comparisons\r
+        * on the static path Strings will lead to the same result.\r
+        * @param path the path String to check\r
+        * @return <code>true</code> if the given <code>path</code> represents a pattern\r
+        */\r
+       boolean isPattern(String path);\r
+\r
+       /**\r
+        * Match the given <code>path</code> against the given <code>pattern</code>,\r
+        * according to this PathMatcher's matching strategy.\r
+        * @param pattern the pattern to match against\r
+        * @param path the path String to test\r
+        * @return <code>true</code> if the supplied <code>path</code> matched,\r
+        * <code>false</code> if it didn't\r
+        */\r
+       boolean match(String pattern, String path);\r
+\r
+       /**\r
+        * Match the given <code>path</code> against the corresponding part of the given\r
+        * <code>pattern</code>, according to this PathMatcher's matching strategy.\r
+        * <p>Determines whether the pattern at least matches as far as the given base\r
+        * path goes, assuming that a full path may then match as well.\r
+        * @param pattern the pattern to match against\r
+        * @param path the path String to test\r
+        * @return <code>true</code> if the supplied <code>path</code> matched,\r
+        * <code>false</code> if it didn't\r
+        */\r
+       boolean matchStart(String pattern, String path);\r
+\r
+       /**\r
+        * Given a pattern and a full path, determine the pattern-mapped part.\r
+        * <p>This method is supposed to find out which part of the path is matched\r
+        * dynamically through an actual pattern, that is, it strips off a statically\r
+        * defined leading path from the given full path, returning only the actually\r
+        * pattern-matched part of the path.\r
+        * <p>For example: For "myroot/*.html" as pattern and "myroot/myfile.html"\r
+        * as full path, this method should return "myfile.html". The detailed\r
+        * determination rules are specified to this PathMatcher's matching strategy.\r
+        * <p>A simple implementation may return the given full path as-is in case\r
+        * of an actual pattern, and the empty String in case of the pattern not\r
+        * containing any dynamic parts (i.e. the <code>pattern</code> parameter being\r
+        * a static path that wouldn't qualify as an actual {@link #isPattern pattern}).\r
+        * A sophisticated implementation will differentiate between the static parts\r
+        * and the dynamic parts of the given path pattern.\r
+        * @param pattern the path pattern\r
+        * @param path the full path to introspect\r
+        * @return the pattern-mapped part of the given <code>path</code>\r
+        * (never <code>null</code>)\r
+        */\r
+       String extractPathWithinPattern(String pattern, String path);\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java
new file mode 100644 (file)
index 0000000..2626590
--- /dev/null
@@ -0,0 +1,1113 @@
+/*\r
+ * Copyright 2002-2008 the original author or authors.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.argeo.osgi.boot.internal.springutil;\r
+\r
+import java.util.ArrayList;\r
+import java.util.Arrays;\r
+import java.util.Collection;\r
+import java.util.Collections;\r
+import java.util.Enumeration;\r
+import java.util.Iterator;\r
+import java.util.LinkedList;\r
+import java.util.List;\r
+import java.util.Locale;\r
+import java.util.Properties;\r
+import java.util.Set;\r
+import java.util.StringTokenizer;\r
+import java.util.TreeSet;\r
+\r
+/**\r
+ * Miscellaneous {@link String} utility methods.\r
+ *\r
+ * <p>Mainly for internal use within the framework; consider\r
+ * <a href="http://jakarta.apache.org/commons/lang/">Jakarta's Commons Lang</a>\r
+ * for a more comprehensive suite of String utilities.\r
+ *\r
+ * <p>This class delivers some simple functionality that should really\r
+ * be provided by the core Java <code>String</code> and {@link StringBuffer}\r
+ * classes, such as the ability to {@link #replace} all occurrences of a given\r
+ * substring in a target string. It also provides easy-to-use methods to convert\r
+ * between delimited strings, such as CSV strings, and collections and arrays.\r
+ *\r
+ * @author Rod Johnson\r
+ * @author Juergen Hoeller\r
+ * @author Keith Donald\r
+ * @author Rob Harrop\r
+ * @author Rick Evans\r
+ * @since 16 April 2001\r
+ * @see org.apache.commons.lang.StringUtils\r
+ */\r
+public abstract class StringUtils {\r
+\r
+       private static final String FOLDER_SEPARATOR = "/";\r
+\r
+       private static final String WINDOWS_FOLDER_SEPARATOR = "\\";\r
+\r
+       private static final String TOP_PATH = "..";\r
+\r
+       private static final String CURRENT_PATH = ".";\r
+\r
+       private static final char EXTENSION_SEPARATOR = '.';\r
+\r
+\r
+       //---------------------------------------------------------------------\r
+       // General convenience methods for working with Strings\r
+       //---------------------------------------------------------------------\r
+\r
+       /**\r
+        * Check that the given CharSequence is neither <code>null</code> nor of length 0.\r
+        * Note: Will return <code>true</code> for a CharSequence that purely consists of whitespace.\r
+        * <p><pre>\r
+        * StringUtils.hasLength(null) = false\r
+        * StringUtils.hasLength("") = false\r
+        * StringUtils.hasLength(" ") = true\r
+        * StringUtils.hasLength("Hello") = true\r
+        * </pre>\r
+        * @param str the CharSequence to check (may be <code>null</code>)\r
+        * @return <code>true</code> if the CharSequence is not null and has length\r
+        * @see #hasText(String)\r
+        */\r
+       public static boolean hasLength(CharSequence str) {\r
+               return (str != null && str.length() > 0);\r
+       }\r
+\r
+       /**\r
+        * Check that the given String is neither <code>null</code> nor of length 0.\r
+        * Note: Will return <code>true</code> for a String that purely consists of whitespace.\r
+        * @param str the String to check (may be <code>null</code>)\r
+        * @return <code>true</code> if the String is not null and has length\r
+        * @see #hasLength(CharSequence)\r
+        */\r
+       public static boolean hasLength(String str) {\r
+               return hasLength((CharSequence) str);\r
+       }\r
+\r
+       /**\r
+        * Check whether the given CharSequence has actual text.\r
+        * More specifically, returns <code>true</code> if the string not <code>null</code>,\r
+        * its length is greater than 0, and it contains at least one non-whitespace character.\r
+        * <p><pre>\r
+        * StringUtils.hasText(null) = false\r
+        * StringUtils.hasText("") = false\r
+        * StringUtils.hasText(" ") = false\r
+        * StringUtils.hasText("12345") = true\r
+        * StringUtils.hasText(" 12345 ") = true\r
+        * </pre>\r
+        * @param str the CharSequence to check (may be <code>null</code>)\r
+        * @return <code>true</code> if the CharSequence is not <code>null</code>,\r
+        * its length is greater than 0, and it does not contain whitespace only\r
+        * @see java.lang.Character#isWhitespace\r
+        */\r
+       public static boolean hasText(CharSequence str) {\r
+               if (!hasLength(str)) {\r
+                       return false;\r
+               }\r
+               int strLen = str.length();\r
+               for (int i = 0; i < strLen; i++) {\r
+                       if (!Character.isWhitespace(str.charAt(i))) {\r
+                               return true;\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Check whether the given String has actual text.\r
+        * More specifically, returns <code>true</code> if the string not <code>null</code>,\r
+        * its length is greater than 0, and it contains at least one non-whitespace character.\r
+        * @param str the String to check (may be <code>null</code>)\r
+        * @return <code>true</code> if the String is not <code>null</code>, its length is\r
+        * greater than 0, and it does not contain whitespace only\r
+        * @see #hasText(CharSequence)\r
+        */\r
+       public static boolean hasText(String str) {\r
+               return hasText((CharSequence) str);\r
+       }\r
+\r
+       /**\r
+        * Check whether the given CharSequence contains any whitespace characters.\r
+        * @param str the CharSequence to check (may be <code>null</code>)\r
+        * @return <code>true</code> if the CharSequence is not empty and\r
+        * contains at least 1 whitespace character\r
+        * @see java.lang.Character#isWhitespace\r
+        */\r
+       public static boolean containsWhitespace(CharSequence str) {\r
+               if (!hasLength(str)) {\r
+                       return false;\r
+               }\r
+               int strLen = str.length();\r
+               for (int i = 0; i < strLen; i++) {\r
+                       if (Character.isWhitespace(str.charAt(i))) {\r
+                               return true;\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * Check whether the given String contains any whitespace characters.\r
+        * @param str the String to check (may be <code>null</code>)\r
+        * @return <code>true</code> if the String is not empty and\r
+        * contains at least 1 whitespace character\r
+        * @see #containsWhitespace(CharSequence)\r
+        */\r
+       public static boolean containsWhitespace(String str) {\r
+               return containsWhitespace((CharSequence) str);\r
+       }\r
+\r
+       /**\r
+        * Trim leading and trailing whitespace from the given String.\r
+        * @param str the String to check\r
+        * @return the trimmed String\r
+        * @see java.lang.Character#isWhitespace\r
+        */\r
+       public static String trimWhitespace(String str) {\r
+               if (!hasLength(str)) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str);\r
+               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(0))) {\r
+                       buf.deleteCharAt(0);\r
+               }\r
+               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(buf.length() - 1))) {\r
+                       buf.deleteCharAt(buf.length() - 1);\r
+               }\r
+               return buf.toString();\r
+       }\r
+\r
+       /**\r
+        * Trim <i>all</i> whitespace from the given String:\r
+        * leading, trailing, and inbetween characters.\r
+        * @param str the String to check\r
+        * @return the trimmed String\r
+        * @see java.lang.Character#isWhitespace\r
+        */\r
+       public static String trimAllWhitespace(String str) {\r
+               if (!hasLength(str)) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str);\r
+               int index = 0;\r
+               while (buf.length() > index) {\r
+                       if (Character.isWhitespace(buf.charAt(index))) {\r
+                               buf.deleteCharAt(index);\r
+                       }\r
+                       else {\r
+                               index++;\r
+                       }\r
+               }\r
+               return buf.toString();\r
+       }\r
+\r
+       /**\r
+        * Trim leading whitespace from the given String.\r
+        * @param str the String to check\r
+        * @return the trimmed String\r
+        * @see java.lang.Character#isWhitespace\r
+        */\r
+       public static String trimLeadingWhitespace(String str) {\r
+               if (!hasLength(str)) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str);\r
+               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(0))) {\r
+                       buf.deleteCharAt(0);\r
+               }\r
+               return buf.toString();\r
+       }\r
+\r
+       /**\r
+        * Trim trailing whitespace from the given String.\r
+        * @param str the String to check\r
+        * @return the trimmed String\r
+        * @see java.lang.Character#isWhitespace\r
+        */\r
+       public static String trimTrailingWhitespace(String str) {\r
+               if (!hasLength(str)) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str);\r
+               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(buf.length() - 1))) {\r
+                       buf.deleteCharAt(buf.length() - 1);\r
+               }\r
+               return buf.toString();\r
+       }\r
+\r
+       /**\r
+        * Trim all occurences of the supplied leading character from the given String.\r
+        * @param str the String to check\r
+        * @param leadingCharacter the leading character to be trimmed\r
+        * @return the trimmed String\r
+        */\r
+       public static String trimLeadingCharacter(String str, char leadingCharacter) {\r
+               if (!hasLength(str)) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str);\r
+               while (buf.length() > 0 && buf.charAt(0) == leadingCharacter) {\r
+                       buf.deleteCharAt(0);\r
+               }\r
+               return buf.toString();\r
+       }\r
+\r
+       /**\r
+        * Trim all occurences of the supplied trailing character from the given String.\r
+        * @param str the String to check\r
+        * @param trailingCharacter the trailing character to be trimmed\r
+        * @return the trimmed String\r
+        */\r
+       public static String trimTrailingCharacter(String str, char trailingCharacter) {\r
+               if (!hasLength(str)) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str);\r
+               while (buf.length() > 0 && buf.charAt(buf.length() - 1) == trailingCharacter) {\r
+                       buf.deleteCharAt(buf.length() - 1);\r
+               }\r
+               return buf.toString();\r
+       }\r
+\r
+\r
+       /**\r
+        * Test if the given String starts with the specified prefix,\r
+        * ignoring upper/lower case.\r
+        * @param str the String to check\r
+        * @param prefix the prefix to look for\r
+        * @see java.lang.String#startsWith\r
+        */\r
+       public static boolean startsWithIgnoreCase(String str, String prefix) {\r
+               if (str == null || prefix == null) {\r
+                       return false;\r
+               }\r
+               if (str.startsWith(prefix)) {\r
+                       return true;\r
+               }\r
+               if (str.length() < prefix.length()) {\r
+                       return false;\r
+               }\r
+               String lcStr = str.substring(0, prefix.length()).toLowerCase();\r
+               String lcPrefix = prefix.toLowerCase();\r
+               return lcStr.equals(lcPrefix);\r
+       }\r
+\r
+       /**\r
+        * Test if the given String ends with the specified suffix,\r
+        * ignoring upper/lower case.\r
+        * @param str the String to check\r
+        * @param suffix the suffix to look for\r
+        * @see java.lang.String#endsWith\r
+        */\r
+       public static boolean endsWithIgnoreCase(String str, String suffix) {\r
+               if (str == null || suffix == null) {\r
+                       return false;\r
+               }\r
+               if (str.endsWith(suffix)) {\r
+                       return true;\r
+               }\r
+               if (str.length() < suffix.length()) {\r
+                       return false;\r
+               }\r
+\r
+               String lcStr = str.substring(str.length() - suffix.length()).toLowerCase();\r
+               String lcSuffix = suffix.toLowerCase();\r
+               return lcStr.equals(lcSuffix);\r
+       }\r
+\r
+       /**\r
+        * Test whether the given string matches the given substring\r
+        * at the given index.\r
+        * @param str the original string (or StringBuffer)\r
+        * @param index the index in the original string to start matching against\r
+        * @param substring the substring to match at the given index\r
+        */\r
+       public static boolean substringMatch(CharSequence str, int index, CharSequence substring) {\r
+               for (int j = 0; j < substring.length(); j++) {\r
+                       int i = index + j;\r
+                       if (i >= str.length() || str.charAt(i) != substring.charAt(j)) {\r
+                               return false;\r
+                       }\r
+               }\r
+               return true;\r
+       }\r
+\r
+       /**\r
+        * Count the occurrences of the substring in string s.\r
+        * @param str string to search in. Return 0 if this is null.\r
+        * @param sub string to search for. Return 0 if this is null.\r
+        */\r
+       public static int countOccurrencesOf(String str, String sub) {\r
+               if (str == null || sub == null || str.length() == 0 || sub.length() == 0) {\r
+                       return 0;\r
+               }\r
+               int count = 0, pos = 0, idx = 0;\r
+               while ((idx = str.indexOf(sub, pos)) != -1) {\r
+                       ++count;\r
+                       pos = idx + sub.length();\r
+               }\r
+               return count;\r
+       }\r
+\r
+       /**\r
+        * Replace all occurences of a substring within a string with\r
+        * another string.\r
+        * @param inString String to examine\r
+        * @param oldPattern String to replace\r
+        * @param newPattern String to insert\r
+        * @return a String with the replacements\r
+        */\r
+       public static String replace(String inString, String oldPattern, String newPattern) {\r
+               if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {\r
+                       return inString;\r
+               }\r
+               StringBuffer sbuf = new StringBuffer();\r
+               // output StringBuffer we'll build up\r
+               int pos = 0; // our position in the old string\r
+               int index = inString.indexOf(oldPattern);\r
+               // the index of an occurrence we've found, or -1\r
+               int patLen = oldPattern.length();\r
+               while (index >= 0) {\r
+                       sbuf.append(inString.substring(pos, index));\r
+                       sbuf.append(newPattern);\r
+                       pos = index + patLen;\r
+                       index = inString.indexOf(oldPattern, pos);\r
+               }\r
+               sbuf.append(inString.substring(pos));\r
+               // remember to append any characters to the right of a match\r
+               return sbuf.toString();\r
+       }\r
+\r
+       /**\r
+        * Delete all occurrences of the given substring.\r
+        * @param inString the original String\r
+        * @param pattern the pattern to delete all occurrences of\r
+        * @return the resulting String\r
+        */\r
+       public static String delete(String inString, String pattern) {\r
+               return replace(inString, pattern, "");\r
+       }\r
+\r
+       /**\r
+        * Delete any character in a given String.\r
+        * @param inString the original String\r
+        * @param charsToDelete a set of characters to delete.\r
+        * E.g. "az\n" will delete 'a's, 'z's and new lines.\r
+        * @return the resulting String\r
+        */\r
+       public static String deleteAny(String inString, String charsToDelete) {\r
+               if (!hasLength(inString) || !hasLength(charsToDelete)) {\r
+                       return inString;\r
+               }\r
+               StringBuffer out = new StringBuffer();\r
+               for (int i = 0; i < inString.length(); i++) {\r
+                       char c = inString.charAt(i);\r
+                       if (charsToDelete.indexOf(c) == -1) {\r
+                               out.append(c);\r
+                       }\r
+               }\r
+               return out.toString();\r
+       }\r
+\r
+\r
+       //---------------------------------------------------------------------\r
+       // Convenience methods for working with formatted Strings\r
+       //---------------------------------------------------------------------\r
+\r
+       /**\r
+        * Quote the given String with single quotes.\r
+        * @param str the input String (e.g. "myString")\r
+        * @return the quoted String (e.g. "'myString'"),\r
+        * or <code>null<code> if the input was <code>null</code>\r
+        */\r
+       public static String quote(String str) {\r
+               return (str != null ? "'" + str + "'" : null);\r
+       }\r
+\r
+       /**\r
+        * Turn the given Object into a String with single quotes\r
+        * if it is a String; keeping the Object as-is else.\r
+        * @param obj the input Object (e.g. "myString")\r
+        * @return the quoted String (e.g. "'myString'"),\r
+        * or the input object as-is if not a String\r
+        */\r
+       public static Object quoteIfString(Object obj) {\r
+               return (obj instanceof String ? quote((String) obj) : obj);\r
+       }\r
+\r
+       /**\r
+        * Unqualify a string qualified by a '.' dot character. For example,\r
+        * "this.name.is.qualified", returns "qualified".\r
+        * @param qualifiedName the qualified name\r
+        */\r
+       public static String unqualify(String qualifiedName) {\r
+               return unqualify(qualifiedName, '.');\r
+       }\r
+\r
+       /**\r
+        * Unqualify a string qualified by a separator character. For example,\r
+        * "this:name:is:qualified" returns "qualified" if using a ':' separator.\r
+        * @param qualifiedName the qualified name\r
+        * @param separator the separator\r
+        */\r
+       public static String unqualify(String qualifiedName, char separator) {\r
+               return qualifiedName.substring(qualifiedName.lastIndexOf(separator) + 1);\r
+       }\r
+\r
+       /**\r
+        * Capitalize a <code>String</code>, changing the first letter to\r
+        * upper case as per {@link Character#toUpperCase(char)}.\r
+        * No other letters are changed.\r
+        * @param str the String to capitalize, may be <code>null</code>\r
+        * @return the capitalized String, <code>null</code> if null\r
+        */\r
+       public static String capitalize(String str) {\r
+               return changeFirstCharacterCase(str, true);\r
+       }\r
+\r
+       /**\r
+        * Uncapitalize a <code>String</code>, changing the first letter to\r
+        * lower case as per {@link Character#toLowerCase(char)}.\r
+        * No other letters are changed.\r
+        * @param str the String to uncapitalize, may be <code>null</code>\r
+        * @return the uncapitalized String, <code>null</code> if null\r
+        */\r
+       public static String uncapitalize(String str) {\r
+               return changeFirstCharacterCase(str, false);\r
+       }\r
+\r
+       private static String changeFirstCharacterCase(String str, boolean capitalize) {\r
+               if (str == null || str.length() == 0) {\r
+                       return str;\r
+               }\r
+               StringBuffer buf = new StringBuffer(str.length());\r
+               if (capitalize) {\r
+                       buf.append(Character.toUpperCase(str.charAt(0)));\r
+               }\r
+               else {\r
+                       buf.append(Character.toLowerCase(str.charAt(0)));\r
+               }\r
+               buf.append(str.substring(1));\r
+               return buf.toString();\r
+       }\r
+\r
+       /**\r
+        * Extract the filename from the given path,\r
+        * e.g. "mypath/myfile.txt" -> "myfile.txt".\r
+        * @param path the file path (may be <code>null</code>)\r
+        * @return the extracted filename, or <code>null</code> if none\r
+        */\r
+       public static String getFilename(String path) {\r
+               if (path == null) {\r
+                       return null;\r
+               }\r
+               int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);\r
+               return (separatorIndex != -1 ? path.substring(separatorIndex + 1) : path);\r
+       }\r
+\r
+       /**\r
+        * Extract the filename extension from the given path,\r
+        * e.g. "mypath/myfile.txt" -> "txt".\r
+        * @param path the file path (may be <code>null</code>)\r
+        * @return the extracted filename extension, or <code>null</code> if none\r
+        */\r
+       public static String getFilenameExtension(String path) {\r
+               if (path == null) {\r
+                       return null;\r
+               }\r
+               int sepIndex = path.lastIndexOf(EXTENSION_SEPARATOR);\r
+               return (sepIndex != -1 ? path.substring(sepIndex + 1) : null);\r
+       }\r
+\r
+       /**\r
+        * Strip the filename extension from the given path,\r
+        * e.g. "mypath/myfile.txt" -> "mypath/myfile".\r
+        * @param path the file path (may be <code>null</code>)\r
+        * @return the path with stripped filename extension,\r
+        * or <code>null</code> if none\r
+        */\r
+       public static String stripFilenameExtension(String path) {\r
+               if (path == null) {\r
+                       return null;\r
+               }\r
+               int sepIndex = path.lastIndexOf(EXTENSION_SEPARATOR);\r
+               return (sepIndex != -1 ? path.substring(0, sepIndex) : path);\r
+       }\r
+\r
+       /**\r
+        * Apply the given relative path to the given path,\r
+        * assuming standard Java folder separation (i.e. "/" separators);\r
+        * @param path the path to start from (usually a full file path)\r
+        * @param relativePath the relative path to apply\r
+        * (relative to the full file path above)\r
+        * @return the full file path that results from applying the relative path\r
+        */\r
+       public static String applyRelativePath(String path, String relativePath) {\r
+               int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);\r
+               if (separatorIndex != -1) {\r
+                       String newPath = path.substring(0, separatorIndex);\r
+                       if (!relativePath.startsWith(FOLDER_SEPARATOR)) {\r
+                               newPath += FOLDER_SEPARATOR;\r
+                       }\r
+                       return newPath + relativePath;\r
+               }\r
+               else {\r
+                       return relativePath;\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Normalize the path by suppressing sequences like "path/.." and\r
+        * inner simple dots.\r
+        * <p>The result is convenient for path comparison. For other uses,\r
+        * notice that Windows separators ("\") are replaced by simple slashes.\r
+        * @param path the original path\r
+        * @return the normalized path\r
+        */\r
+       public static String cleanPath(String path) {\r
+               if (path == null) {\r
+                       return null;\r
+               }\r
+               String pathToUse = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);\r
+\r
+               // Strip prefix from path to analyze, to not treat it as part of the\r
+               // first path element. This is necessary to correctly parse paths like\r
+               // "file:core/../core/io/Resource.class", where the ".." should just\r
+               // strip the first "core" directory while keeping the "file:" prefix.\r
+               int prefixIndex = pathToUse.indexOf(":");\r
+               String prefix = "";\r
+               if (prefixIndex != -1) {\r
+                       prefix = pathToUse.substring(0, prefixIndex + 1);\r
+                       pathToUse = pathToUse.substring(prefixIndex + 1);\r
+               }\r
+               if (pathToUse.startsWith(FOLDER_SEPARATOR)) {\r
+                       prefix = prefix + FOLDER_SEPARATOR;\r
+                       pathToUse = pathToUse.substring(1);\r
+               }\r
+\r
+               String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);\r
+               List pathElements = new LinkedList();\r
+               int tops = 0;\r
+\r
+               for (int i = pathArray.length - 1; i >= 0; i--) {\r
+                       String element = pathArray[i];\r
+                       if (CURRENT_PATH.equals(element)) {\r
+                               // Points to current directory - drop it.\r
+                       }\r
+                       else if (TOP_PATH.equals(element)) {\r
+                               // Registering top path found.\r
+                               tops++;\r
+                       }\r
+                       else {\r
+                               if (tops > 0) {\r
+                                       // Merging path element with element corresponding to top path.\r
+                                       tops--;\r
+                               }\r
+                               else {\r
+                                       // Normal path element found.\r
+                                       pathElements.add(0, element);\r
+                               }\r
+                       }\r
+               }\r
+\r
+               // Remaining top paths need to be retained.\r
+               for (int i = 0; i < tops; i++) {\r
+                       pathElements.add(0, TOP_PATH);\r
+               }\r
+\r
+               return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);\r
+       }\r
+\r
+       /**\r
+        * Compare two paths after normalization of them.\r
+        * @param path1 first path for comparison\r
+        * @param path2 second path for comparison\r
+        * @return whether the two paths are equivalent after normalization\r
+        */\r
+       public static boolean pathEquals(String path1, String path2) {\r
+               return cleanPath(path1).equals(cleanPath(path2));\r
+       }\r
+\r
+       /**\r
+        * Parse the given <code>localeString</code> into a {@link Locale}.\r
+        * <p>This is the inverse operation of {@link Locale#toString Locale's toString}.\r
+        * @param localeString the locale string, following <code>Locale's</code>\r
+        * <code>toString()</code> format ("en", "en_UK", etc);\r
+        * also accepts spaces as separators, as an alternative to underscores\r
+        * @return a corresponding <code>Locale</code> instance\r
+        */\r
+       public static Locale parseLocaleString(String localeString) {\r
+               String[] parts = tokenizeToStringArray(localeString, "_ ", false, false);\r
+               String language = (parts.length > 0 ? parts[0] : "");\r
+               String country = (parts.length > 1 ? parts[1] : "");\r
+               String variant = "";\r
+               if (parts.length >= 2) {\r
+                       // There is definitely a variant, and it is everything after the country\r
+                       // code sans the separator between the country code and the variant.\r
+                       int endIndexOfCountryCode = localeString.indexOf(country) + country.length();\r
+                       // Strip off any leading '_' and whitespace, what's left is the variant.\r
+                       variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));\r
+                       if (variant.startsWith("_")) {\r
+                               variant = trimLeadingCharacter(variant, '_');\r
+                       }\r
+               }\r
+               return (language.length() > 0 ? new Locale(language, country, variant) : null);\r
+       }\r
+\r
+       /**\r
+        * Determine the RFC 3066 compliant language tag,\r
+        * as used for the HTTP "Accept-Language" header.\r
+        * @param locale the Locale to transform to a language tag\r
+        * @return the RFC 3066 compliant language tag as String\r
+        */\r
+       public static String toLanguageTag(Locale locale) {\r
+               return locale.getLanguage() + (hasText(locale.getCountry()) ? "-" + locale.getCountry() : "");\r
+       }\r
+\r
+\r
+       //---------------------------------------------------------------------\r
+       // Convenience methods for working with String arrays\r
+       //---------------------------------------------------------------------\r
+\r
+       /**\r
+        * Append the given String to the given String array, returning a new array\r
+        * consisting of the input array contents plus the given String.\r
+        * @param array the array to append to (can be <code>null</code>)\r
+        * @param str the String to append\r
+        * @return the new array (never <code>null</code>)\r
+        */\r
+       public static String[] addStringToArray(String[] array, String str) {\r
+               if (ObjectUtils.isEmpty(array)) {\r
+                       return new String[] {str};\r
+               }\r
+               String[] newArr = new String[array.length + 1];\r
+               System.arraycopy(array, 0, newArr, 0, array.length);\r
+               newArr[array.length] = str;\r
+               return newArr;\r
+       }\r
+\r
+       /**\r
+        * Concatenate the given String arrays into one,\r
+        * with overlapping array elements included twice.\r
+        * <p>The order of elements in the original arrays is preserved.\r
+        * @param array1 the first array (can be <code>null</code>)\r
+        * @param array2 the second array (can be <code>null</code>)\r
+        * @return the new array (<code>null</code> if both given arrays were <code>null</code>)\r
+        */\r
+       public static String[] concatenateStringArrays(String[] array1, String[] array2) {\r
+               if (ObjectUtils.isEmpty(array1)) {\r
+                       return array2;\r
+               }\r
+               if (ObjectUtils.isEmpty(array2)) {\r
+                       return array1;\r
+               }\r
+               String[] newArr = new String[array1.length + array2.length];\r
+               System.arraycopy(array1, 0, newArr, 0, array1.length);\r
+               System.arraycopy(array2, 0, newArr, array1.length, array2.length);\r
+               return newArr;\r
+       }\r
+\r
+       /**\r
+        * Merge the given String arrays into one, with overlapping\r
+        * array elements only included once.\r
+        * <p>The order of elements in the original arrays is preserved\r
+        * (with the exception of overlapping elements, which are only\r
+        * included on their first occurence).\r
+        * @param array1 the first array (can be <code>null</code>)\r
+        * @param array2 the second array (can be <code>null</code>)\r
+        * @return the new array (<code>null</code> if both given arrays were <code>null</code>)\r
+        */\r
+       public static String[] mergeStringArrays(String[] array1, String[] array2) {\r
+               if (ObjectUtils.isEmpty(array1)) {\r
+                       return array2;\r
+               }\r
+               if (ObjectUtils.isEmpty(array2)) {\r
+                       return array1;\r
+               }\r
+               List result = new ArrayList();\r
+               result.addAll(Arrays.asList(array1));\r
+               for (int i = 0; i < array2.length; i++) {\r
+                       String str = array2[i];\r
+                       if (!result.contains(str)) {\r
+                               result.add(str);\r
+                       }\r
+               }\r
+               return toStringArray(result);\r
+       }\r
+\r
+       /**\r
+        * Turn given source String array into sorted array.\r
+        * @param array the source array\r
+        * @return the sorted array (never <code>null</code>)\r
+        */\r
+       public static String[] sortStringArray(String[] array) {\r
+               if (ObjectUtils.isEmpty(array)) {\r
+                       return new String[0];\r
+               }\r
+               Arrays.sort(array);\r
+               return array;\r
+       }\r
+\r
+       /**\r
+        * Copy the given Collection into a String array.\r
+        * The Collection must contain String elements only.\r
+        * @param collection the Collection to copy\r
+        * @return the String array (<code>null</code> if the passed-in\r
+        * Collection was <code>null</code>)\r
+        */\r
+       public static String[] toStringArray(Collection collection) {\r
+               if (collection == null) {\r
+                       return null;\r
+               }\r
+               return (String[]) collection.toArray(new String[collection.size()]);\r
+       }\r
+\r
+       /**\r
+        * Copy the given Enumeration into a String array.\r
+        * The Enumeration must contain String elements only.\r
+        * @param enumeration the Enumeration to copy\r
+        * @return the String array (<code>null</code> if the passed-in\r
+        * Enumeration was <code>null</code>)\r
+        */\r
+       public static String[] toStringArray(Enumeration enumeration) {\r
+               if (enumeration == null) {\r
+                       return null;\r
+               }\r
+               List list = Collections.list(enumeration);\r
+               return (String[]) list.toArray(new String[list.size()]);\r
+       }\r
+\r
+       /**\r
+        * Trim the elements of the given String array,\r
+        * calling <code>String.trim()</code> on each of them.\r
+        * @param array the original String array\r
+        * @return the resulting array (of the same size) with trimmed elements\r
+        */\r
+       public static String[] trimArrayElements(String[] array) {\r
+               if (ObjectUtils.isEmpty(array)) {\r
+                       return new String[0];\r
+               }\r
+               String[] result = new String[array.length];\r
+               for (int i = 0; i < array.length; i++) {\r
+                       String element = array[i];\r
+                       result[i] = (element != null ? element.trim() : null);\r
+               }\r
+               return result;\r
+       }\r
+\r
+       /**\r
+        * Remove duplicate Strings from the given array.\r
+        * Also sorts the array, as it uses a TreeSet.\r
+        * @param array the String array\r
+        * @return an array without duplicates, in natural sort order\r
+        */\r
+       public static String[] removeDuplicateStrings(String[] array) {\r
+               if (ObjectUtils.isEmpty(array)) {\r
+                       return array;\r
+               }\r
+               Set set = new TreeSet();\r
+               for (int i = 0; i < array.length; i++) {\r
+                       set.add(array[i]);\r
+               }\r
+               return toStringArray(set);\r
+       }\r
+\r
+       /**\r
+        * Split a String at the first occurrence of the delimiter.\r
+        * Does not include the delimiter in the result.\r
+        * @param toSplit the string to split\r
+        * @param delimiter to split the string up with\r
+        * @return a two element array with index 0 being before the delimiter, and\r
+        * index 1 being after the delimiter (neither element includes the delimiter);\r
+        * or <code>null</code> if the delimiter wasn't found in the given input String\r
+        */\r
+       public static String[] split(String toSplit, String delimiter) {\r
+               if (!hasLength(toSplit) || !hasLength(delimiter)) {\r
+                       return null;\r
+               }\r
+               int offset = toSplit.indexOf(delimiter);\r
+               if (offset < 0) {\r
+                       return null;\r
+               }\r
+               String beforeDelimiter = toSplit.substring(0, offset);\r
+               String afterDelimiter = toSplit.substring(offset + delimiter.length());\r
+               return new String[] {beforeDelimiter, afterDelimiter};\r
+       }\r
+\r
+       /**\r
+        * Take an array Strings and split each element based on the given delimiter.\r
+        * A <code>Properties</code> instance is then generated, with the left of the\r
+        * delimiter providing the key, and the right of the delimiter providing the value.\r
+        * <p>Will trim both the key and value before adding them to the\r
+        * <code>Properties</code> instance.\r
+        * @param array the array to process\r
+        * @param delimiter to split each element using (typically the equals symbol)\r
+        * @return a <code>Properties</code> instance representing the array contents,\r
+        * or <code>null</code> if the array to process was null or empty\r
+        */\r
+       public static Properties splitArrayElementsIntoProperties(String[] array, String delimiter) {\r
+               return splitArrayElementsIntoProperties(array, delimiter, null);\r
+       }\r
+\r
+       /**\r
+        * Take an array Strings and split each element based on the given delimiter.\r
+        * A <code>Properties</code> instance is then generated, with the left of the\r
+        * delimiter providing the key, and the right of the delimiter providing the value.\r
+        * <p>Will trim both the key and value before adding them to the\r
+        * <code>Properties</code> instance.\r
+        * @param array the array to process\r
+        * @param delimiter to split each element using (typically the equals symbol)\r
+        * @param charsToDelete one or more characters to remove from each element\r
+        * prior to attempting the split operation (typically the quotation mark\r
+        * symbol), or <code>null</code> if no removal should occur\r
+        * @return a <code>Properties</code> instance representing the array contents,\r
+        * or <code>null</code> if the array to process was <code>null</code> or empty\r
+        */\r
+       public static Properties splitArrayElementsIntoProperties(\r
+                       String[] array, String delimiter, String charsToDelete) {\r
+\r
+               if (ObjectUtils.isEmpty(array)) {\r
+                       return null;\r
+               }\r
+               Properties result = new Properties();\r
+               for (int i = 0; i < array.length; i++) {\r
+                       String element = array[i];\r
+                       if (charsToDelete != null) {\r
+                               element = deleteAny(array[i], charsToDelete);\r
+                       }\r
+                       String[] splittedElement = split(element, delimiter);\r
+                       if (splittedElement == null) {\r
+                               continue;\r
+                       }\r
+                       result.setProperty(splittedElement[0].trim(), splittedElement[1].trim());\r
+               }\r
+               return result;\r
+       }\r
+\r
+       /**\r
+        * Tokenize the given String into a String array via a StringTokenizer.\r
+        * Trims tokens and omits empty tokens.\r
+        * <p>The given delimiters string is supposed to consist of any number of\r
+        * delimiter characters. Each of those characters can be used to separate\r
+        * tokens. A delimiter is always a single character; for multi-character\r
+        * delimiters, consider using <code>delimitedListToStringArray</code>\r
+        * @param str the String to tokenize\r
+        * @param delimiters the delimiter characters, assembled as String\r
+        * (each of those characters is individually considered as delimiter).\r
+        * @return an array of the tokens\r
+        * @see java.util.StringTokenizer\r
+        * @see java.lang.String#trim()\r
+        * @see #delimitedListToStringArray\r
+        */\r
+       public static String[] tokenizeToStringArray(String str, String delimiters) {\r
+               return tokenizeToStringArray(str, delimiters, true, true);\r
+       }\r
+\r
+       /**\r
+        * Tokenize the given String into a String array via a StringTokenizer.\r
+        * <p>The given delimiters string is supposed to consist of any number of\r
+        * delimiter characters. Each of those characters can be used to separate\r
+        * tokens. A delimiter is always a single character; for multi-character\r
+        * delimiters, consider using <code>delimitedListToStringArray</code>\r
+        * @param str the String to tokenize\r
+        * @param delimiters the delimiter characters, assembled as String\r
+        * (each of those characters is individually considered as delimiter)\r
+        * @param trimTokens trim the tokens via String's <code>trim</code>\r
+        * @param ignoreEmptyTokens omit empty tokens from the result array\r
+        * (only applies to tokens that are empty after trimming; StringTokenizer\r
+        * will not consider subsequent delimiters as token in the first place).\r
+        * @return an array of the tokens (<code>null</code> if the input String\r
+        * was <code>null</code>)\r
+        * @see java.util.StringTokenizer\r
+        * @see java.lang.String#trim()\r
+        * @see #delimitedListToStringArray\r
+        */\r
+       public static String[] tokenizeToStringArray(\r
+                       String str, String delimiters, boolean trimTokens, boolean ignoreEmptyTokens) {\r
+\r
+               if (str == null) {\r
+                       return null;\r
+               }\r
+               StringTokenizer st = new StringTokenizer(str, delimiters);\r
+               List tokens = new ArrayList();\r
+               while (st.hasMoreTokens()) {\r
+                       String token = st.nextToken();\r
+                       if (trimTokens) {\r
+                               token = token.trim();\r
+                       }\r
+                       if (!ignoreEmptyTokens || token.length() > 0) {\r
+                               tokens.add(token);\r
+                       }\r
+               }\r
+               return toStringArray(tokens);\r
+       }\r
+\r
+       /**\r
+        * Take a String which is a delimited list and convert it to a String array.\r
+        * <p>A single delimiter can consists of more than one character: It will still\r
+        * be considered as single delimiter string, rather than as bunch of potential\r
+        * delimiter characters - in contrast to <code>tokenizeToStringArray</code>.\r
+        * @param str the input String\r
+        * @param delimiter the delimiter between elements (this is a single delimiter,\r
+        * rather than a bunch individual delimiter characters)\r
+        * @return an array of the tokens in the list\r
+        * @see #tokenizeToStringArray\r
+        */\r
+       public static String[] delimitedListToStringArray(String str, String delimiter) {\r
+               return delimitedListToStringArray(str, delimiter, null);\r
+       }\r
+\r
+       /**\r
+        * Take a String which is a delimited list and convert it to a String array.\r
+        * <p>A single delimiter can consists of more than one character: It will still\r
+        * be considered as single delimiter string, rather than as bunch of potential\r
+        * delimiter characters - in contrast to <code>tokenizeToStringArray</code>.\r
+        * @param str the input String\r
+        * @param delimiter the delimiter between elements (this is a single delimiter,\r
+        * rather than a bunch individual delimiter characters)\r
+        * @param charsToDelete a set of characters to delete. Useful for deleting unwanted\r
+        * line breaks: e.g. "\r\n\f" will delete all new lines and line feeds in a String.\r
+        * @return an array of the tokens in the list\r
+        * @see #tokenizeToStringArray\r
+        */\r
+       public static String[] delimitedListToStringArray(String str, String delimiter, String charsToDelete) {\r
+               if (str == null) {\r
+                       return new String[0];\r
+               }\r
+               if (delimiter == null) {\r
+                       return new String[] {str};\r
+               }\r
+               List result = new ArrayList();\r
+               if ("".equals(delimiter)) {\r
+                       for (int i = 0; i < str.length(); i++) {\r
+                               result.add(deleteAny(str.substring(i, i + 1), charsToDelete));\r
+                       }\r
+               }\r
+               else {\r
+                       int pos = 0;\r
+                       int delPos = 0;\r
+                       while ((delPos = str.indexOf(delimiter, pos)) != -1) {\r
+                               result.add(deleteAny(str.substring(pos, delPos), charsToDelete));\r
+                               pos = delPos + delimiter.length();\r
+                       }\r
+                       if (str.length() > 0 && pos <= str.length()) {\r
+                               // Add rest of String, but not in case of empty input.\r
+                               result.add(deleteAny(str.substring(pos), charsToDelete));\r
+                       }\r
+               }\r
+               return toStringArray(result);\r
+       }\r
+\r
+       /**\r
+        * Convert a CSV list into an array of Strings.\r
+        * @param str the input String\r
+        * @return an array of Strings, or the empty array in case of empty input\r
+        */\r
+       public static String[] commaDelimitedListToStringArray(String str) {\r
+               return delimitedListToStringArray(str, ",");\r
+       }\r
+\r
+       /**\r
+        * Convenience method to convert a CSV string list to a set.\r
+        * Note that this will suppress duplicates.\r
+        * @param str the input String\r
+        * @return a Set of String entries in the list\r
+        */\r
+       public static Set commaDelimitedListToSet(String str) {\r
+               Set set = new TreeSet();\r
+               String[] tokens = commaDelimitedListToStringArray(str);\r
+               for (int i = 0; i < tokens.length; i++) {\r
+                       set.add(tokens[i]);\r
+               }\r
+               return set;\r
+       }\r
+\r
+       /**\r
+        * Convenience method to return a Collection as a delimited (e.g. CSV)\r
+        * String. E.g. useful for <code>toString()</code> implementations.\r
+        * @param coll the Collection to display\r
+        * @param delim the delimiter to use (probably a ",")\r
+        * @param prefix the String to start each element with\r
+        * @param suffix the String to end each element with\r
+        * @return the delimited String\r
+        */\r
+       public static String collectionToDelimitedString(Collection coll, String delim, String prefix, String suffix) {\r
+               if (CollectionUtils.isEmpty(coll)) {\r
+                       return "";\r
+               }\r
+               StringBuffer sb = new StringBuffer();\r
+               Iterator it = coll.iterator();\r
+               while (it.hasNext()) {\r
+                       sb.append(prefix).append(it.next()).append(suffix);\r
+                       if (it.hasNext()) {\r
+                               sb.append(delim);\r
+                       }\r
+               }\r
+               return sb.toString();\r
+       }\r
+\r
+       /**\r
+        * Convenience method to return a Collection as a delimited (e.g. CSV)\r
+        * String. E.g. useful for <code>toString()</code> implementations.\r
+        * @param coll the Collection to display\r
+        * @param delim the delimiter to use (probably a ",")\r
+        * @return the delimited String\r
+        */\r
+       public static String collectionToDelimitedString(Collection coll, String delim) {\r
+               return collectionToDelimitedString(coll, delim, "", "");\r
+       }\r
+\r
+       /**\r
+        * Convenience method to return a Collection as a CSV String.\r
+        * E.g. useful for <code>toString()</code> implementations.\r
+        * @param coll the Collection to display\r
+        * @return the delimited String\r
+        */\r
+       public static String collectionToCommaDelimitedString(Collection coll) {\r
+               return collectionToDelimitedString(coll, ",");\r
+       }\r
+\r
+       /**\r
+        * Convenience method to return a String array as a delimited (e.g. CSV)\r
+        * String. E.g. useful for <code>toString()</code> implementations.\r
+        * @param arr the array to display\r
+        * @param delim the delimiter to use (probably a ",")\r
+        * @return the delimited String\r
+        */\r
+       public static String arrayToDelimitedString(Object[] arr, String delim) {\r
+               if (ObjectUtils.isEmpty(arr)) {\r
+                       return "";\r
+               }\r
+               StringBuffer sb = new StringBuffer();\r
+               for (int i = 0; i < arr.length; i++) {\r
+                       if (i > 0) {\r
+                               sb.append(delim);\r
+                       }\r
+                       sb.append(arr[i]);\r
+               }\r
+               return sb.toString();\r
+       }\r
+\r
+       /**\r
+        * Convenience method to return a String array as a CSV String.\r
+        * E.g. useful for <code>toString()</code> implementations.\r
+        * @param arr the array to display\r
+        * @return the delimited String\r
+        */\r
+       public static String arrayToCommaDelimitedString(Object[] arr) {\r
+               return arrayToDelimitedString(arr, ",");\r
+       }\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java b/base/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java
new file mode 100644 (file)
index 0000000..f81adc2
--- /dev/null
@@ -0,0 +1,87 @@
+/*\r
+ * Copyright 2002-2008 the original author or authors.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.argeo.osgi.boot.internal.springutil;\r
+\r
+/**\r
+ * Helper class for resolving placeholders in texts. Usually applied to file paths.\r
+ *\r
+ * <p>A text may contain <code>${...}</code> placeholders, to be resolved as\r
+ * system properties: e.g. <code>${user.dir}</code>.\r
+ *\r
+ * @author Juergen Hoeller\r
+ * @since 1.2.5\r
+ * @see #PLACEHOLDER_PREFIX\r
+ * @see #PLACEHOLDER_SUFFIX\r
+ * @see System#getProperty(String)\r
+ */\r
+public abstract class SystemPropertyUtils {\r
+\r
+       /** Prefix for system property placeholders: "${" */\r
+       public static final String PLACEHOLDER_PREFIX = "${";\r
+\r
+       /** Suffix for system property placeholders: "}" */\r
+       public static final String PLACEHOLDER_SUFFIX = "}";\r
+\r
+\r
+       /**\r
+        * Resolve ${...} placeholders in the given text,\r
+        * replacing them with corresponding system property values.\r
+        * @param text the String to resolve\r
+        * @return the resolved String\r
+        * @see #PLACEHOLDER_PREFIX\r
+        * @see #PLACEHOLDER_SUFFIX\r
+        */\r
+       public static String resolvePlaceholders(String text) {\r
+               StringBuffer buf = new StringBuffer(text);\r
+\r
+               int startIndex = buf.indexOf(PLACEHOLDER_PREFIX);\r
+               while (startIndex != -1) {\r
+                       int endIndex = buf.indexOf(PLACEHOLDER_SUFFIX, startIndex + PLACEHOLDER_PREFIX.length());\r
+                       if (endIndex != -1) {\r
+                               String placeholder = buf.substring(startIndex + PLACEHOLDER_PREFIX.length(), endIndex);\r
+                               int nextIndex = endIndex + PLACEHOLDER_SUFFIX.length();\r
+                               try {\r
+                                       String propVal = System.getProperty(placeholder);\r
+                                       if (propVal == null) {\r
+                                               // Fall back to searching the system environment.\r
+                                               //propVal = System.getenv(placeholder);// mbaudier - 2009-07-26\r
+                                               throw new Error("getenv no longer supported, use properties and -D instead: " + placeholder);\r
+                                       }\r
+                                       if (propVal != null) {\r
+                                               buf.replace(startIndex, endIndex + PLACEHOLDER_SUFFIX.length(), propVal);\r
+                                               nextIndex = startIndex + propVal.length();\r
+                                       }\r
+                                       else {\r
+                                               System.err.println("Could not resolve placeholder '" + placeholder + "' in [" + text +\r
+                                                               "] as system property: neither system property nor environment variable found");\r
+                                       }\r
+                               }\r
+                               catch (Throwable ex) {\r
+                                       System.err.println("Could not resolve placeholder '" + placeholder + "' in [" + text +\r
+                                                       "] as system property: " + ex);\r
+                               }\r
+                               startIndex = buf.indexOf(PLACEHOLDER_PREFIX, nextIndex);\r
+                       }\r
+                       else {\r
+                               startIndex = -1;\r
+                       }\r
+               }\r
+\r
+               return buf.toString();\r
+       }\r
+\r
+}\r
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar b/base/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF b/base/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..f23da44
--- /dev/null
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle3
+Bundle-Version: 0.1.0
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF b/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..9344d07
--- /dev/null
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle0
+Bundle-Version: 0.1.0
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF b/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..0fb66dc
--- /dev/null
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle1
+Bundle-Version: 0.1.0
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF b/base/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..97ecd31
--- /dev/null
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle2
+Bundle-Version: 0.1.0
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java b/base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java
new file mode 100644 (file)
index 0000000..dbc80c1
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.osgi.boot;
+
+import java.io.File;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.argeo.osgi.boot.OsgiBoot;
+
+/** Tests which do not require a runtime. */
+public class OsgiBootNoRuntimeTest extends TestCase {
+       public final static String BUNDLES = "src/test/bundles/some;in=*;ex=excluded,"
+                       + "src/test/bundles/others;in=**/org.argeo.*";
+
+       /** Tests that location lists are properly parsed. */
+       public void testLocations() {
+               String baseUrl = "file:";
+               String locations = "/mydir/myfile" + File.pathSeparator
+                               + "/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));
+               assertEquals("file:/myotherdir/myotherfile", urls.get(1));
+       }
+
+       /** Tests that bundle lists are properly parsed. */
+       public void testBundles() {
+               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));
+               assertEquals(3, urls.size());
+
+               List jarUrls = osgiBoot.getBundlesUrls(baseUrl,
+                               "src/test/bundles/jars;in=*.jar");
+               for (int i = 0; i < jarUrls.size(); i++)
+                       System.out.println(jarUrls.get(i));
+               assertEquals(1, jarUrls.size());
+       }
+}
diff --git a/base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/base/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
new file mode 100644 (file)
index 0000000..fd32f1a
--- /dev/null
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.osgi.boot;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.adaptor.EclipseStarter;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/** Starts an Equinox runtime and provision it with OSGi boot. */
+public class OsgiBootRuntimeTest extends TestCase {
+       protected OsgiBoot osgiBoot = null;
+       private boolean osgiRuntimeAlreadyRunning = false;
+
+       public void testInstallAndStart() throws Exception {
+               if (osgiRuntimeAlreadyRunning) {
+                       System.out
+                                       .println("OSGi runtime already running, skipping test...");
+                       return;
+               }
+               osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
+                               OsgiBootNoRuntimeTest.BUNDLES));
+               Map map = new TreeMap(osgiBoot.getBundlesBySymbolicName());
+               for (Iterator keys = map.keySet().iterator(); keys.hasNext();) {
+                       Object key = keys.next();
+                       Bundle bundle = (Bundle) map.get(key);
+                       System.out.println(key + " : " + bundle.getLocation());
+               }
+               assertEquals(4, map.size());
+               Iterator keys = map.keySet().iterator();
+               assertEquals("org.argeo.osgi.boot.test.bundle1", keys.next());
+               assertEquals("org.argeo.osgi.boot.test.bundle2", keys.next());
+               assertEquals("org.argeo.osgi.boot.test.bundle3", keys.next());
+               assertEquals("org.eclipse.osgi", keys.next());
+
+               osgiBoot.startBundles("org.argeo.osgi.boot.test.bundle2");
+               long begin = System.currentTimeMillis();
+               while (System.currentTimeMillis() - begin < 10000) {
+                       Map mapBundles = osgiBoot.getBundlesBySymbolicName();
+                       Bundle bundle = (Bundle) mapBundles
+                                       .get("org.argeo.osgi.boot.test.bundle2");
+                       if (bundle.getState() == Bundle.ACTIVE) {
+                               System.out.println("Bundle " + bundle + " started.");
+                               return;
+                       }
+               }
+               fail("Bundle not started after timeout limit.");
+       }
+
+       protected BundleContext startRuntime() throws Exception {
+               String[] args = { "-console", "-clean" };
+               BundleContext bundleContext = EclipseStarter.startup(args, null);
+               return bundleContext;
+       }
+
+       protected void stopRuntime() throws Exception {
+               EclipseStarter.shutdown();
+       }
+
+       public void setUp() throws Exception {
+               osgiRuntimeAlreadyRunning = EclipseStarter.isRunning();
+               if (osgiRuntimeAlreadyRunning)
+                       return;
+               BundleContext bundleContext = startRuntime();
+               osgiBoot = new OsgiBoot(bundleContext);
+       }
+
+       public void tearDown() throws Exception {
+               if (osgiRuntimeAlreadyRunning)
+                       return;
+               osgiBoot = null;
+               stopRuntime();
+       }
+
+}
diff --git a/osgi/runtime/org.argeo.osgi.boot/.classpath b/osgi/runtime/org.argeo.osgi.boot/.classpath
deleted file mode 100644 (file)
index 2f7e966..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/osgi/runtime/org.argeo.osgi.boot/.project b/osgi/runtime/org.argeo.osgi.boot/.project
deleted file mode 100644 (file)
index e145e96..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.osgi.boot</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/osgi/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs b/osgi/runtime/org.argeo.osgi.boot/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index ba812fb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Jun 26 11:15:56 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/osgi/runtime/org.argeo.osgi.boot/build.properties b/osgi/runtime/org.argeo.osgi.boot/build.properties
deleted file mode 100644 (file)
index f17a582..0000000
+++ /dev/null
@@ -1 +0,0 @@
-additional.bundles = junit
diff --git a/osgi/runtime/org.argeo.osgi.boot/pom.xml b/osgi/runtime/org.argeo.osgi.boot/pom.xml
deleted file mode 100644 (file)
index be34419..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons.osgi</groupId>
-               <version>1.1.4-SNAPSHOT</version>
-               <artifactId>runtime</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.osgi.boot</artifactId>
-       <packaging>jar</packaging>
-       <name>Commons OSGi Boot</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.4</source>
-                                       <target>1.4</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-Activator>org.argeo.osgi.boot.Activator</Bundle-Activator>
-                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
-                                               <Import-Package>org.eclipse.*;resolution:=optional,*</Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-
-               <!-- TEST -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-
-
-</project>
\ No newline at end of file
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java
deleted file mode 100644 (file)
index 76ff70e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * An OSGi configurator. See <a
- * href="http://wiki.eclipse.org/Configurator">http:
- * //wiki.eclipse.org/Configurator</a>
- */
-public class Activator implements BundleActivator {
-
-       public void start(final BundleContext bundleContext) throws Exception {
-               // admin thread
-               Thread adminThread = new AdminThread(bundleContext);
-               adminThread.start();
-
-               // bootstrap
-               OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
-               osgiBoot.bootstrap();
-       }
-
-       public void stop(BundleContext context) throws Exception {
-       }
-}
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/AdminThread.java
deleted file mode 100644 (file)
index 9b3c9eb..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import java.io.File;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.launch.Framework;
-
-/** Monitors the runtime and can shut it down. */
-public class AdminThread extends Thread {
-       public final static String PROP_ARGEO_OSGI_SHUTDOWN_FILE = "argeo.osgi.shutdownFile";
-       private File shutdownFile;
-       private final BundleContext bundleContext;
-
-       public AdminThread(BundleContext bundleContext) {
-               super("OSGi Boot Admin");
-               this.bundleContext = bundleContext;
-               if (System.getProperty(PROP_ARGEO_OSGI_SHUTDOWN_FILE) != null) {
-                       shutdownFile = new File(
-                                       System.getProperty(PROP_ARGEO_OSGI_SHUTDOWN_FILE));
-                       if (!shutdownFile.exists()) {
-                               shutdownFile = null;
-                               OsgiBootUtils.warn("Shutdown file " + shutdownFile
-                                               + " not found, feature deactivated");
-                       }
-               }
-       }
-
-       public void run() {
-               if (shutdownFile != null) {
-                       // wait for file to be removed
-                       while (shutdownFile.exists()) {
-                               try {
-                                       Thread.sleep(1000);
-                               } catch (InterruptedException e) {
-                                       e.printStackTrace();
-                               }
-                       }
-
-                       Framework framework = (Framework) bundleContext.getBundle(0);
-                       try {
-                               // shutdown framework
-                               framework.stop();
-                               // wait 10 mins for shutdown
-                               framework.waitForStop(10 * 60 * 1000);
-                               // close VM
-                               System.exit(0);
-                       } catch (Exception e) {
-                               e.printStackTrace();
-                               System.exit(1);
-                       }
-               }
-       }
-}
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java
deleted file mode 100644 (file)
index 4d08b76..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.osgi.framework.BundleContext;
-
-/** Command line interface. */
-public class Launcher {
-
-       public static void main(String[] args) {
-               // Try to load system properties
-               String systemPropertiesFilePath = OsgiBootUtils
-                               .getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_SYSTEM_PROPERTIES_FILE);
-               if (systemPropertiesFilePath != null) {
-                       FileInputStream in;
-                       try {
-                               in = new FileInputStream(systemPropertiesFilePath);
-                               System.getProperties().load(in);
-                       } catch (IOException e1) {
-                               throw new RuntimeException(
-                                               "Cannot load system properties from "
-                                                               + systemPropertiesFilePath, e1);
-                       }
-                       if (in != null) {
-                               try {
-                                       in.close();
-                               } catch (Exception e) {
-                                       // silent
-                               }
-                       }
-               }
-
-               // Start main class
-               startMainClass();
-
-               // Start Equinox
-               BundleContext bundleContext = null;
-               try {
-                       bundleContext = EclipseStarter.startup(args, null);
-               } catch (Exception e) {
-                       throw new RuntimeException("Cannot start Equinox.", e);
-               }
-
-               // OSGi bootstrap
-               OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
-               osgiBoot.bootstrap();
-       }
-
-       protected static void startMainClass() {
-               String className = OsgiBootUtils
-                               .getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_APPCLASS);
-               if (className == null)
-                       return;
-
-               String line = System.getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_APPARGS,
-                               "");
-
-               String[] uiArgs = readArgumentsFromLine(line);
-
-               try {
-                       // Launch main method using reflection
-                       Class clss = Class.forName(className);
-                       Class[] mainArgsClasses = new Class[] { uiArgs.getClass() };
-                       Object[] mainArgs = { uiArgs };
-                       Method mainMethod = clss.getMethod("main", mainArgsClasses);
-                       mainMethod.invoke(null, mainArgs);
-               } catch (Exception e) {
-                       throw new RuntimeException("Cannot start main class.", e);
-               }
-
-       }
-
-       /**
-        * Transform a line into an array of arguments, taking "" as single
-        * arguments. (nested \" are not supported)
-        */
-       private static String[] readArgumentsFromLine(String lineOrig) {
-               String line = lineOrig.trim();// remove trailing spaces
-               List args = new Vector();
-               StringBuffer curr = new StringBuffer("");
-               boolean inQuote = false;
-               char[] arr = line.toCharArray();
-               for (int i = 0; i < arr.length; i++) {
-                       char c = arr[i];
-                       switch (c) {
-                       case '\"':
-                               inQuote = !inQuote;
-                               break;
-                       case ' ':
-                               if (!inQuote) {// otherwise, no break: goes to default
-                                       if (curr.length() > 0) {
-                                               args.add(curr.toString());
-                                               curr = new StringBuffer("");
-                                       }
-                                       break;
-                               }
-                       default:
-                               curr.append(c);
-                               break;
-                       }
-               }
-
-               // Add last arg
-               if (curr.length() > 0) {
-                       args.add(curr.toString());
-                       curr = null;
-               }
-
-               String[] res = new String[args.size()];
-               for (int i = 0; i < args.size(); i++) {
-                       res[i] = args.get(i).toString();
-               }
-               return res;
-       }
-
-}
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
deleted file mode 100644 (file)
index 6b51038..0000000
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.argeo.osgi.boot.internal.springutil.AntPathMatcher;
-import org.argeo.osgi.boot.internal.springutil.PathMatcher;
-import org.argeo.osgi.boot.internal.springutil.SystemPropertyUtils;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.ExportedPackage;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * Basic provisioning of an OSGi runtime via file path patterns and system
- * properties. Java 1.4 compatible.<br>
- * The approach is to generate list of URLs based on various methods, configured
- * via system properties.
- */
-public class OsgiBoot {
-       public final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.osgi.boot";
-       public final static String SYMBOLIC_NAME_EQUINOX = "org.eclipse.osgi";
-
-       public final static String PROP_ARGEO_OSGI_DATA_DIR = "argeo.osgi.data.dir";
-
-       public final static String PROP_ARGEO_OSGI_START = "argeo.osgi.start";
-       public final static String PROP_ARGEO_OSGI_BUNDLES = "argeo.osgi.bundles";
-       public final static String PROP_ARGEO_OSGI_LOCATIONS = "argeo.osgi.locations";
-       public final static String PROP_ARGEO_OSGI_BASE_URL = "argeo.osgi.baseUrl";
-       /** Use org.argeo.osgi */
-       public final static String PROP_ARGEO_OSGI_MODULES_URL = "argeo.osgi.modulesUrl";
-
-       // booleans
-       public final static String PROP_ARGEO_OSGI_BOOT_DEBUG = "argeo.osgi.boot.debug";
-       public final static String PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN = "argeo.osgi.boot.excludeSvn";
-       public final static String PROP_ARGEO_OSGI_BOOT_INSTALL_IN_LEXICOGRAPHIC_ORDER = "argeo.osgi.boot.installInLexicographicOrder";
-
-       public final static String PROP_ARGEO_OSGI_BOOT_DEFAULT_TIMEOUT = "argeo.osgi.boot.defaultTimeout";
-       public final static String PROP_ARGEO_OSGI_BOOT_MODULES_URL_SEPARATOR = "argeo.osgi.boot.modulesUrlSeparator";
-       public final static String PROP_ARGEO_OSGI_BOOT_SYSTEM_PROPERTIES_FILE = "argeo.osgi.boot.systemPropertiesFile";
-       public final static String PROP_ARGEO_OSGI_BOOT_APPCLASS = "argeo.osgi.boot.appclass";
-       public final static String PROP_ARGEO_OSGI_BOOT_APPARGS = "argeo.osgi.boot.appargs";
-
-       public final static String DEFAULT_BASE_URL = "reference:file:";
-       public final static String EXCLUDES_SVN_PATTERN = "**/.svn/**";
-
-       // OSGi system properties
-       public final static String INSTANCE_AREA_PROP = "osgi.instance.area";
-       public final static String INSTANCE_AREA_DEFAULT_PROP = "osgi.instance.area.default";
-
-       private boolean debug = Boolean.valueOf(
-                       System.getProperty(PROP_ARGEO_OSGI_BOOT_DEBUG, "false"))
-                       .booleanValue();
-       /** Exclude svn metadata implicitely(a bit costly) */
-       private boolean excludeSvn = Boolean.valueOf(
-                       System.getProperty(PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN, "false"))
-                       .booleanValue();
-
-       /**
-        * The {@link #installUrls(List)} methods won't follow the list order but
-        * order the urls according to the alphabetical order of the file names
-        * (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,
-                                                       "true")).booleanValue();;
-
-       /** Default is 10s (set in constructor) */
-       private long defaultTimeout;
-
-       /** Default is ',' (set in constructor) */
-       private String modulesUrlSeparator = ",";
-
-       private final BundleContext bundleContext;
-
-       /*
-        * INITIALIZATION
-        */
-       /** Constructor */
-       public OsgiBoot(BundleContext bundleContext) {
-               this.bundleContext = bundleContext;
-               defaultTimeout = Long.parseLong(OsgiBootUtils.getProperty(
-                               PROP_ARGEO_OSGI_BOOT_DEFAULT_TIMEOUT, "10000"));
-               modulesUrlSeparator = OsgiBootUtils.getProperty(
-                               PROP_ARGEO_OSGI_BOOT_MODULES_URL_SEPARATOR, ",");
-               initSystemProperties();
-       }
-
-       /**
-        * Set additional system properties, especially ${argeo.osgi.data.dir} as an
-        * OS file path (and not a file:// URL)
-        */
-       protected void initSystemProperties() {
-               String osgiInstanceArea = System.getProperty(INSTANCE_AREA_PROP);
-               String osgiInstanceAreaDefault = System
-                               .getProperty(INSTANCE_AREA_DEFAULT_PROP);
-               String tempDir = System.getProperty("java.io.tmpdir");
-
-               File dataDir = null;
-               if (osgiInstanceArea != null) {
-                       // within OSGi with -data specified
-                       osgiInstanceArea = removeFilePrefix(osgiInstanceArea);
-                       dataDir = new File(osgiInstanceArea);
-               } else if (osgiInstanceAreaDefault != null) {
-                       // within OSGi without -data specified
-                       osgiInstanceAreaDefault = removeFilePrefix(osgiInstanceAreaDefault);
-                       dataDir = new File(osgiInstanceAreaDefault);
-               } else {// outside OSGi
-                       dataDir = new File(tempDir + File.separator + "argeoOsgiData");
-               }
-               System.setProperty(PROP_ARGEO_OSGI_DATA_DIR, dataDir.getAbsolutePath());
-       }
-
-       /*
-        * HIGH-LEVEL METHODS
-        */
-       /** Bootstraps the OSGi runtime */
-       public void bootstrap() {
-               long begin = System.currentTimeMillis();
-               System.out.println();
-               OsgiBootUtils.info("OSGi bootstrap starting...");
-               OsgiBootUtils.info("Writable data directory : "
-                               + System.getProperty(PROP_ARGEO_OSGI_DATA_DIR)
-                               + " (set as system property " + PROP_ARGEO_OSGI_DATA_DIR + ")");
-               installUrls(getBundlesUrls());
-               installUrls(getLocationsUrls());
-               installUrls(getModulesUrls());
-               checkUnresolved();
-               startBundles();
-               long duration = System.currentTimeMillis() - begin;
-               OsgiBootUtils.info("OSGi bootstrap completed in "
-                               + Math.round(((double) duration) / 1000) + "s (" + duration
-                               + "ms), " + bundleContext.getBundles().length + " bundles");
-
-               // display packages exported twice
-               if (debug) {
-                       Map /* <String,Set<String>> */duplicatePackages = findPackagesExportedTwice();
-                       if (duplicatePackages.size() > 0) {
-                               OsgiBootUtils.info("Packages exported twice:");
-                               Iterator it = duplicatePackages.keySet().iterator();
-                               while (it.hasNext()) {
-                                       String pkgName = it.next().toString();
-                                       OsgiBootUtils.info(pkgName);
-                                       Set bdles = (Set) duplicatePackages.get(pkgName);
-                                       Iterator bdlesIt = bdles.iterator();
-                                       while (bdlesIt.hasNext())
-                                               OsgiBootUtils.info("  " + bdlesIt.next());
-                               }
-                       }
-               }
-
-               System.out.println();
-       }
-
-       /*
-        * INSTALLATION
-        */
-       /** Install the bundles at this URL list. */
-       public void installUrls(List urls) {
-               Map installedBundles = getBundlesByLocation();
-
-               if (installInLexicographicOrder) {
-                       SortedMap map = new TreeMap();
-                       // reorder
-                       for (int i = 0; i < urls.size(); i++) {
-                               String url = (String) urls.get(i);
-                               int index = url.lastIndexOf('/');
-                               String fileName;
-                               if (index >= 0)
-                                       fileName = url.substring(index + 1);
-                               else
-                                       fileName = url;
-                               map.put(fileName, url);
-                       }
-
-                       // install
-                       Iterator keys = map.keySet().iterator();
-                       while (keys.hasNext()) {
-                               Object key = keys.next();
-                               String url = map.get(key).toString();
-                               installUrl(url, installedBundles);
-                       }
-               } else {
-                       for (int i = 0; i < urls.size(); i++) {
-                               String url = (String) urls.get(i);
-                               installUrl(url, installedBundles);
-                       }
-               }
-
-       }
-
-       /** Actually install the provided URL */
-       protected void installUrl(String url, Map installedBundles) {
-               try {
-                       if (installedBundles.containsKey(url)) {
-                               Bundle bundle = (Bundle) installedBundles.get(url);
-                               // bundle.update();
-                               if (debug)
-                                       debug("Bundle " + bundle.getSymbolicName()
-                                                       + " already installed from " + url);
-                       } else {
-                               Bundle bundle = bundleContext.installBundle(url);
-                               if (debug)
-                                       debug("Installed bundle " + bundle.getSymbolicName()
-                                                       + " from " + url);
-                       }
-               } catch (BundleException e) {
-                       String message = e.getMessage();
-                       if ((message.contains("Bundle \"" + SYMBOLIC_NAME_OSGI_BOOT + "\"") || message
-                                       .contains("Bundle \"" + SYMBOLIC_NAME_EQUINOX + "\""))
-                                       && message.contains("has already been installed")) {
-                               // silent, in order to avoid warnings: we know that both
-                               // have already been installed...
-                       } else {
-                               OsgiBootUtils.warn("Could not install bundle from " + url
-                                               + ": " + message);
-                       }
-                       if (debug)
-                               e.printStackTrace();
-               }
-       }
-
-       /* @deprecated Doesn't seem to be used anymore. */
-       // public void installOrUpdateUrls(Map urls) {
-       // Map installedBundles = getBundles();
-       //
-       // for (Iterator modules = urls.keySet().iterator(); modules.hasNext();) {
-       // String moduleName = (String) modules.next();
-       // String urlStr = (String) urls.get(moduleName);
-       // if (installedBundles.containsKey(moduleName)) {
-       // Bundle bundle = (Bundle) installedBundles.get(moduleName);
-       // InputStream in;
-       // try {
-       // URL url = new URL(urlStr);
-       // in = url.openStream();
-       // bundle.update(in);
-       // OsgiBootUtils.info("Updated bundle " + moduleName
-       // + " from " + urlStr);
-       // } catch (Exception e) {
-       // throw new RuntimeException("Cannot update " + moduleName
-       // + " from " + urlStr);
-       // }
-       // if (in != null)
-       // try {
-       // in.close();
-       // } catch (IOException e) {
-       // e.printStackTrace();
-       // }
-       // } else {
-       // try {
-       // Bundle bundle = bundleContext.installBundle(urlStr);
-       // if (debug)
-       // debug("Installed bundle " + bundle.getSymbolicName()
-       // + " from " + urlStr);
-       // } catch (BundleException e) {
-       // OsgiBootUtils.warn("Could not install bundle from "
-       // + urlStr + ": " + e.getMessage());
-       // }
-       // }
-       // }
-       //
-       // }
-
-       /*
-        * START
-        */
-       public void startBundles() {
-               String bundlesToStart = OsgiBootUtils
-                               .getProperty(PROP_ARGEO_OSGI_START);
-               startBundles(bundlesToStart);
-       }
-
-       /** Convenience method accepting a comma-separated list of bundle to start */
-       public void startBundles(String bundlesToStartStr) {
-               if (bundlesToStartStr == null)
-                       return;
-
-               StringTokenizer st = new StringTokenizer(bundlesToStartStr, ",");
-               List bundlesToStart = new ArrayList();
-               while (st.hasMoreTokens()) {
-                       String name = st.nextToken().trim();
-                       bundlesToStart.add(name);
-               }
-               startBundles(bundlesToStart);
-       }
-
-       /** Start the provided list of bundles */
-       public void startBundles(List bundlesToStart) {
-               if (bundlesToStart.size() == 0)
-                       return;
-
-               // used to log the bundles not found
-               List notFoundBundles = new ArrayList(bundlesToStart);
-
-               Bundle[] bundles = bundleContext.getBundles();
-               long startBegin = System.currentTimeMillis();
-               for (int i = 0; i < bundles.length; i++) {
-                       Bundle bundle = bundles[i];
-                       String symbolicName = bundle.getSymbolicName();
-                       if (bundlesToStart.contains(symbolicName))
-                               try {
-                                       try {
-                                               bundle.start();
-                                               if (debug)
-                                                       debug("Bundle " + symbolicName + " started");
-                                       } catch (Exception e) {
-                                               OsgiBootUtils.warn("Start of bundle " + symbolicName
-                                                               + " failed because of " + e
-                                                               + ", maybe bundle is not yet resolved,"
-                                                               + " waiting and trying again.");
-                                               waitForBundleResolvedOrActive(startBegin, bundle);
-                                               bundle.start();
-                                       }
-                                       notFoundBundles.remove(symbolicName);
-                               } catch (Exception e) {
-                                       OsgiBootUtils.warn("Bundle " + symbolicName
-                                                       + " cannot be started: " + e.getMessage());
-                                       if (debug)
-                                               e.printStackTrace();
-                                       // was found even if start failed
-                                       notFoundBundles.remove(symbolicName);
-                               }
-               }
-
-               for (int i = 0; i < notFoundBundles.size(); i++)
-                       OsgiBootUtils.warn("Bundle " + notFoundBundles.get(i)
-                                       + " not started because it was not found.");
-       }
-
-       /*
-        * DIAGNOSTICS
-        */
-       /** Check unresolved bundles */
-       protected void checkUnresolved() {
-               // Refresh
-               ServiceReference packageAdminRef = bundleContext
-                               .getServiceReference(PackageAdmin.class.getName());
-               PackageAdmin packageAdmin = (PackageAdmin) bundleContext
-                               .getService(packageAdminRef);
-               packageAdmin.resolveBundles(null);
-
-               Bundle[] bundles = bundleContext.getBundles();
-               List /* Bundle */unresolvedBundles = new ArrayList();
-               for (int i = 0; i < bundles.length; i++) {
-                       int bundleState = bundles[i].getState();
-                       if (!(bundleState == Bundle.ACTIVE
-                                       || bundleState == Bundle.RESOLVED || bundleState == Bundle.STARTING))
-                               unresolvedBundles.add(bundles[i]);
-               }
-
-               if (unresolvedBundles.size() != 0) {
-                       OsgiBootUtils.warn("Unresolved bundles " + unresolvedBundles);
-               }
-       }
-
-       /** List packages exported twice. */
-       public Map findPackagesExportedTwice() {
-               ServiceReference paSr = bundleContext
-                               .getServiceReference(PackageAdmin.class.getName());
-               PackageAdmin packageAdmin = (PackageAdmin) bundleContext
-                               .getService(paSr);
-
-               // find packages exported twice
-               Bundle[] bundles = bundleContext.getBundles();
-               Map /* <String,Set<String>> */exportedPackages = new TreeMap();
-               for (int i = 0; i < bundles.length; i++) {
-                       Bundle bundle = bundles[i];
-                       ExportedPackage[] pkgs = packageAdmin.getExportedPackages(bundle);
-                       if (pkgs != null)
-                               for (int j = 0; j < pkgs.length; j++) {
-                                       String pkgName = pkgs[j].getName();
-                                       if (!exportedPackages.containsKey(pkgName)) {
-                                               exportedPackages.put(pkgName, new TreeSet());
-                                       }
-                                       ((Set) exportedPackages.get(pkgName)).add(bundle
-                                                       .getSymbolicName() + "_" + bundle.getVersion());
-                               }
-               }
-               Map /* <String,Set<String>> */duplicatePackages = new TreeMap();
-               Iterator it = exportedPackages.keySet().iterator();
-               while (it.hasNext()) {
-                       String pkgName = it.next().toString();
-                       Set bdles = (Set) exportedPackages.get(pkgName);
-                       if (bdles.size() > 1)
-                               duplicatePackages.put(pkgName, bdles);
-               }
-               return duplicatePackages;
-       }
-
-       /** Waits for a bundle to become active or resolved */
-       protected void waitForBundleResolvedOrActive(long startBegin, Bundle bundle)
-                       throws Exception {
-               int originalState = bundle.getState();
-               if ((originalState == Bundle.RESOLVED)
-                               || (originalState == Bundle.ACTIVE))
-                       return;
-
-               String originalStateStr = OsgiBootUtils.stateAsString(originalState);
-
-               int currentState = bundle.getState();
-               while (!(currentState == Bundle.RESOLVED || currentState == Bundle.ACTIVE)) {
-                       long now = System.currentTimeMillis();
-                       if ((now - startBegin) > defaultTimeout)
-                               throw new Exception("Bundle " + bundle.getSymbolicName()
-                                               + " was not RESOLVED or ACTIVE after "
-                                               + (now - startBegin) + "ms (originalState="
-                                               + originalStateStr + ", currentState="
-                                               + OsgiBootUtils.stateAsString(currentState) + ")");
-
-                       try {
-                               Thread.sleep(100l);
-                       } catch (InterruptedException e) {
-                               // silent
-                       }
-                       currentState = bundle.getState();
-               }
-       }
-
-       /*
-        * EXPLICIT LOCATIONS INSTALLATION
-        */
-       /** Gets the list of resolved explicit URL locations. */
-       public List getLocationsUrls() {
-               String baseUrl = OsgiBootUtils.getProperty(PROP_ARGEO_OSGI_BASE_URL,
-                               DEFAULT_BASE_URL);
-               String bundleLocations = OsgiBootUtils
-                               .getProperty(PROP_ARGEO_OSGI_LOCATIONS);
-               return getLocationsUrls(baseUrl, bundleLocations);
-       }
-
-       /**
-        * Gets a list of URLs based on explicit locations, resolving placeholder
-        * ${...} containing system properties, e.g. ${user.home}.
-        */
-       public List getLocationsUrls(String baseUrl, String bundleLocations) {
-               List urls = new ArrayList();
-
-               if (bundleLocations == null)
-                       return urls;
-               bundleLocations = SystemPropertyUtils
-                               .resolvePlaceholders(bundleLocations);
-               if (debug)
-                       debug(PROP_ARGEO_OSGI_LOCATIONS + "=" + bundleLocations);
-
-               StringTokenizer st = new StringTokenizer(bundleLocations,
-                               File.pathSeparator);
-               while (st.hasMoreTokens()) {
-                       urls.add(locationToUrl(baseUrl, st.nextToken().trim()));
-               }
-               return urls;
-       }
-
-       /*
-        * BUNDLE PATTERNS INSTALLATION
-        */
-       /**
-        * Computes a list of URLs based on Ant-like incluide/exclude patterns
-        * defined by ${argeo.osgi.bundles} with the following format:<br>
-        * <code>/base/directory;in=*.jar;in=**;ex=org.eclipse.osgi_*;jar</code><br>
-        * WARNING: <code>/base/directory;in=*.jar,\</code> at the end of a file,
-        * without a new line causes a '.' to be appended with unexpected side
-        * effects.
-        */
-       public List getBundlesUrls() {
-               String baseUrl = OsgiBootUtils.getProperty(PROP_ARGEO_OSGI_BASE_URL,
-                               DEFAULT_BASE_URL);
-               String bundlePatterns = OsgiBootUtils
-                               .getProperty(PROP_ARGEO_OSGI_BUNDLES);
-               return getBundlesUrls(baseUrl, bundlePatterns);
-       }
-
-       /** Implements the path matching logic */
-       public List getBundlesUrls(String baseUrl, String bundlePatterns) {
-               List urls = new ArrayList();
-               if (bundlePatterns == null)
-                       return urls;
-
-               bundlePatterns = SystemPropertyUtils
-                               .resolvePlaceholders(bundlePatterns);
-               if (debug)
-                       debug(PROP_ARGEO_OSGI_BUNDLES + "=" + bundlePatterns
-                                       + " (excludeSvn=" + excludeSvn + ")");
-
-               StringTokenizer st = new StringTokenizer(bundlePatterns, ",");
-               List bundlesSets = new ArrayList();
-               while (st.hasMoreTokens()) {
-                       bundlesSets.add(new BundlesSet(st.nextToken()));
-               }
-
-               // find included
-               List included = new ArrayList();
-               PathMatcher matcher = new AntPathMatcher();
-               for (int i = 0; i < bundlesSets.size(); i++) {
-                       BundlesSet bundlesSet = (BundlesSet) bundlesSets.get(i);
-                       for (int j = 0; j < bundlesSet.getIncludes().size(); j++) {
-                               String pattern = (String) bundlesSet.getIncludes().get(j);
-                               match(matcher, included, bundlesSet.getDir(), null, pattern);
-                       }
-               }
-
-               // find excluded
-               List excluded = new ArrayList();
-               for (int i = 0; i < bundlesSets.size(); i++) {
-                       BundlesSet bundlesSet = (BundlesSet) bundlesSets.get(i);
-                       for (int j = 0; j < bundlesSet.getExcludes().size(); j++) {
-                               String pattern = (String) bundlesSet.getExcludes().get(j);
-                               match(matcher, excluded, bundlesSet.getDir(), null, pattern);
-                       }
-               }
-
-               // construct list
-               for (int i = 0; i < included.size(); i++) {
-                       String fullPath = (String) included.get(i);
-                       if (!excluded.contains(fullPath))
-                               urls.add(locationToUrl(baseUrl, fullPath));
-               }
-
-               return urls;
-       }
-
-       /*
-        * MODULES LIST INSTALLATION (${argeo.osgi.modulesUrl})
-        */
-       /**
-        * Downloads a list of URLs in CSV format from ${argeo.osgi.modulesUrl}:<br>
-        * <code>Bundle-SymbolicName,Bundle-Version,url</code>)<br>
-        * If ${argeo.osgi.baseUrl} is set, URLs will be considered relative paths
-        * and be concatenated with the base URL, typically the root of a Maven
-        * repository.
-        */
-       public List getModulesUrls() {
-               List urls = new ArrayList();
-               String modulesUrlStr = OsgiBootUtils
-                               .getProperty(PROP_ARGEO_OSGI_MODULES_URL);
-               if (modulesUrlStr == null)
-                       return urls;
-
-               String baseUrl = OsgiBootUtils.getProperty(PROP_ARGEO_OSGI_BASE_URL);
-
-               Map installedBundles = getBundlesBySymbolicName();
-
-               BufferedReader reader = null;
-               try {
-                       URL modulesUrl = new URL(modulesUrlStr);
-                       reader = new BufferedReader(new InputStreamReader(
-                                       modulesUrl.openStream()));
-                       String line = null;
-                       while ((line = reader.readLine()) != null) {
-                               StringTokenizer st = new StringTokenizer(line,
-                                               modulesUrlSeparator);
-                               String moduleName = st.nextToken();
-                               String moduleVersion = st.nextToken();
-                               String url = st.nextToken();
-                               if (baseUrl != null)
-                                       url = baseUrl + url;
-
-                               if (installedBundles.containsKey(moduleName)) {
-                                       Bundle bundle = (Bundle) installedBundles.get(moduleName);
-                                       String bundleVersion = bundle.getHeaders()
-                                                       .get(Constants.BUNDLE_VERSION).toString();
-                                       int comp = OsgiBootUtils.compareVersions(bundleVersion,
-                                                       moduleVersion);
-                                       if (comp > 0) {
-                                               OsgiBootUtils.warn("Installed version " + bundleVersion
-                                                               + " of bundle " + moduleName
-                                                               + " is newer than  provided version "
-                                                               + moduleVersion);
-                                       } else if (comp < 0) {
-                                               urls.add(url);
-                                               OsgiBootUtils.info("Updated bundle " + moduleName
-                                                               + " with version " + moduleVersion
-                                                               + " (old version was " + bundleVersion + ")");
-                                       } else {
-                                               // do nothing
-                                       }
-                               } else {
-                                       urls.add(url);
-                               }
-                       }
-               } catch (Exception e1) {
-                       throw new RuntimeException("Cannot read url " + modulesUrlStr, e1);
-               } finally {
-                       if (reader != null)
-                               try {
-                                       reader.close();
-                               } catch (IOException e) {
-                                       e.printStackTrace();
-                               }
-               }
-               return urls;
-       }
-
-       /*
-        * HIGH LEVEL UTILITIES
-        */
-       /** Actually performs the matching logic. */
-       protected void match(PathMatcher matcher, List matched, String base,
-                       String currentPath, String pattern) {
-               if (currentPath == null) {
-                       // Init
-                       File baseDir = new File(base.replace('/', File.separatorChar));
-                       File[] files = baseDir.listFiles();
-
-                       if (files == null) {
-                               if (debug)
-                                       OsgiBootUtils.warn("Base dir " + baseDir
-                                                       + " has no children, exists=" + baseDir.exists()
-                                                       + ", isDirectory=" + baseDir.isDirectory());
-                               return;
-                       }
-
-                       for (int i = 0; i < files.length; i++)
-                               match(matcher, matched, base, files[i].getName(), pattern);
-               } else {
-                       String fullPath = base + '/' + currentPath;
-                       if (matched.contains(fullPath))
-                               return;// don't try deeper if already matched
-
-                       boolean ok = matcher.match(pattern, currentPath);
-                       // if (debug)
-                       // debug(currentPath + " " + (ok ? "" : " not ")
-                       // + " matched with " + pattern);
-                       if (ok) {
-                               matched.add(fullPath);
-                               return;
-                       } else {
-                               String newFullPath = relativeToFullPath(base, currentPath);
-                               File newFile = new File(newFullPath);
-                               File[] files = newFile.listFiles();
-                               if (files != null) {
-                                       for (int i = 0; i < files.length; i++) {
-                                               String newCurrentPath = currentPath + '/'
-                                                               + files[i].getName();
-                                               if (files[i].isDirectory()) {
-                                                       if (matcher.matchStart(pattern, newCurrentPath)) {
-                                                               // recurse only if start matches
-                                                               match(matcher, matched, base, newCurrentPath,
-                                                                               pattern);
-                                                       } else {
-                                                               if (debug)
-                                                                       debug(newCurrentPath
-                                                                                       + " does not start match with "
-                                                                                       + pattern);
-
-                                                       }
-                                               } else {
-                                                       boolean nonDirectoryOk = matcher.match(pattern,
-                                                                       newCurrentPath);
-                                                       if (debug)
-                                                               debug(currentPath + " " + (ok ? "" : " not ")
-                                                                               + " matched with " + pattern);
-                                                       if (nonDirectoryOk)
-                                                               matched.add(relativeToFullPath(base,
-                                                                               newCurrentPath));
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       protected void matchFile() {
-
-       }
-
-       /*
-        * LOW LEVEL UTILITIES
-        */
-       /**
-        * The bundles already installed. Key is location (String) , value is a
-        * {@link Bundle}
-        */
-       public Map getBundlesByLocation() {
-               Map installedBundles = new HashMap();
-               Bundle[] bundles = bundleContext.getBundles();
-               for (int i = 0; i < bundles.length; i++) {
-                       installedBundles.put(bundles[i].getLocation(), bundles[i]);
-               }
-               return installedBundles;
-       }
-
-       /**
-        * The bundles already installed. Key is symbolic name (String) , value is a
-        * {@link Bundle}
-        */
-       public Map getBundlesBySymbolicName() {
-               Map namedBundles = new HashMap();
-               Bundle[] bundles = bundleContext.getBundles();
-               for (int i = 0; i < bundles.length; i++) {
-                       namedBundles.put(bundles[i].getSymbolicName(), bundles[i]);
-               }
-               return namedBundles;
-       }
-
-       /** Creates an URL from a location */
-       protected String locationToUrl(String baseUrl, String location) {
-               int extInd = location.lastIndexOf('.');
-               String ext = null;
-               if (extInd > 0)
-                       ext = location.substring(extInd);
-
-               if (baseUrl.startsWith("reference:") && ".jar".equals(ext))
-                       return "file:" + location;
-               else
-                       return baseUrl + location;
-       }
-
-       /** Transforms a relative path in a full system path. */
-       protected String relativeToFullPath(String basePath, String relativePath) {
-               return (basePath + '/' + relativePath).replace('/', File.separatorChar);
-       }
-
-       private String removeFilePrefix(String url) {
-               if (url.startsWith("file:"))
-                       return url.substring("file:".length());
-               else if (url.startsWith("reference:file:"))
-                       return url.substring("reference:file:".length());
-               else
-                       return url;
-       }
-
-       /**
-        * Convenience method to avoid cluttering the code with
-        * OsgiBootUtils.debug()
-        */
-       protected void debug(Object obj) {
-               OsgiBootUtils.debug(obj);
-       }
-
-       /*
-        * BEAN METHODS
-        */
-
-       public boolean getDebug() {
-               return debug;
-       }
-
-       public void setDebug(boolean debug) {
-               this.debug = debug;
-       }
-
-       public BundleContext getBundleContext() {
-               return bundleContext;
-       }
-
-       public void setInstallInLexicographicOrder(
-                       boolean installInAlphabeticalOrder) {
-               this.installInLexicographicOrder = installInAlphabeticalOrder;
-       }
-
-       public boolean isInstallInLexicographicOrder() {
-               return installInLexicographicOrder;
-       }
-
-       public void setDefaultTimeout(long defaultTimeout) {
-               this.defaultTimeout = defaultTimeout;
-       }
-
-       public void setModulesUrlSeparator(String modulesUrlSeparator) {
-               this.modulesUrlSeparator = modulesUrlSeparator;
-       }
-
-       public boolean isExcludeSvn() {
-               return excludeSvn;
-       }
-
-       public void setExcludeSvn(boolean excludeSvn) {
-               this.excludeSvn = excludeSvn;
-       }
-
-       /*
-        * INTERNAL CLASSES
-        */
-
-       /** Intermediary structure used by path matching */
-       protected class BundlesSet {
-               private String baseUrl = "reference:file";// not used yet
-               private final String dir;
-               private List includes = new ArrayList();
-               private List excludes = new ArrayList();
-
-               public BundlesSet(String def) {
-                       StringTokenizer st = new StringTokenizer(def, ";");
-
-                       if (!st.hasMoreTokens())
-                               throw new RuntimeException("Base dir not defined.");
-                       try {
-                               String dirPath = st.nextToken();
-
-                               if (dirPath.startsWith("file:"))
-                                       dirPath = dirPath.substring("file:".length());
-
-                               dir = new File(dirPath.replace('/', File.separatorChar))
-                                               .getCanonicalPath();
-                               if (debug)
-                                       debug("Base dir: " + dir);
-                       } catch (IOException e) {
-                               throw new RuntimeException("Cannot convert to absolute path", e);
-                       }
-
-                       while (st.hasMoreTokens()) {
-                               String tk = st.nextToken();
-                               StringTokenizer stEq = new StringTokenizer(tk, "=");
-                               String type = stEq.nextToken();
-                               String pattern = stEq.nextToken();
-                               if ("in".equals(type) || "include".equals(type)) {
-                                       includes.add(pattern);
-                               } else if ("ex".equals(type) || "exclude".equals(type)) {
-                                       excludes.add(pattern);
-                               } else if ("baseUrl".equals(type)) {
-                                       baseUrl = pattern;
-                               } else {
-                                       System.err.println("Unkown bundles pattern type " + type);
-                               }
-                       }
-
-                       if (excludeSvn && !excludes.contains(EXCLUDES_SVN_PATTERN)) {
-                               excludes.add(EXCLUDES_SVN_PATTERN);
-                       }
-               }
-
-               public String getDir() {
-                       return dir;
-               }
-
-               public List getIncludes() {
-                       return includes;
-               }
-
-               public List getExcludes() {
-                       return excludes;
-               }
-
-               public String getBaseUrl() {
-                       return baseUrl;
-               }
-
-       }
-
-}
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java
deleted file mode 100644 (file)
index f316655..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.argeo.osgi.boot;\r
-\r
-import java.text.DateFormat;\r
-import java.text.SimpleDateFormat;\r
-import java.util.ArrayList;\r
-import java.util.Date;\r
-import java.util.List;\r
-import java.util.StringTokenizer;\r
-\r
-import org.osgi.framework.Bundle;\r
-\r
-/** Utilities, mostly related to logging. */\r
-public class OsgiBootUtils {\r
-       /** ISO8601 (as per log4j) and difference to UTC */\r
-       private static DateFormat dateFormat = new SimpleDateFormat(\r
-                       "yyyy-MM-dd HH:mm:ss,SSS Z");\r
-\r
-       public static void info(Object obj) {\r
-               System.out.println("# OSGiBOOT      # " + dateFormat.format(new Date())\r
-                               + " # " + obj);\r
-       }\r
-\r
-       public static void debug(Object obj) {\r
-               System.out.println("# OSGiBOOT DBG  # " + dateFormat.format(new Date())\r
-                               + " # " + obj);\r
-       }\r
-\r
-       public static void warn(Object obj) {\r
-               System.out.println("# OSGiBOOT WARN # " + dateFormat.format(new Date())\r
-                               + " # " + obj);\r
-       }\r
-\r
-       /**\r
-        * Gets a property value\r
-        * \r
-        * @return null when defaultValue is ""\r
-        */\r
-       public static String getProperty(String name, String defaultValue) {\r
-               final String value;\r
-               if (defaultValue != null)\r
-                       value = System.getProperty(name, defaultValue);\r
-               else\r
-                       value = System.getProperty(name);\r
-\r
-               if (value == null || value.equals(""))\r
-                       return null;\r
-               else\r
-                       return value;\r
-       }\r
-\r
-       public static String getProperty(String name) {\r
-               return getProperty(name, null);\r
-       }\r
-\r
-       public static String stateAsString(int state) {\r
-               switch (state) {\r
-               case Bundle.UNINSTALLED:\r
-                       return "UNINSTALLED";\r
-               case Bundle.INSTALLED:\r
-                       return "INSTALLED";\r
-               case Bundle.RESOLVED:\r
-                       return "RESOLVED";\r
-               case Bundle.STARTING:\r
-                       return "STARTING";\r
-               case Bundle.ACTIVE:\r
-                       return "ACTIVE";\r
-               case Bundle.STOPPING:\r
-                       return "STOPPING";\r
-               default:\r
-                       return Integer.toString(state);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * @return ==0: versions are identical, <0: tested version is newer, >0:\r
-        *         currentVersion is newer.\r
-        */\r
-       public static int compareVersions(String currentVersion,\r
-                       String testedVersion) {\r
-               List cToks = new ArrayList();\r
-               StringTokenizer cSt = new StringTokenizer(currentVersion, ".");\r
-               while (cSt.hasMoreTokens())\r
-                       cToks.add(cSt.nextToken());\r
-               List tToks = new ArrayList();\r
-               StringTokenizer tSt = new StringTokenizer(currentVersion, ".");\r
-               while (tSt.hasMoreTokens())\r
-                       tToks.add(tSt.nextToken());\r
-       \r
-               int comp = 0;\r
-               comp: for (int i = 0; i < cToks.size(); i++) {\r
-                       if (tToks.size() <= i) {\r
-                               // equals until then, tested shorter\r
-                               comp = 1;\r
-                               break comp;\r
-                       }\r
-       \r
-                       String c = (String) cToks.get(i);\r
-                       String t = (String) tToks.get(i);\r
-       \r
-                       try {\r
-                               int cInt = Integer.parseInt(c);\r
-                               int tInt = Integer.parseInt(t);\r
-                               if (cInt == tInt)\r
-                                       continue comp;\r
-                               else {\r
-                                       comp = (cInt - tInt);\r
-                                       break comp;\r
-                               }\r
-                       } catch (NumberFormatException e) {\r
-                               if (c.equals(t))\r
-                                       continue comp;\r
-                               else {\r
-                                       comp = c.compareTo(t);\r
-                                       break comp;\r
-                               }\r
-                       }\r
-               }\r
-       \r
-               if (comp == 0 && tToks.size() > cToks.size()) {\r
-                       // equals until then, current shorter\r
-                       comp = -1;\r
-               }\r
-       \r
-               return comp;\r
-       }\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java
deleted file mode 100644 (file)
index 0b9ad1a..0000000
+++ /dev/null
@@ -1,411 +0,0 @@
-/*\r
- * Copyright 2002-2007 the original author or authors.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.argeo.osgi.boot.internal.springutil;\r
-\r
-/**\r
- * PathMatcher implementation for Ant-style path patterns.\r
- * Examples are provided below.\r
- *\r
- * <p>Part of this mapping code has been kindly borrowed from\r
- * <a href="http://ant.apache.org">Apache Ant</a>.\r
- *\r
- * <p>The mapping matches URLs using the following rules:<br>\r
- * <ul>\r
- * <li>? matches one character</li>\r
- * <li>* matches zero or more characters</li>\r
- * <li>** matches zero or more 'directories' in a path</li>\r
- * </ul>\r
- *\r
- * <p>Some examples:<br>\r
- * <ul>\r
- * <li><code>com/t?st.jsp</code> - matches <code>com/test.jsp</code> but also\r
- * <code>com/tast.jsp</code> or <code>com/txst.jsp</code></li>\r
- * <li><code>com/*.jsp</code> - matches all <code>.jsp</code> files in the\r
- * <code>com</code> directory</li>\r
- * <li><code>com/&#42;&#42;/test.jsp</code> - matches all <code>test.jsp</code>\r
- * files underneath the <code>com</code> path</li>\r
- * <li><code>org/springframework/&#42;&#42;/*.jsp</code> - matches all <code>.jsp</code>\r
- * files underneath the <code>org/springframework</code> path</li>\r
- * <li><code>org/&#42;&#42;/servlet/bla.jsp</code> - matches\r
- * <code>org/springframework/servlet/bla.jsp</code> but also\r
- * <code>org/springframework/testing/servlet/bla.jsp</code> and\r
- * <code>org/servlet/bla.jsp</code></li>\r
- * </ul>\r
- *\r
- * @author Alef Arendsen\r
- * @author Juergen Hoeller\r
- * @author Rob Harrop\r
- * @since 16.07.2003\r
- */\r
-public class AntPathMatcher implements PathMatcher {\r
-\r
-       /** Default path separator: "/" */\r
-       public static final String DEFAULT_PATH_SEPARATOR = "/";\r
-\r
-       private String pathSeparator = DEFAULT_PATH_SEPARATOR;\r
-\r
-\r
-       /**\r
-        * Set the path separator to use for pattern parsing.\r
-        * Default is "/", as in Ant.\r
-        */\r
-       public void setPathSeparator(String pathSeparator) {\r
-               this.pathSeparator = (pathSeparator != null ? pathSeparator : DEFAULT_PATH_SEPARATOR);\r
-       }\r
-\r
-\r
-       public boolean isPattern(String path) {\r
-               return (path.indexOf('*') != -1 || path.indexOf('?') != -1);\r
-       }\r
-\r
-       public boolean match(String pattern, String path) {\r
-               return doMatch(pattern, path, true);\r
-       }\r
-\r
-       public boolean matchStart(String pattern, String path) {\r
-               return doMatch(pattern, path, false);\r
-       }\r
-\r
-\r
-       /**\r
-        * Actually match the given <code>path</code> against the given <code>pattern</code>.\r
-        * @param pattern the pattern to match against\r
-        * @param path the path String to test\r
-        * @param fullMatch whether a full pattern match is required\r
-        * (else a pattern match as far as the given base path goes is sufficient)\r
-        * @return <code>true</code> if the supplied <code>path</code> matched,\r
-        * <code>false</code> if it didn't\r
-        */\r
-       protected boolean doMatch(String pattern, String path, boolean fullMatch) {\r
-               if (path.startsWith(this.pathSeparator) != pattern.startsWith(this.pathSeparator)) {\r
-                       return false;\r
-               }\r
-\r
-               String[] pattDirs = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);\r
-               String[] pathDirs = StringUtils.tokenizeToStringArray(path, this.pathSeparator);\r
-\r
-               int pattIdxStart = 0;\r
-               int pattIdxEnd = pattDirs.length - 1;\r
-               int pathIdxStart = 0;\r
-               int pathIdxEnd = pathDirs.length - 1;\r
-\r
-               // Match all elements up to the first **\r
-               while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {\r
-                       String patDir = pattDirs[pattIdxStart];\r
-                       if ("**".equals(patDir)) {\r
-                               break;\r
-                       }\r
-                       if (!matchStrings(patDir, pathDirs[pathIdxStart])) {\r
-                               return false;\r
-                       }\r
-                       pattIdxStart++;\r
-                       pathIdxStart++;\r
-               }\r
-\r
-               if (pathIdxStart > pathIdxEnd) {\r
-                       // Path is exhausted, only match if rest of pattern is * or **'s\r
-                       if (pattIdxStart > pattIdxEnd) {\r
-                               return (pattern.endsWith(this.pathSeparator) ?\r
-                                               path.endsWith(this.pathSeparator) : !path.endsWith(this.pathSeparator));\r
-                       }\r
-                       if (!fullMatch) {\r
-                               return true;\r
-                       }\r
-                       if (pattIdxStart == pattIdxEnd && pattDirs[pattIdxStart].equals("*") &&\r
-                                       path.endsWith(this.pathSeparator)) {\r
-                               return true;\r
-                       }\r
-                       for (int i = pattIdxStart; i <= pattIdxEnd; i++) {\r
-                               if (!pattDirs[i].equals("**")) {\r
-                                       return false;\r
-                               }\r
-                       }\r
-                       return true;\r
-               }\r
-               else if (pattIdxStart > pattIdxEnd) {\r
-                       // String not exhausted, but pattern is. Failure.\r
-                       return false;\r
-               }\r
-               else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {\r
-                       // Path start definitely matches due to "**" part in pattern.\r
-                       return true;\r
-               }\r
-\r
-               // up to last '**'\r
-               while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {\r
-                       String patDir = pattDirs[pattIdxEnd];\r
-                       if (patDir.equals("**")) {\r
-                               break;\r
-                       }\r
-                       if (!matchStrings(patDir, pathDirs[pathIdxEnd])) {\r
-                               return false;\r
-                       }\r
-                       pattIdxEnd--;\r
-                       pathIdxEnd--;\r
-               }\r
-               if (pathIdxStart > pathIdxEnd) {\r
-                       // String is exhausted\r
-                       for (int i = pattIdxStart; i <= pattIdxEnd; i++) {\r
-                               if (!pattDirs[i].equals("**")) {\r
-                                       return false;\r
-                               }\r
-                       }\r
-                       return true;\r
-               }\r
-\r
-               while (pattIdxStart != pattIdxEnd && pathIdxStart <= pathIdxEnd) {\r
-                       int patIdxTmp = -1;\r
-                       for (int i = pattIdxStart + 1; i <= pattIdxEnd; i++) {\r
-                               if (pattDirs[i].equals("**")) {\r
-                                       patIdxTmp = i;\r
-                                       break;\r
-                               }\r
-                       }\r
-                       if (patIdxTmp == pattIdxStart + 1) {\r
-                               // '**/**' situation, so skip one\r
-                               pattIdxStart++;\r
-                               continue;\r
-                       }\r
-                       // Find the pattern between padIdxStart & padIdxTmp in str between\r
-                       // strIdxStart & strIdxEnd\r
-                       int patLength = (patIdxTmp - pattIdxStart - 1);\r
-                       int strLength = (pathIdxEnd - pathIdxStart + 1);\r
-                       int foundIdx = -1;\r
-\r
-                       strLoop:\r
-                           for (int i = 0; i <= strLength - patLength; i++) {\r
-                                   for (int j = 0; j < patLength; j++) {\r
-                                           String subPat = (String) pattDirs[pattIdxStart + j + 1];\r
-                                           String subStr = (String) pathDirs[pathIdxStart + i + j];\r
-                                           if (!matchStrings(subPat, subStr)) {\r
-                                                   continue strLoop;\r
-                                           }\r
-                                   }\r
-                                   foundIdx = pathIdxStart + i;\r
-                                   break;\r
-                           }\r
-\r
-                       if (foundIdx == -1) {\r
-                               return false;\r
-                       }\r
-\r
-                       pattIdxStart = patIdxTmp;\r
-                       pathIdxStart = foundIdx + patLength;\r
-               }\r
-\r
-               for (int i = pattIdxStart; i <= pattIdxEnd; i++) {\r
-                       if (!pattDirs[i].equals("**")) {\r
-                               return false;\r
-                       }\r
-               }\r
-\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * Tests whether or not a string matches against a pattern.\r
-        * The pattern may contain two special characters:<br>\r
-        * '*' means zero or more characters<br>\r
-        * '?' means one and only one character\r
-        * @param pattern pattern to match against.\r
-        * Must not be <code>null</code>.\r
-        * @param str string which must be matched against the pattern.\r
-        * Must not be <code>null</code>.\r
-        * @return <code>true</code> if the string matches against the\r
-        * pattern, or <code>false</code> otherwise.\r
-        */\r
-       private boolean matchStrings(String pattern, String str) {\r
-               char[] patArr = pattern.toCharArray();\r
-               char[] strArr = str.toCharArray();\r
-               int patIdxStart = 0;\r
-               int patIdxEnd = patArr.length - 1;\r
-               int strIdxStart = 0;\r
-               int strIdxEnd = strArr.length - 1;\r
-               char ch;\r
-\r
-               boolean containsStar = false;\r
-               for (int i = 0; i < patArr.length; i++) {\r
-                       if (patArr[i] == '*') {\r
-                               containsStar = true;\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               if (!containsStar) {\r
-                       // No '*'s, so we make a shortcut\r
-                       if (patIdxEnd != strIdxEnd) {\r
-                               return false; // Pattern and string do not have the same size\r
-                       }\r
-                       for (int i = 0; i <= patIdxEnd; i++) {\r
-                               ch = patArr[i];\r
-                               if (ch != '?') {\r
-                                       if (ch != strArr[i]) {\r
-                                               return false;// Character mismatch\r
-                                       }\r
-                               }\r
-                       }\r
-                       return true; // String matches against pattern\r
-               }\r
-\r
-\r
-               if (patIdxEnd == 0) {\r
-                       return true; // Pattern contains only '*', which matches anything\r
-               }\r
-\r
-               // Process characters before first star\r
-               while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd) {\r
-                       if (ch != '?') {\r
-                               if (ch != strArr[strIdxStart]) {\r
-                                       return false;// Character mismatch\r
-                               }\r
-                       }\r
-                       patIdxStart++;\r
-                       strIdxStart++;\r
-               }\r
-               if (strIdxStart > strIdxEnd) {\r
-                       // All characters in the string are used. Check if only '*'s are\r
-                       // left in the pattern. If so, we succeeded. Otherwise failure.\r
-                       for (int i = patIdxStart; i <= patIdxEnd; i++) {\r
-                               if (patArr[i] != '*') {\r
-                                       return false;\r
-                               }\r
-                       }\r
-                       return true;\r
-               }\r
-\r
-               // Process characters after last star\r
-               while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd) {\r
-                       if (ch != '?') {\r
-                               if (ch != strArr[strIdxEnd]) {\r
-                                       return false;// Character mismatch\r
-                               }\r
-                       }\r
-                       patIdxEnd--;\r
-                       strIdxEnd--;\r
-               }\r
-               if (strIdxStart > strIdxEnd) {\r
-                       // All characters in the string are used. Check if only '*'s are\r
-                       // left in the pattern. If so, we succeeded. Otherwise failure.\r
-                       for (int i = patIdxStart; i <= patIdxEnd; i++) {\r
-                               if (patArr[i] != '*') {\r
-                                       return false;\r
-                               }\r
-                       }\r
-                       return true;\r
-               }\r
-\r
-               // process pattern between stars. padIdxStart and patIdxEnd point\r
-               // always to a '*'.\r
-               while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {\r
-                       int patIdxTmp = -1;\r
-                       for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {\r
-                               if (patArr[i] == '*') {\r
-                                       patIdxTmp = i;\r
-                                       break;\r
-                               }\r
-                       }\r
-                       if (patIdxTmp == patIdxStart + 1) {\r
-                               // Two stars next to each other, skip the first one.\r
-                               patIdxStart++;\r
-                               continue;\r
-                       }\r
-                       // Find the pattern between padIdxStart & padIdxTmp in str between\r
-                       // strIdxStart & strIdxEnd\r
-                       int patLength = (patIdxTmp - patIdxStart - 1);\r
-                       int strLength = (strIdxEnd - strIdxStart + 1);\r
-                       int foundIdx = -1;\r
-                       strLoop:\r
-                       for (int i = 0; i <= strLength - patLength; i++) {\r
-                               for (int j = 0; j < patLength; j++) {\r
-                                       ch = patArr[patIdxStart + j + 1];\r
-                                       if (ch != '?') {\r
-                                               if (ch != strArr[strIdxStart + i + j]) {\r
-                                                       continue strLoop;\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-                               foundIdx = strIdxStart + i;\r
-                               break;\r
-                       }\r
-\r
-                       if (foundIdx == -1) {\r
-                               return false;\r
-                       }\r
-\r
-                       patIdxStart = patIdxTmp;\r
-                       strIdxStart = foundIdx + patLength;\r
-               }\r
-\r
-               // All characters in the string are used. Check if only '*'s are left\r
-               // in the pattern. If so, we succeeded. Otherwise failure.\r
-               for (int i = patIdxStart; i <= patIdxEnd; i++) {\r
-                       if (patArr[i] != '*') {\r
-                               return false;\r
-                       }\r
-               }\r
-\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * Given a pattern and a full path, determine the pattern-mapped part.\r
-        * <p>For example:\r
-        * <ul>\r
-        * <li>'<code>/docs/cvs/commit.html</code>' and '<code>/docs/cvs/commit.html</code> -> ''</li>\r
-        * <li>'<code>/docs/*</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>\r
-        * <li>'<code>/docs/cvs/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>commit.html</code>'</li>\r
-        * <li>'<code>/docs/**</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>\r
-        * <li>'<code>/docs/**\/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>cvs/commit.html</code>'</li>\r
-        * <li>'<code>/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>docs/cvs/commit.html</code>'</li>\r
-        * <li>'<code>*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>\r
-        * <li>'<code>*</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>\r
-        * </ul>\r
-        * <p>Assumes that {@link #match} returns <code>true</code> for '<code>pattern</code>'\r
-        * and '<code>path</code>', but does <strong>not</strong> enforce this.\r
-        */\r
-       public String extractPathWithinPattern(String pattern, String path) {\r
-               String[] patternParts = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);\r
-               String[] pathParts = StringUtils.tokenizeToStringArray(path, this.pathSeparator);\r
-\r
-               StringBuffer buffer = new StringBuffer();\r
-\r
-               // Add any path parts that have a wildcarded pattern part.\r
-               int puts = 0;\r
-               for (int i = 0; i < patternParts.length; i++) {\r
-                       String patternPart = patternParts[i];\r
-                       if ((patternPart.indexOf('*') > -1 || patternPart.indexOf('?') > -1) && pathParts.length >= i + 1) {\r
-                               if (puts > 0 || (i == 0 && !pattern.startsWith(this.pathSeparator))) {\r
-                                       buffer.append(this.pathSeparator);\r
-                               }\r
-                               buffer.append(pathParts[i]);\r
-                               puts++;\r
-                       }\r
-               }\r
-\r
-               // Append any trailing path parts.\r
-               for (int i = patternParts.length; i < pathParts.length; i++) {\r
-                       if (puts > 0 || i > 0) {\r
-                               buffer.append(this.pathSeparator);\r
-                       }\r
-                       buffer.append(pathParts[i]);\r
-               }\r
-\r
-               return buffer.toString();\r
-       }\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java
deleted file mode 100644 (file)
index ad01542..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-/*\r
- * Copyright 2002-2008 the original author or authors.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.argeo.osgi.boot.internal.springutil;\r
-\r
-import java.util.Arrays;\r
-import java.util.Collection;\r
-import java.util.Enumeration;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Properties;\r
-\r
-/**\r
- * Miscellaneous collection utility methods.\r
- * Mainly for internal use within the framework.\r
- *\r
- * @author Juergen Hoeller\r
- * @author Rob Harrop\r
- * @since 1.1.3\r
- */\r
-public abstract class CollectionUtils {\r
-\r
-       /**\r
-        * Return <code>true</code> if the supplied Collection is <code>null</code>\r
-        * or empty. Otherwise, return <code>false</code>.\r
-        * @param collection the Collection to check\r
-        * @return whether the given Collection is empty\r
-        */\r
-       public static boolean isEmpty(Collection collection) {\r
-               return (collection == null || collection.isEmpty());\r
-       }\r
-\r
-       /**\r
-        * Return <code>true</code> if the supplied Map is <code>null</code>\r
-        * or empty. Otherwise, return <code>false</code>.\r
-        * @param map the Map to check\r
-        * @return whether the given Map is empty\r
-        */\r
-       public static boolean isEmpty(Map map) {\r
-               return (map == null || map.isEmpty());\r
-       }\r
-\r
-       /**\r
-        * Convert the supplied array into a List. A primitive array gets\r
-        * converted into a List of the appropriate wrapper type.\r
-        * <p>A <code>null</code> source value will be converted to an\r
-        * empty List.\r
-        * @param source the (potentially primitive) array\r
-        * @return the converted List result\r
-        * @see ObjectUtils#toObjectArray(Object)\r
-        */\r
-       public static List arrayToList(Object source) {\r
-               return Arrays.asList(ObjectUtils.toObjectArray(source));\r
-       }\r
-\r
-       /**\r
-        * Merge the given array into the given Collection.\r
-        * @param array the array to merge (may be <code>null</code>)\r
-        * @param collection the target Collection to merge the array into\r
-        */\r
-       public static void mergeArrayIntoCollection(Object array, Collection collection) {\r
-               if (collection == null) {\r
-                       throw new IllegalArgumentException("Collection must not be null");\r
-               }\r
-               Object[] arr = ObjectUtils.toObjectArray(array);\r
-               for (int i = 0; i < arr.length; i++) {\r
-                       collection.add(arr[i]);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Merge the given Properties instance into the given Map,\r
-        * copying all properties (key-value pairs) over.\r
-        * <p>Uses <code>Properties.propertyNames()</code> to even catch\r
-        * default properties linked into the original Properties instance.\r
-        * @param props the Properties instance to merge (may be <code>null</code>)\r
-        * @param map the target Map to merge the properties into\r
-        */\r
-       public static void mergePropertiesIntoMap(Properties props, Map map) {\r
-               if (map == null) {\r
-                       throw new IllegalArgumentException("Map must not be null");\r
-               }\r
-               if (props != null) {\r
-                       for (Enumeration en = props.propertyNames(); en.hasMoreElements();) {\r
-                               String key = (String) en.nextElement();\r
-                               map.put(key, props.getProperty(key));\r
-                       }\r
-               }\r
-       }\r
-\r
-\r
-       /**\r
-        * Check whether the given Iterator contains the given element.\r
-        * @param iterator the Iterator to check\r
-        * @param element the element to look for\r
-        * @return <code>true</code> if found, <code>false</code> else\r
-        */\r
-       public static boolean contains(Iterator iterator, Object element) {\r
-               if (iterator != null) {\r
-                       while (iterator.hasNext()) {\r
-                               Object candidate = iterator.next();\r
-                               if (ObjectUtils.nullSafeEquals(candidate, element)) {\r
-                                       return true;\r
-                               }\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Check whether the given Enumeration contains the given element.\r
-        * @param enumeration the Enumeration to check\r
-        * @param element the element to look for\r
-        * @return <code>true</code> if found, <code>false</code> else\r
-        */\r
-       public static boolean contains(Enumeration enumeration, Object element) {\r
-               if (enumeration != null) {\r
-                       while (enumeration.hasMoreElements()) {\r
-                               Object candidate = enumeration.nextElement();\r
-                               if (ObjectUtils.nullSafeEquals(candidate, element)) {\r
-                                       return true;\r
-                               }\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Check whether the given Collection contains the given element instance.\r
-        * <p>Enforces the given instance to be present, rather than returning\r
-        * <code>true</code> for an equal element as well.\r
-        * @param collection the Collection to check\r
-        * @param element the element to look for\r
-        * @return <code>true</code> if found, <code>false</code> else\r
-        */\r
-       public static boolean containsInstance(Collection collection, Object element) {\r
-               if (collection != null) {\r
-                       for (Iterator it = collection.iterator(); it.hasNext();) {\r
-                               Object candidate = it.next();\r
-                               if (candidate == element) {\r
-                                       return true;\r
-                               }\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Return <code>true</code> if any element in '<code>candidates</code>' is\r
-        * contained in '<code>source</code>'; otherwise returns <code>false</code>.\r
-        * @param source the source Collection\r
-        * @param candidates the candidates to search for\r
-        * @return whether any of the candidates has been found\r
-        */\r
-       public static boolean containsAny(Collection source, Collection candidates) {\r
-               if (isEmpty(source) || isEmpty(candidates)) {\r
-                       return false;\r
-               }\r
-               for (Iterator it = candidates.iterator(); it.hasNext();) {\r
-                       if (source.contains(it.next())) {\r
-                               return true;\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Return the first element in '<code>candidates</code>' that is contained in\r
-        * '<code>source</code>'. If no element in '<code>candidates</code>' is present in\r
-        * '<code>source</code>' returns <code>null</code>. Iteration order is\r
-        * {@link Collection} implementation specific.\r
-        * @param source the source Collection\r
-        * @param candidates the candidates to search for\r
-        * @return the first present object, or <code>null</code> if not found\r
-        */\r
-       public static Object findFirstMatch(Collection source, Collection candidates) {\r
-               if (isEmpty(source) || isEmpty(candidates)) {\r
-                       return null;\r
-               }\r
-               for (Iterator it = candidates.iterator(); it.hasNext();) {\r
-                       Object candidate = it.next();\r
-                       if (source.contains(candidate)) {\r
-                               return candidate;\r
-                       }\r
-               }\r
-               return null;\r
-       }\r
-\r
-       /**\r
-        * Find a single value of the given type in the given Collection.\r
-        * @param collection the Collection to search\r
-        * @param type the type to look for\r
-        * @return a value of the given type found if there is a clear match,\r
-        * or <code>null</code> if none or more than one such value found\r
-        */\r
-       public static Object findValueOfType(Collection collection, Class type) {\r
-               if (isEmpty(collection)) {\r
-                       return null;\r
-               }\r
-               Object value = null;\r
-               for (Iterator it = collection.iterator(); it.hasNext();) {\r
-                       Object obj = it.next();\r
-                       if (type == null || type.isInstance(obj)) {\r
-                               if (value != null) {\r
-                                       // More than one value found... no clear single value.\r
-                                       return null;\r
-                               }\r
-                               value = obj;\r
-                       }\r
-               }\r
-               return value;\r
-       }\r
-\r
-       /**\r
-        * Find a single value of one of the given types in the given Collection:\r
-        * searching the Collection for a value of the first type, then\r
-        * searching for a value of the second type, etc.\r
-        * @param collection the collection to search\r
-        * @param types the types to look for, in prioritized order\r
-        * @return a value of one of the given types found if there is a clear match,\r
-        * or <code>null</code> if none or more than one such value found\r
-        */\r
-       public static Object findValueOfType(Collection collection, Class[] types) {\r
-               if (isEmpty(collection) || ObjectUtils.isEmpty(types)) {\r
-                       return null;\r
-               }\r
-               for (int i = 0; i < types.length; i++) {\r
-                       Object value = findValueOfType(collection, types[i]);\r
-                       if (value != null) {\r
-                               return value;\r
-                       }\r
-               }\r
-               return null;\r
-       }\r
-\r
-       /**\r
-        * Determine whether the given Collection only contains a single unique object.\r
-        * @param collection the Collection to check\r
-        * @return <code>true</code> if the collection contains a single reference or\r
-        * multiple references to the same instance, <code>false</code> else\r
-        */\r
-       public static boolean hasUniqueObject(Collection collection) {\r
-               if (isEmpty(collection)) {\r
-                       return false;\r
-               }\r
-               boolean hasCandidate = false;\r
-               Object candidate = null;\r
-               for (Iterator it = collection.iterator(); it.hasNext();) {\r
-                       Object elem = it.next();\r
-                       if (!hasCandidate) {\r
-                               hasCandidate = true;\r
-                               candidate = elem;\r
-                       }\r
-                       else if (candidate != elem) {\r
-                               return false;\r
-                       }\r
-               }\r
-               return true;\r
-       }\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java
deleted file mode 100644 (file)
index 223b2a1..0000000
+++ /dev/null
@@ -1,833 +0,0 @@
-/*\r
- * Copyright 2002-2007 the original author or authors.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.argeo.osgi.boot.internal.springutil;\r
-\r
-import java.lang.reflect.Array;\r
-import java.util.Arrays;\r
-\r
-/**\r
- * Miscellaneous object utility methods. Mainly for internal use within the\r
- * framework; consider Jakarta's Commons Lang for a more comprehensive suite\r
- * of object utilities.\r
- *\r
- * @author Juergen Hoeller\r
- * @author Keith Donald\r
- * @author Rod Johnson\r
- * @author Rob Harrop\r
- * @author Alex Ruiz\r
- * @since 19.03.2004\r
- * @see org.apache.commons.lang.ObjectUtils\r
- */\r
-public abstract class ObjectUtils {\r
-\r
-       private static final int INITIAL_HASH = 7;\r
-       private static final int MULTIPLIER = 31;\r
-\r
-       private static final String EMPTY_STRING = "";\r
-       private static final String NULL_STRING = "null";\r
-       private static final String ARRAY_START = "{";\r
-       private static final String ARRAY_END = "}";\r
-       private static final String EMPTY_ARRAY = ARRAY_START + ARRAY_END;\r
-       private static final String ARRAY_ELEMENT_SEPARATOR = ", ";\r
-\r
-\r
-       /**\r
-        * Return whether the given throwable is a checked exception:\r
-        * that is, neither a RuntimeException nor an Error.\r
-        * @param ex the throwable to check\r
-        * @return whether the throwable is a checked exception\r
-        * @see java.lang.Exception\r
-        * @see java.lang.RuntimeException\r
-        * @see java.lang.Error\r
-        */\r
-       public static boolean isCheckedException(Throwable ex) {\r
-               return !(ex instanceof RuntimeException || ex instanceof Error);\r
-       }\r
-\r
-       /**\r
-        * Check whether the given exception is compatible with the exceptions\r
-        * declared in a throws clause.\r
-        * @param ex the exception to checked\r
-        * @param declaredExceptions the exceptions declared in the throws clause\r
-        * @return whether the given exception is compatible\r
-        */\r
-       public static boolean isCompatibleWithThrowsClause(Throwable ex, Class[] declaredExceptions) {\r
-               if (!isCheckedException(ex)) {\r
-                       return true;\r
-               }\r
-               if (declaredExceptions != null) {\r
-                       for (int i = 0; i < declaredExceptions.length; i++) {\r
-                               if (declaredExceptions[i].isAssignableFrom(ex.getClass())) {\r
-                                       return true;\r
-                               }\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Return whether the given array is empty: that is, <code>null</code>\r
-        * or of zero length.\r
-        * @param array the array to check\r
-        * @return whether the given array is empty\r
-        */\r
-       public static boolean isEmpty(Object[] array) {\r
-               return (array == null || array.length == 0);\r
-       }\r
-\r
-       /**\r
-        * Check whether the given array contains the given element.\r
-        * @param array the array to check (may be <code>null</code>,\r
-        * in which case the return value will always be <code>false</code>)\r
-        * @param element the element to check for\r
-        * @return whether the element has been found in the given array\r
-        */\r
-       public static boolean containsElement(Object[] array, Object element) {\r
-               if (array == null) {\r
-                       return false;\r
-               }\r
-               for (int i = 0; i < array.length; i++) {\r
-                       if (nullSafeEquals(array[i], element)) {\r
-                               return true;\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Append the given Object to the given array, returning a new array\r
-        * consisting of the input array contents plus the given Object.\r
-        * @param array the array to append to (can be <code>null</code>)\r
-        * @param obj the Object to append\r
-        * @return the new array (of the same component type; never <code>null</code>)\r
-        */\r
-       public static Object[] addObjectToArray(Object[] array, Object obj) {\r
-               Class compType = Object.class;\r
-               if (array != null) {\r
-                       compType = array.getClass().getComponentType();\r
-               }\r
-               else if (obj != null) {\r
-                       compType = obj.getClass();\r
-               }\r
-               int newArrLength = (array != null ? array.length + 1 : 1);\r
-               Object[] newArr = (Object[]) Array.newInstance(compType, newArrLength);\r
-               if (array != null) {\r
-                       System.arraycopy(array, 0, newArr, 0, array.length);\r
-               }\r
-               newArr[newArr.length - 1] = obj;\r
-               return newArr;\r
-       }\r
-\r
-       /**\r
-        * Convert the given array (which may be a primitive array) to an\r
-        * object array (if necessary of primitive wrapper objects).\r
-        * <p>A <code>null</code> source value will be converted to an\r
-        * empty Object array.\r
-        * @param source the (potentially primitive) array\r
-        * @return the corresponding object array (never <code>null</code>)\r
-        * @throws IllegalArgumentException if the parameter is not an array\r
-        */\r
-       public static Object[] toObjectArray(Object source) {\r
-               if (source instanceof Object[]) {\r
-                       return (Object[]) source;\r
-               }\r
-               if (source == null) {\r
-                       return new Object[0];\r
-               }\r
-               if (!source.getClass().isArray()) {\r
-                       throw new IllegalArgumentException("Source is not an array: " + source);\r
-               }\r
-               int length = Array.getLength(source);\r
-               if (length == 0) {\r
-                       return new Object[0];\r
-               }\r
-               Class wrapperType = Array.get(source, 0).getClass();\r
-               Object[] newArray = (Object[]) Array.newInstance(wrapperType, length);\r
-               for (int i = 0; i < length; i++) {\r
-                       newArray[i] = Array.get(source, i);\r
-               }\r
-               return newArray;\r
-       }\r
-\r
-\r
-       //---------------------------------------------------------------------\r
-       // Convenience methods for content-based equality/hash-code handling\r
-       //---------------------------------------------------------------------\r
-\r
-       /**\r
-        * Determine if the given objects are equal, returning <code>true</code>\r
-        * if both are <code>null</code> or <code>false</code> if only one is\r
-        * <code>null</code>.\r
-        * <p>Compares arrays with <code>Arrays.equals</code>, performing an equality\r
-        * check based on the array elements rather than the array reference.\r
-        * @param o1 first Object to compare\r
-        * @param o2 second Object to compare\r
-        * @return whether the given objects are equal\r
-        * @see java.util.Arrays#equals\r
-        */\r
-       public static boolean nullSafeEquals(Object o1, Object o2) {\r
-               if (o1 == o2) {\r
-                       return true;\r
-               }\r
-               if (o1 == null || o2 == null) {\r
-                       return false;\r
-               }\r
-               if (o1.equals(o2)) {\r
-                       return true;\r
-               }\r
-               if (o1.getClass().isArray() && o2.getClass().isArray()) {\r
-                       if (o1 instanceof Object[] && o2 instanceof Object[]) {\r
-                               return Arrays.equals((Object[]) o1, (Object[]) o2);\r
-                       }\r
-                       if (o1 instanceof boolean[] && o2 instanceof boolean[]) {\r
-                               return Arrays.equals((boolean[]) o1, (boolean[]) o2);\r
-                       }\r
-                       if (o1 instanceof byte[] && o2 instanceof byte[]) {\r
-                               return Arrays.equals((byte[]) o1, (byte[]) o2);\r
-                       }\r
-                       if (o1 instanceof char[] && o2 instanceof char[]) {\r
-                               return Arrays.equals((char[]) o1, (char[]) o2);\r
-                       }\r
-                       if (o1 instanceof double[] && o2 instanceof double[]) {\r
-                               return Arrays.equals((double[]) o1, (double[]) o2);\r
-                       }\r
-                       if (o1 instanceof float[] && o2 instanceof float[]) {\r
-                               return Arrays.equals((float[]) o1, (float[]) o2);\r
-                       }\r
-                       if (o1 instanceof int[] && o2 instanceof int[]) {\r
-                               return Arrays.equals((int[]) o1, (int[]) o2);\r
-                       }\r
-                       if (o1 instanceof long[] && o2 instanceof long[]) {\r
-                               return Arrays.equals((long[]) o1, (long[]) o2);\r
-                       }\r
-                       if (o1 instanceof short[] && o2 instanceof short[]) {\r
-                               return Arrays.equals((short[]) o1, (short[]) o2);\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Return as hash code for the given object; typically the value of\r
-        * <code>{@link Object#hashCode()}</code>. If the object is an array,\r
-        * this method will delegate to any of the <code>nullSafeHashCode</code>\r
-        * methods for arrays in this class. If the object is <code>null</code>,\r
-        * this method returns 0.\r
-        * @see #nullSafeHashCode(Object[])\r
-        * @see #nullSafeHashCode(boolean[])\r
-        * @see #nullSafeHashCode(byte[])\r
-        * @see #nullSafeHashCode(char[])\r
-        * @see #nullSafeHashCode(double[])\r
-        * @see #nullSafeHashCode(float[])\r
-        * @see #nullSafeHashCode(int[])\r
-        * @see #nullSafeHashCode(long[])\r
-        * @see #nullSafeHashCode(short[])\r
-        */\r
-       public static int nullSafeHashCode(Object obj) {\r
-               if (obj == null) {\r
-                       return 0;\r
-               }\r
-               if (obj.getClass().isArray()) {\r
-                       if (obj instanceof Object[]) {\r
-                               return nullSafeHashCode((Object[]) obj);\r
-                       }\r
-                       if (obj instanceof boolean[]) {\r
-                               return nullSafeHashCode((boolean[]) obj);\r
-                       }\r
-                       if (obj instanceof byte[]) {\r
-                               return nullSafeHashCode((byte[]) obj);\r
-                       }\r
-                       if (obj instanceof char[]) {\r
-                               return nullSafeHashCode((char[]) obj);\r
-                       }\r
-                       if (obj instanceof double[]) {\r
-                               return nullSafeHashCode((double[]) obj);\r
-                       }\r
-                       if (obj instanceof float[]) {\r
-                               return nullSafeHashCode((float[]) obj);\r
-                       }\r
-                       if (obj instanceof int[]) {\r
-                               return nullSafeHashCode((int[]) obj);\r
-                       }\r
-                       if (obj instanceof long[]) {\r
-                               return nullSafeHashCode((long[]) obj);\r
-                       }\r
-                       if (obj instanceof short[]) {\r
-                               return nullSafeHashCode((short[]) obj);\r
-                       }\r
-               }\r
-               return obj.hashCode();\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(Object[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + nullSafeHashCode(array[i]);\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(boolean[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(byte[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + array[i];\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(char[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + array[i];\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(double[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(float[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(int[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + array[i];\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(long[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + hashCode(array[i]);\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return a hash code based on the contents of the specified array.\r
-        * If <code>array</code> is <code>null</code>, this method returns 0.\r
-        */\r
-       public static int nullSafeHashCode(short[] array) {\r
-               if (array == null) {\r
-                       return 0;\r
-               }\r
-               int hash = INITIAL_HASH;\r
-               int arraySize = array.length;\r
-               for (int i = 0; i < arraySize; i++) {\r
-                       hash = MULTIPLIER * hash + array[i];\r
-               }\r
-               return hash;\r
-       }\r
-\r
-       /**\r
-        * Return the same value as <code>{@link Boolean#hashCode()}</code>.\r
-        * @see Boolean#hashCode()\r
-        */\r
-       public static int hashCode(boolean bool) {\r
-               return bool ? 1231 : 1237;\r
-       }\r
-\r
-       /**\r
-        * Return the same value as <code>{@link Double#hashCode()}</code>.\r
-        * @see Double#hashCode()\r
-        */\r
-       public static int hashCode(double dbl) {\r
-               long bits = Double.doubleToLongBits(dbl);\r
-               return hashCode(bits);\r
-       }\r
-\r
-       /**\r
-        * Return the same value as <code>{@link Float#hashCode()}</code>.\r
-        * @see Float#hashCode()\r
-        */\r
-       public static int hashCode(float flt) {\r
-               return Float.floatToIntBits(flt);\r
-       }\r
-\r
-       /**\r
-        * Return the same value as <code>{@link Long#hashCode()}</code>.\r
-        * @see Long#hashCode()\r
-        */\r
-       public static int hashCode(long lng) {\r
-               return (int) (lng ^ (lng >>> 32));\r
-       }\r
-\r
-\r
-       //---------------------------------------------------------------------\r
-       // Convenience methods for toString output\r
-       //---------------------------------------------------------------------\r
-\r
-       /**\r
-        * Return a String representation of an object's overall identity.\r
-        * @param obj the object (may be <code>null</code>)\r
-        * @return the object's identity as String representation,\r
-        * or an empty String if the object was <code>null</code>\r
-        */\r
-       public static String identityToString(Object obj) {\r
-               if (obj == null) {\r
-                       return EMPTY_STRING;\r
-               }\r
-               return obj.getClass().getName() + "@" + getIdentityHexString(obj);\r
-       }\r
-\r
-       /**\r
-        * Return a hex String form of an object's identity hash code.\r
-        * @param obj the object\r
-        * @return the object's identity code in hex notation\r
-        */\r
-       public static String getIdentityHexString(Object obj) {\r
-               return Integer.toHexString(System.identityHashCode(obj));\r
-       }\r
-\r
-       /**\r
-        * Return a content-based String representation if <code>obj</code> is\r
-        * not <code>null</code>; otherwise returns an empty String.\r
-        * <p>Differs from {@link #nullSafeToString(Object)} in that it returns\r
-        * an empty String rather than "null" for a <code>null</code> value.\r
-        * @param obj the object to build a display String for\r
-        * @return a display String representation of <code>obj</code>\r
-        * @see #nullSafeToString(Object)\r
-        */\r
-       public static String getDisplayString(Object obj) {\r
-               if (obj == null) {\r
-                       return EMPTY_STRING;\r
-               }\r
-               return nullSafeToString(obj);\r
-       }\r
-\r
-       /**\r
-        * Determine the class name for the given object.\r
-        * <p>Returns <code>"null"</code> if <code>obj</code> is <code>null</code>.\r
-        * @param obj the object to introspect (may be <code>null</code>)\r
-        * @return the corresponding class name\r
-        */\r
-       public static String nullSafeClassName(Object obj) {\r
-               return (obj != null ? obj.getClass().getName() : NULL_STRING);\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the specified Object.\r
-        * <p>Builds a String representation of the contents in case of an array.\r
-        * Returns <code>"null"</code> if <code>obj</code> is <code>null</code>.\r
-        * @param obj the object to build a String representation for\r
-        * @return a String representation of <code>obj</code>\r
-        */\r
-       public static String nullSafeToString(Object obj) {\r
-               if (obj == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               if (obj instanceof String) {\r
-                       return (String) obj;\r
-               }\r
-               if (obj instanceof Object[]) {\r
-                       return nullSafeToString((Object[]) obj);\r
-               }\r
-               if (obj instanceof boolean[]) {\r
-                       return nullSafeToString((boolean[]) obj);\r
-               }\r
-               if (obj instanceof byte[]) {\r
-                       return nullSafeToString((byte[]) obj);\r
-               }\r
-               if (obj instanceof char[]) {\r
-                       return nullSafeToString((char[]) obj);\r
-               }\r
-               if (obj instanceof double[]) {\r
-                       return nullSafeToString((double[]) obj);\r
-               }\r
-               if (obj instanceof float[]) {\r
-                       return nullSafeToString((float[]) obj);\r
-               }\r
-               if (obj instanceof int[]) {\r
-                       return nullSafeToString((int[]) obj);\r
-               }\r
-               if (obj instanceof long[]) {\r
-                       return nullSafeToString((long[]) obj);\r
-               }\r
-               if (obj instanceof short[]) {\r
-                       return nullSafeToString((short[]) obj);\r
-               }\r
-               String str = obj.toString();\r
-               return (str != null ? str : EMPTY_STRING);\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(Object[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-                       buffer.append(String.valueOf(array[i]));\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(boolean[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(byte[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(char[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-                       buffer.append("'").append(array[i]).append("'");\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(double[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(float[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(int[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(long[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-       /**\r
-        * Return a String representation of the contents of the specified array.\r
-        * <p>The String representation consists of a list of the array's elements,\r
-        * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated\r
-        * by the characters <code>", "</code> (a comma followed by a space). Returns\r
-        * <code>"null"</code> if <code>array</code> is <code>null</code>.\r
-        * @param array the array to build a String representation for\r
-        * @return a String representation of <code>array</code>\r
-        */\r
-       public static String nullSafeToString(short[] array) {\r
-               if (array == null) {\r
-                       return NULL_STRING;\r
-               }\r
-               int length = array.length;\r
-               if (length == 0) {\r
-                       return EMPTY_ARRAY;\r
-               }\r
-               StringBuffer buffer = new StringBuffer();\r
-               for (int i = 0; i < length; i++) {\r
-                       if (i == 0) {\r
-                               buffer.append(ARRAY_START);\r
-                       }\r
-                       else {\r
-                               buffer.append(ARRAY_ELEMENT_SEPARATOR);\r
-                       }\r
-                       buffer.append(array[i]);\r
-               }\r
-               buffer.append(ARRAY_END);\r
-               return buffer.toString();\r
-       }\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java
deleted file mode 100644 (file)
index d7a2322..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*\r
- * Copyright 2002-2007 the original author or authors.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.argeo.osgi.boot.internal.springutil;\r
-\r
-/**\r
- * Strategy interface for <code>String</code>-based path matching.\r
- * \r
- * <p>Used by {@link org.springframework.core.io.support.PathMatchingResourcePatternResolver},\r
- * {@link org.springframework.web.servlet.handler.AbstractUrlHandlerMapping},\r
- * {@link org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver},\r
- * and {@link org.springframework.web.servlet.mvc.WebContentInterceptor}.\r
- *\r
- * <p>The default implementation is {@link AntPathMatcher}, supporting the\r
- * Ant-style pattern syntax.\r
- *\r
- * @author Juergen Hoeller\r
- * @since 1.2\r
- * @see AntPathMatcher\r
- */\r
-public interface PathMatcher {\r
-\r
-       /**\r
-        * Does the given <code>path</code> represent a pattern that can be matched\r
-        * by an implementation of this interface?\r
-        * <p>If the return value is <code>false</code>, then the {@link #match}\r
-        * method does not have to be used because direct equality comparisons\r
-        * on the static path Strings will lead to the same result.\r
-        * @param path the path String to check\r
-        * @return <code>true</code> if the given <code>path</code> represents a pattern\r
-        */\r
-       boolean isPattern(String path);\r
-\r
-       /**\r
-        * Match the given <code>path</code> against the given <code>pattern</code>,\r
-        * according to this PathMatcher's matching strategy.\r
-        * @param pattern the pattern to match against\r
-        * @param path the path String to test\r
-        * @return <code>true</code> if the supplied <code>path</code> matched,\r
-        * <code>false</code> if it didn't\r
-        */\r
-       boolean match(String pattern, String path);\r
-\r
-       /**\r
-        * Match the given <code>path</code> against the corresponding part of the given\r
-        * <code>pattern</code>, according to this PathMatcher's matching strategy.\r
-        * <p>Determines whether the pattern at least matches as far as the given base\r
-        * path goes, assuming that a full path may then match as well.\r
-        * @param pattern the pattern to match against\r
-        * @param path the path String to test\r
-        * @return <code>true</code> if the supplied <code>path</code> matched,\r
-        * <code>false</code> if it didn't\r
-        */\r
-       boolean matchStart(String pattern, String path);\r
-\r
-       /**\r
-        * Given a pattern and a full path, determine the pattern-mapped part.\r
-        * <p>This method is supposed to find out which part of the path is matched\r
-        * dynamically through an actual pattern, that is, it strips off a statically\r
-        * defined leading path from the given full path, returning only the actually\r
-        * pattern-matched part of the path.\r
-        * <p>For example: For "myroot/*.html" as pattern and "myroot/myfile.html"\r
-        * as full path, this method should return "myfile.html". The detailed\r
-        * determination rules are specified to this PathMatcher's matching strategy.\r
-        * <p>A simple implementation may return the given full path as-is in case\r
-        * of an actual pattern, and the empty String in case of the pattern not\r
-        * containing any dynamic parts (i.e. the <code>pattern</code> parameter being\r
-        * a static path that wouldn't qualify as an actual {@link #isPattern pattern}).\r
-        * A sophisticated implementation will differentiate between the static parts\r
-        * and the dynamic parts of the given path pattern.\r
-        * @param pattern the path pattern\r
-        * @param path the full path to introspect\r
-        * @return the pattern-mapped part of the given <code>path</code>\r
-        * (never <code>null</code>)\r
-        */\r
-       String extractPathWithinPattern(String pattern, String path);\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java
deleted file mode 100644 (file)
index 2626590..0000000
+++ /dev/null
@@ -1,1113 +0,0 @@
-/*\r
- * Copyright 2002-2008 the original author or authors.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.argeo.osgi.boot.internal.springutil;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Arrays;\r
-import java.util.Collection;\r
-import java.util.Collections;\r
-import java.util.Enumeration;\r
-import java.util.Iterator;\r
-import java.util.LinkedList;\r
-import java.util.List;\r
-import java.util.Locale;\r
-import java.util.Properties;\r
-import java.util.Set;\r
-import java.util.StringTokenizer;\r
-import java.util.TreeSet;\r
-\r
-/**\r
- * Miscellaneous {@link String} utility methods.\r
- *\r
- * <p>Mainly for internal use within the framework; consider\r
- * <a href="http://jakarta.apache.org/commons/lang/">Jakarta's Commons Lang</a>\r
- * for a more comprehensive suite of String utilities.\r
- *\r
- * <p>This class delivers some simple functionality that should really\r
- * be provided by the core Java <code>String</code> and {@link StringBuffer}\r
- * classes, such as the ability to {@link #replace} all occurrences of a given\r
- * substring in a target string. It also provides easy-to-use methods to convert\r
- * between delimited strings, such as CSV strings, and collections and arrays.\r
- *\r
- * @author Rod Johnson\r
- * @author Juergen Hoeller\r
- * @author Keith Donald\r
- * @author Rob Harrop\r
- * @author Rick Evans\r
- * @since 16 April 2001\r
- * @see org.apache.commons.lang.StringUtils\r
- */\r
-public abstract class StringUtils {\r
-\r
-       private static final String FOLDER_SEPARATOR = "/";\r
-\r
-       private static final String WINDOWS_FOLDER_SEPARATOR = "\\";\r
-\r
-       private static final String TOP_PATH = "..";\r
-\r
-       private static final String CURRENT_PATH = ".";\r
-\r
-       private static final char EXTENSION_SEPARATOR = '.';\r
-\r
-\r
-       //---------------------------------------------------------------------\r
-       // General convenience methods for working with Strings\r
-       //---------------------------------------------------------------------\r
-\r
-       /**\r
-        * Check that the given CharSequence is neither <code>null</code> nor of length 0.\r
-        * Note: Will return <code>true</code> for a CharSequence that purely consists of whitespace.\r
-        * <p><pre>\r
-        * StringUtils.hasLength(null) = false\r
-        * StringUtils.hasLength("") = false\r
-        * StringUtils.hasLength(" ") = true\r
-        * StringUtils.hasLength("Hello") = true\r
-        * </pre>\r
-        * @param str the CharSequence to check (may be <code>null</code>)\r
-        * @return <code>true</code> if the CharSequence is not null and has length\r
-        * @see #hasText(String)\r
-        */\r
-       public static boolean hasLength(CharSequence str) {\r
-               return (str != null && str.length() > 0);\r
-       }\r
-\r
-       /**\r
-        * Check that the given String is neither <code>null</code> nor of length 0.\r
-        * Note: Will return <code>true</code> for a String that purely consists of whitespace.\r
-        * @param str the String to check (may be <code>null</code>)\r
-        * @return <code>true</code> if the String is not null and has length\r
-        * @see #hasLength(CharSequence)\r
-        */\r
-       public static boolean hasLength(String str) {\r
-               return hasLength((CharSequence) str);\r
-       }\r
-\r
-       /**\r
-        * Check whether the given CharSequence has actual text.\r
-        * More specifically, returns <code>true</code> if the string not <code>null</code>,\r
-        * its length is greater than 0, and it contains at least one non-whitespace character.\r
-        * <p><pre>\r
-        * StringUtils.hasText(null) = false\r
-        * StringUtils.hasText("") = false\r
-        * StringUtils.hasText(" ") = false\r
-        * StringUtils.hasText("12345") = true\r
-        * StringUtils.hasText(" 12345 ") = true\r
-        * </pre>\r
-        * @param str the CharSequence to check (may be <code>null</code>)\r
-        * @return <code>true</code> if the CharSequence is not <code>null</code>,\r
-        * its length is greater than 0, and it does not contain whitespace only\r
-        * @see java.lang.Character#isWhitespace\r
-        */\r
-       public static boolean hasText(CharSequence str) {\r
-               if (!hasLength(str)) {\r
-                       return false;\r
-               }\r
-               int strLen = str.length();\r
-               for (int i = 0; i < strLen; i++) {\r
-                       if (!Character.isWhitespace(str.charAt(i))) {\r
-                               return true;\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Check whether the given String has actual text.\r
-        * More specifically, returns <code>true</code> if the string not <code>null</code>,\r
-        * its length is greater than 0, and it contains at least one non-whitespace character.\r
-        * @param str the String to check (may be <code>null</code>)\r
-        * @return <code>true</code> if the String is not <code>null</code>, its length is\r
-        * greater than 0, and it does not contain whitespace only\r
-        * @see #hasText(CharSequence)\r
-        */\r
-       public static boolean hasText(String str) {\r
-               return hasText((CharSequence) str);\r
-       }\r
-\r
-       /**\r
-        * Check whether the given CharSequence contains any whitespace characters.\r
-        * @param str the CharSequence to check (may be <code>null</code>)\r
-        * @return <code>true</code> if the CharSequence is not empty and\r
-        * contains at least 1 whitespace character\r
-        * @see java.lang.Character#isWhitespace\r
-        */\r
-       public static boolean containsWhitespace(CharSequence str) {\r
-               if (!hasLength(str)) {\r
-                       return false;\r
-               }\r
-               int strLen = str.length();\r
-               for (int i = 0; i < strLen; i++) {\r
-                       if (Character.isWhitespace(str.charAt(i))) {\r
-                               return true;\r
-                       }\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * Check whether the given String contains any whitespace characters.\r
-        * @param str the String to check (may be <code>null</code>)\r
-        * @return <code>true</code> if the String is not empty and\r
-        * contains at least 1 whitespace character\r
-        * @see #containsWhitespace(CharSequence)\r
-        */\r
-       public static boolean containsWhitespace(String str) {\r
-               return containsWhitespace((CharSequence) str);\r
-       }\r
-\r
-       /**\r
-        * Trim leading and trailing whitespace from the given String.\r
-        * @param str the String to check\r
-        * @return the trimmed String\r
-        * @see java.lang.Character#isWhitespace\r
-        */\r
-       public static String trimWhitespace(String str) {\r
-               if (!hasLength(str)) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str);\r
-               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(0))) {\r
-                       buf.deleteCharAt(0);\r
-               }\r
-               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(buf.length() - 1))) {\r
-                       buf.deleteCharAt(buf.length() - 1);\r
-               }\r
-               return buf.toString();\r
-       }\r
-\r
-       /**\r
-        * Trim <i>all</i> whitespace from the given String:\r
-        * leading, trailing, and inbetween characters.\r
-        * @param str the String to check\r
-        * @return the trimmed String\r
-        * @see java.lang.Character#isWhitespace\r
-        */\r
-       public static String trimAllWhitespace(String str) {\r
-               if (!hasLength(str)) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str);\r
-               int index = 0;\r
-               while (buf.length() > index) {\r
-                       if (Character.isWhitespace(buf.charAt(index))) {\r
-                               buf.deleteCharAt(index);\r
-                       }\r
-                       else {\r
-                               index++;\r
-                       }\r
-               }\r
-               return buf.toString();\r
-       }\r
-\r
-       /**\r
-        * Trim leading whitespace from the given String.\r
-        * @param str the String to check\r
-        * @return the trimmed String\r
-        * @see java.lang.Character#isWhitespace\r
-        */\r
-       public static String trimLeadingWhitespace(String str) {\r
-               if (!hasLength(str)) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str);\r
-               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(0))) {\r
-                       buf.deleteCharAt(0);\r
-               }\r
-               return buf.toString();\r
-       }\r
-\r
-       /**\r
-        * Trim trailing whitespace from the given String.\r
-        * @param str the String to check\r
-        * @return the trimmed String\r
-        * @see java.lang.Character#isWhitespace\r
-        */\r
-       public static String trimTrailingWhitespace(String str) {\r
-               if (!hasLength(str)) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str);\r
-               while (buf.length() > 0 && Character.isWhitespace(buf.charAt(buf.length() - 1))) {\r
-                       buf.deleteCharAt(buf.length() - 1);\r
-               }\r
-               return buf.toString();\r
-       }\r
-\r
-       /**\r
-        * Trim all occurences of the supplied leading character from the given String.\r
-        * @param str the String to check\r
-        * @param leadingCharacter the leading character to be trimmed\r
-        * @return the trimmed String\r
-        */\r
-       public static String trimLeadingCharacter(String str, char leadingCharacter) {\r
-               if (!hasLength(str)) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str);\r
-               while (buf.length() > 0 && buf.charAt(0) == leadingCharacter) {\r
-                       buf.deleteCharAt(0);\r
-               }\r
-               return buf.toString();\r
-       }\r
-\r
-       /**\r
-        * Trim all occurences of the supplied trailing character from the given String.\r
-        * @param str the String to check\r
-        * @param trailingCharacter the trailing character to be trimmed\r
-        * @return the trimmed String\r
-        */\r
-       public static String trimTrailingCharacter(String str, char trailingCharacter) {\r
-               if (!hasLength(str)) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str);\r
-               while (buf.length() > 0 && buf.charAt(buf.length() - 1) == trailingCharacter) {\r
-                       buf.deleteCharAt(buf.length() - 1);\r
-               }\r
-               return buf.toString();\r
-       }\r
-\r
-\r
-       /**\r
-        * Test if the given String starts with the specified prefix,\r
-        * ignoring upper/lower case.\r
-        * @param str the String to check\r
-        * @param prefix the prefix to look for\r
-        * @see java.lang.String#startsWith\r
-        */\r
-       public static boolean startsWithIgnoreCase(String str, String prefix) {\r
-               if (str == null || prefix == null) {\r
-                       return false;\r
-               }\r
-               if (str.startsWith(prefix)) {\r
-                       return true;\r
-               }\r
-               if (str.length() < prefix.length()) {\r
-                       return false;\r
-               }\r
-               String lcStr = str.substring(0, prefix.length()).toLowerCase();\r
-               String lcPrefix = prefix.toLowerCase();\r
-               return lcStr.equals(lcPrefix);\r
-       }\r
-\r
-       /**\r
-        * Test if the given String ends with the specified suffix,\r
-        * ignoring upper/lower case.\r
-        * @param str the String to check\r
-        * @param suffix the suffix to look for\r
-        * @see java.lang.String#endsWith\r
-        */\r
-       public static boolean endsWithIgnoreCase(String str, String suffix) {\r
-               if (str == null || suffix == null) {\r
-                       return false;\r
-               }\r
-               if (str.endsWith(suffix)) {\r
-                       return true;\r
-               }\r
-               if (str.length() < suffix.length()) {\r
-                       return false;\r
-               }\r
-\r
-               String lcStr = str.substring(str.length() - suffix.length()).toLowerCase();\r
-               String lcSuffix = suffix.toLowerCase();\r
-               return lcStr.equals(lcSuffix);\r
-       }\r
-\r
-       /**\r
-        * Test whether the given string matches the given substring\r
-        * at the given index.\r
-        * @param str the original string (or StringBuffer)\r
-        * @param index the index in the original string to start matching against\r
-        * @param substring the substring to match at the given index\r
-        */\r
-       public static boolean substringMatch(CharSequence str, int index, CharSequence substring) {\r
-               for (int j = 0; j < substring.length(); j++) {\r
-                       int i = index + j;\r
-                       if (i >= str.length() || str.charAt(i) != substring.charAt(j)) {\r
-                               return false;\r
-                       }\r
-               }\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * Count the occurrences of the substring in string s.\r
-        * @param str string to search in. Return 0 if this is null.\r
-        * @param sub string to search for. Return 0 if this is null.\r
-        */\r
-       public static int countOccurrencesOf(String str, String sub) {\r
-               if (str == null || sub == null || str.length() == 0 || sub.length() == 0) {\r
-                       return 0;\r
-               }\r
-               int count = 0, pos = 0, idx = 0;\r
-               while ((idx = str.indexOf(sub, pos)) != -1) {\r
-                       ++count;\r
-                       pos = idx + sub.length();\r
-               }\r
-               return count;\r
-       }\r
-\r
-       /**\r
-        * Replace all occurences of a substring within a string with\r
-        * another string.\r
-        * @param inString String to examine\r
-        * @param oldPattern String to replace\r
-        * @param newPattern String to insert\r
-        * @return a String with the replacements\r
-        */\r
-       public static String replace(String inString, String oldPattern, String newPattern) {\r
-               if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {\r
-                       return inString;\r
-               }\r
-               StringBuffer sbuf = new StringBuffer();\r
-               // output StringBuffer we'll build up\r
-               int pos = 0; // our position in the old string\r
-               int index = inString.indexOf(oldPattern);\r
-               // the index of an occurrence we've found, or -1\r
-               int patLen = oldPattern.length();\r
-               while (index >= 0) {\r
-                       sbuf.append(inString.substring(pos, index));\r
-                       sbuf.append(newPattern);\r
-                       pos = index + patLen;\r
-                       index = inString.indexOf(oldPattern, pos);\r
-               }\r
-               sbuf.append(inString.substring(pos));\r
-               // remember to append any characters to the right of a match\r
-               return sbuf.toString();\r
-       }\r
-\r
-       /**\r
-        * Delete all occurrences of the given substring.\r
-        * @param inString the original String\r
-        * @param pattern the pattern to delete all occurrences of\r
-        * @return the resulting String\r
-        */\r
-       public static String delete(String inString, String pattern) {\r
-               return replace(inString, pattern, "");\r
-       }\r
-\r
-       /**\r
-        * Delete any character in a given String.\r
-        * @param inString the original String\r
-        * @param charsToDelete a set of characters to delete.\r
-        * E.g. "az\n" will delete 'a's, 'z's and new lines.\r
-        * @return the resulting String\r
-        */\r
-       public static String deleteAny(String inString, String charsToDelete) {\r
-               if (!hasLength(inString) || !hasLength(charsToDelete)) {\r
-                       return inString;\r
-               }\r
-               StringBuffer out = new StringBuffer();\r
-               for (int i = 0; i < inString.length(); i++) {\r
-                       char c = inString.charAt(i);\r
-                       if (charsToDelete.indexOf(c) == -1) {\r
-                               out.append(c);\r
-                       }\r
-               }\r
-               return out.toString();\r
-       }\r
-\r
-\r
-       //---------------------------------------------------------------------\r
-       // Convenience methods for working with formatted Strings\r
-       //---------------------------------------------------------------------\r
-\r
-       /**\r
-        * Quote the given String with single quotes.\r
-        * @param str the input String (e.g. "myString")\r
-        * @return the quoted String (e.g. "'myString'"),\r
-        * or <code>null<code> if the input was <code>null</code>\r
-        */\r
-       public static String quote(String str) {\r
-               return (str != null ? "'" + str + "'" : null);\r
-       }\r
-\r
-       /**\r
-        * Turn the given Object into a String with single quotes\r
-        * if it is a String; keeping the Object as-is else.\r
-        * @param obj the input Object (e.g. "myString")\r
-        * @return the quoted String (e.g. "'myString'"),\r
-        * or the input object as-is if not a String\r
-        */\r
-       public static Object quoteIfString(Object obj) {\r
-               return (obj instanceof String ? quote((String) obj) : obj);\r
-       }\r
-\r
-       /**\r
-        * Unqualify a string qualified by a '.' dot character. For example,\r
-        * "this.name.is.qualified", returns "qualified".\r
-        * @param qualifiedName the qualified name\r
-        */\r
-       public static String unqualify(String qualifiedName) {\r
-               return unqualify(qualifiedName, '.');\r
-       }\r
-\r
-       /**\r
-        * Unqualify a string qualified by a separator character. For example,\r
-        * "this:name:is:qualified" returns "qualified" if using a ':' separator.\r
-        * @param qualifiedName the qualified name\r
-        * @param separator the separator\r
-        */\r
-       public static String unqualify(String qualifiedName, char separator) {\r
-               return qualifiedName.substring(qualifiedName.lastIndexOf(separator) + 1);\r
-       }\r
-\r
-       /**\r
-        * Capitalize a <code>String</code>, changing the first letter to\r
-        * upper case as per {@link Character#toUpperCase(char)}.\r
-        * No other letters are changed.\r
-        * @param str the String to capitalize, may be <code>null</code>\r
-        * @return the capitalized String, <code>null</code> if null\r
-        */\r
-       public static String capitalize(String str) {\r
-               return changeFirstCharacterCase(str, true);\r
-       }\r
-\r
-       /**\r
-        * Uncapitalize a <code>String</code>, changing the first letter to\r
-        * lower case as per {@link Character#toLowerCase(char)}.\r
-        * No other letters are changed.\r
-        * @param str the String to uncapitalize, may be <code>null</code>\r
-        * @return the uncapitalized String, <code>null</code> if null\r
-        */\r
-       public static String uncapitalize(String str) {\r
-               return changeFirstCharacterCase(str, false);\r
-       }\r
-\r
-       private static String changeFirstCharacterCase(String str, boolean capitalize) {\r
-               if (str == null || str.length() == 0) {\r
-                       return str;\r
-               }\r
-               StringBuffer buf = new StringBuffer(str.length());\r
-               if (capitalize) {\r
-                       buf.append(Character.toUpperCase(str.charAt(0)));\r
-               }\r
-               else {\r
-                       buf.append(Character.toLowerCase(str.charAt(0)));\r
-               }\r
-               buf.append(str.substring(1));\r
-               return buf.toString();\r
-       }\r
-\r
-       /**\r
-        * Extract the filename from the given path,\r
-        * e.g. "mypath/myfile.txt" -> "myfile.txt".\r
-        * @param path the file path (may be <code>null</code>)\r
-        * @return the extracted filename, or <code>null</code> if none\r
-        */\r
-       public static String getFilename(String path) {\r
-               if (path == null) {\r
-                       return null;\r
-               }\r
-               int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);\r
-               return (separatorIndex != -1 ? path.substring(separatorIndex + 1) : path);\r
-       }\r
-\r
-       /**\r
-        * Extract the filename extension from the given path,\r
-        * e.g. "mypath/myfile.txt" -> "txt".\r
-        * @param path the file path (may be <code>null</code>)\r
-        * @return the extracted filename extension, or <code>null</code> if none\r
-        */\r
-       public static String getFilenameExtension(String path) {\r
-               if (path == null) {\r
-                       return null;\r
-               }\r
-               int sepIndex = path.lastIndexOf(EXTENSION_SEPARATOR);\r
-               return (sepIndex != -1 ? path.substring(sepIndex + 1) : null);\r
-       }\r
-\r
-       /**\r
-        * Strip the filename extension from the given path,\r
-        * e.g. "mypath/myfile.txt" -> "mypath/myfile".\r
-        * @param path the file path (may be <code>null</code>)\r
-        * @return the path with stripped filename extension,\r
-        * or <code>null</code> if none\r
-        */\r
-       public static String stripFilenameExtension(String path) {\r
-               if (path == null) {\r
-                       return null;\r
-               }\r
-               int sepIndex = path.lastIndexOf(EXTENSION_SEPARATOR);\r
-               return (sepIndex != -1 ? path.substring(0, sepIndex) : path);\r
-       }\r
-\r
-       /**\r
-        * Apply the given relative path to the given path,\r
-        * assuming standard Java folder separation (i.e. "/" separators);\r
-        * @param path the path to start from (usually a full file path)\r
-        * @param relativePath the relative path to apply\r
-        * (relative to the full file path above)\r
-        * @return the full file path that results from applying the relative path\r
-        */\r
-       public static String applyRelativePath(String path, String relativePath) {\r
-               int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);\r
-               if (separatorIndex != -1) {\r
-                       String newPath = path.substring(0, separatorIndex);\r
-                       if (!relativePath.startsWith(FOLDER_SEPARATOR)) {\r
-                               newPath += FOLDER_SEPARATOR;\r
-                       }\r
-                       return newPath + relativePath;\r
-               }\r
-               else {\r
-                       return relativePath;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Normalize the path by suppressing sequences like "path/.." and\r
-        * inner simple dots.\r
-        * <p>The result is convenient for path comparison. For other uses,\r
-        * notice that Windows separators ("\") are replaced by simple slashes.\r
-        * @param path the original path\r
-        * @return the normalized path\r
-        */\r
-       public static String cleanPath(String path) {\r
-               if (path == null) {\r
-                       return null;\r
-               }\r
-               String pathToUse = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);\r
-\r
-               // Strip prefix from path to analyze, to not treat it as part of the\r
-               // first path element. This is necessary to correctly parse paths like\r
-               // "file:core/../core/io/Resource.class", where the ".." should just\r
-               // strip the first "core" directory while keeping the "file:" prefix.\r
-               int prefixIndex = pathToUse.indexOf(":");\r
-               String prefix = "";\r
-               if (prefixIndex != -1) {\r
-                       prefix = pathToUse.substring(0, prefixIndex + 1);\r
-                       pathToUse = pathToUse.substring(prefixIndex + 1);\r
-               }\r
-               if (pathToUse.startsWith(FOLDER_SEPARATOR)) {\r
-                       prefix = prefix + FOLDER_SEPARATOR;\r
-                       pathToUse = pathToUse.substring(1);\r
-               }\r
-\r
-               String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);\r
-               List pathElements = new LinkedList();\r
-               int tops = 0;\r
-\r
-               for (int i = pathArray.length - 1; i >= 0; i--) {\r
-                       String element = pathArray[i];\r
-                       if (CURRENT_PATH.equals(element)) {\r
-                               // Points to current directory - drop it.\r
-                       }\r
-                       else if (TOP_PATH.equals(element)) {\r
-                               // Registering top path found.\r
-                               tops++;\r
-                       }\r
-                       else {\r
-                               if (tops > 0) {\r
-                                       // Merging path element with element corresponding to top path.\r
-                                       tops--;\r
-                               }\r
-                               else {\r
-                                       // Normal path element found.\r
-                                       pathElements.add(0, element);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               // Remaining top paths need to be retained.\r
-               for (int i = 0; i < tops; i++) {\r
-                       pathElements.add(0, TOP_PATH);\r
-               }\r
-\r
-               return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);\r
-       }\r
-\r
-       /**\r
-        * Compare two paths after normalization of them.\r
-        * @param path1 first path for comparison\r
-        * @param path2 second path for comparison\r
-        * @return whether the two paths are equivalent after normalization\r
-        */\r
-       public static boolean pathEquals(String path1, String path2) {\r
-               return cleanPath(path1).equals(cleanPath(path2));\r
-       }\r
-\r
-       /**\r
-        * Parse the given <code>localeString</code> into a {@link Locale}.\r
-        * <p>This is the inverse operation of {@link Locale#toString Locale's toString}.\r
-        * @param localeString the locale string, following <code>Locale's</code>\r
-        * <code>toString()</code> format ("en", "en_UK", etc);\r
-        * also accepts spaces as separators, as an alternative to underscores\r
-        * @return a corresponding <code>Locale</code> instance\r
-        */\r
-       public static Locale parseLocaleString(String localeString) {\r
-               String[] parts = tokenizeToStringArray(localeString, "_ ", false, false);\r
-               String language = (parts.length > 0 ? parts[0] : "");\r
-               String country = (parts.length > 1 ? parts[1] : "");\r
-               String variant = "";\r
-               if (parts.length >= 2) {\r
-                       // There is definitely a variant, and it is everything after the country\r
-                       // code sans the separator between the country code and the variant.\r
-                       int endIndexOfCountryCode = localeString.indexOf(country) + country.length();\r
-                       // Strip off any leading '_' and whitespace, what's left is the variant.\r
-                       variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));\r
-                       if (variant.startsWith("_")) {\r
-                               variant = trimLeadingCharacter(variant, '_');\r
-                       }\r
-               }\r
-               return (language.length() > 0 ? new Locale(language, country, variant) : null);\r
-       }\r
-\r
-       /**\r
-        * Determine the RFC 3066 compliant language tag,\r
-        * as used for the HTTP "Accept-Language" header.\r
-        * @param locale the Locale to transform to a language tag\r
-        * @return the RFC 3066 compliant language tag as String\r
-        */\r
-       public static String toLanguageTag(Locale locale) {\r
-               return locale.getLanguage() + (hasText(locale.getCountry()) ? "-" + locale.getCountry() : "");\r
-       }\r
-\r
-\r
-       //---------------------------------------------------------------------\r
-       // Convenience methods for working with String arrays\r
-       //---------------------------------------------------------------------\r
-\r
-       /**\r
-        * Append the given String to the given String array, returning a new array\r
-        * consisting of the input array contents plus the given String.\r
-        * @param array the array to append to (can be <code>null</code>)\r
-        * @param str the String to append\r
-        * @return the new array (never <code>null</code>)\r
-        */\r
-       public static String[] addStringToArray(String[] array, String str) {\r
-               if (ObjectUtils.isEmpty(array)) {\r
-                       return new String[] {str};\r
-               }\r
-               String[] newArr = new String[array.length + 1];\r
-               System.arraycopy(array, 0, newArr, 0, array.length);\r
-               newArr[array.length] = str;\r
-               return newArr;\r
-       }\r
-\r
-       /**\r
-        * Concatenate the given String arrays into one,\r
-        * with overlapping array elements included twice.\r
-        * <p>The order of elements in the original arrays is preserved.\r
-        * @param array1 the first array (can be <code>null</code>)\r
-        * @param array2 the second array (can be <code>null</code>)\r
-        * @return the new array (<code>null</code> if both given arrays were <code>null</code>)\r
-        */\r
-       public static String[] concatenateStringArrays(String[] array1, String[] array2) {\r
-               if (ObjectUtils.isEmpty(array1)) {\r
-                       return array2;\r
-               }\r
-               if (ObjectUtils.isEmpty(array2)) {\r
-                       return array1;\r
-               }\r
-               String[] newArr = new String[array1.length + array2.length];\r
-               System.arraycopy(array1, 0, newArr, 0, array1.length);\r
-               System.arraycopy(array2, 0, newArr, array1.length, array2.length);\r
-               return newArr;\r
-       }\r
-\r
-       /**\r
-        * Merge the given String arrays into one, with overlapping\r
-        * array elements only included once.\r
-        * <p>The order of elements in the original arrays is preserved\r
-        * (with the exception of overlapping elements, which are only\r
-        * included on their first occurence).\r
-        * @param array1 the first array (can be <code>null</code>)\r
-        * @param array2 the second array (can be <code>null</code>)\r
-        * @return the new array (<code>null</code> if both given arrays were <code>null</code>)\r
-        */\r
-       public static String[] mergeStringArrays(String[] array1, String[] array2) {\r
-               if (ObjectUtils.isEmpty(array1)) {\r
-                       return array2;\r
-               }\r
-               if (ObjectUtils.isEmpty(array2)) {\r
-                       return array1;\r
-               }\r
-               List result = new ArrayList();\r
-               result.addAll(Arrays.asList(array1));\r
-               for (int i = 0; i < array2.length; i++) {\r
-                       String str = array2[i];\r
-                       if (!result.contains(str)) {\r
-                               result.add(str);\r
-                       }\r
-               }\r
-               return toStringArray(result);\r
-       }\r
-\r
-       /**\r
-        * Turn given source String array into sorted array.\r
-        * @param array the source array\r
-        * @return the sorted array (never <code>null</code>)\r
-        */\r
-       public static String[] sortStringArray(String[] array) {\r
-               if (ObjectUtils.isEmpty(array)) {\r
-                       return new String[0];\r
-               }\r
-               Arrays.sort(array);\r
-               return array;\r
-       }\r
-\r
-       /**\r
-        * Copy the given Collection into a String array.\r
-        * The Collection must contain String elements only.\r
-        * @param collection the Collection to copy\r
-        * @return the String array (<code>null</code> if the passed-in\r
-        * Collection was <code>null</code>)\r
-        */\r
-       public static String[] toStringArray(Collection collection) {\r
-               if (collection == null) {\r
-                       return null;\r
-               }\r
-               return (String[]) collection.toArray(new String[collection.size()]);\r
-       }\r
-\r
-       /**\r
-        * Copy the given Enumeration into a String array.\r
-        * The Enumeration must contain String elements only.\r
-        * @param enumeration the Enumeration to copy\r
-        * @return the String array (<code>null</code> if the passed-in\r
-        * Enumeration was <code>null</code>)\r
-        */\r
-       public static String[] toStringArray(Enumeration enumeration) {\r
-               if (enumeration == null) {\r
-                       return null;\r
-               }\r
-               List list = Collections.list(enumeration);\r
-               return (String[]) list.toArray(new String[list.size()]);\r
-       }\r
-\r
-       /**\r
-        * Trim the elements of the given String array,\r
-        * calling <code>String.trim()</code> on each of them.\r
-        * @param array the original String array\r
-        * @return the resulting array (of the same size) with trimmed elements\r
-        */\r
-       public static String[] trimArrayElements(String[] array) {\r
-               if (ObjectUtils.isEmpty(array)) {\r
-                       return new String[0];\r
-               }\r
-               String[] result = new String[array.length];\r
-               for (int i = 0; i < array.length; i++) {\r
-                       String element = array[i];\r
-                       result[i] = (element != null ? element.trim() : null);\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * Remove duplicate Strings from the given array.\r
-        * Also sorts the array, as it uses a TreeSet.\r
-        * @param array the String array\r
-        * @return an array without duplicates, in natural sort order\r
-        */\r
-       public static String[] removeDuplicateStrings(String[] array) {\r
-               if (ObjectUtils.isEmpty(array)) {\r
-                       return array;\r
-               }\r
-               Set set = new TreeSet();\r
-               for (int i = 0; i < array.length; i++) {\r
-                       set.add(array[i]);\r
-               }\r
-               return toStringArray(set);\r
-       }\r
-\r
-       /**\r
-        * Split a String at the first occurrence of the delimiter.\r
-        * Does not include the delimiter in the result.\r
-        * @param toSplit the string to split\r
-        * @param delimiter to split the string up with\r
-        * @return a two element array with index 0 being before the delimiter, and\r
-        * index 1 being after the delimiter (neither element includes the delimiter);\r
-        * or <code>null</code> if the delimiter wasn't found in the given input String\r
-        */\r
-       public static String[] split(String toSplit, String delimiter) {\r
-               if (!hasLength(toSplit) || !hasLength(delimiter)) {\r
-                       return null;\r
-               }\r
-               int offset = toSplit.indexOf(delimiter);\r
-               if (offset < 0) {\r
-                       return null;\r
-               }\r
-               String beforeDelimiter = toSplit.substring(0, offset);\r
-               String afterDelimiter = toSplit.substring(offset + delimiter.length());\r
-               return new String[] {beforeDelimiter, afterDelimiter};\r
-       }\r
-\r
-       /**\r
-        * Take an array Strings and split each element based on the given delimiter.\r
-        * A <code>Properties</code> instance is then generated, with the left of the\r
-        * delimiter providing the key, and the right of the delimiter providing the value.\r
-        * <p>Will trim both the key and value before adding them to the\r
-        * <code>Properties</code> instance.\r
-        * @param array the array to process\r
-        * @param delimiter to split each element using (typically the equals symbol)\r
-        * @return a <code>Properties</code> instance representing the array contents,\r
-        * or <code>null</code> if the array to process was null or empty\r
-        */\r
-       public static Properties splitArrayElementsIntoProperties(String[] array, String delimiter) {\r
-               return splitArrayElementsIntoProperties(array, delimiter, null);\r
-       }\r
-\r
-       /**\r
-        * Take an array Strings and split each element based on the given delimiter.\r
-        * A <code>Properties</code> instance is then generated, with the left of the\r
-        * delimiter providing the key, and the right of the delimiter providing the value.\r
-        * <p>Will trim both the key and value before adding them to the\r
-        * <code>Properties</code> instance.\r
-        * @param array the array to process\r
-        * @param delimiter to split each element using (typically the equals symbol)\r
-        * @param charsToDelete one or more characters to remove from each element\r
-        * prior to attempting the split operation (typically the quotation mark\r
-        * symbol), or <code>null</code> if no removal should occur\r
-        * @return a <code>Properties</code> instance representing the array contents,\r
-        * or <code>null</code> if the array to process was <code>null</code> or empty\r
-        */\r
-       public static Properties splitArrayElementsIntoProperties(\r
-                       String[] array, String delimiter, String charsToDelete) {\r
-\r
-               if (ObjectUtils.isEmpty(array)) {\r
-                       return null;\r
-               }\r
-               Properties result = new Properties();\r
-               for (int i = 0; i < array.length; i++) {\r
-                       String element = array[i];\r
-                       if (charsToDelete != null) {\r
-                               element = deleteAny(array[i], charsToDelete);\r
-                       }\r
-                       String[] splittedElement = split(element, delimiter);\r
-                       if (splittedElement == null) {\r
-                               continue;\r
-                       }\r
-                       result.setProperty(splittedElement[0].trim(), splittedElement[1].trim());\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * Tokenize the given String into a String array via a StringTokenizer.\r
-        * Trims tokens and omits empty tokens.\r
-        * <p>The given delimiters string is supposed to consist of any number of\r
-        * delimiter characters. Each of those characters can be used to separate\r
-        * tokens. A delimiter is always a single character; for multi-character\r
-        * delimiters, consider using <code>delimitedListToStringArray</code>\r
-        * @param str the String to tokenize\r
-        * @param delimiters the delimiter characters, assembled as String\r
-        * (each of those characters is individually considered as delimiter).\r
-        * @return an array of the tokens\r
-        * @see java.util.StringTokenizer\r
-        * @see java.lang.String#trim()\r
-        * @see #delimitedListToStringArray\r
-        */\r
-       public static String[] tokenizeToStringArray(String str, String delimiters) {\r
-               return tokenizeToStringArray(str, delimiters, true, true);\r
-       }\r
-\r
-       /**\r
-        * Tokenize the given String into a String array via a StringTokenizer.\r
-        * <p>The given delimiters string is supposed to consist of any number of\r
-        * delimiter characters. Each of those characters can be used to separate\r
-        * tokens. A delimiter is always a single character; for multi-character\r
-        * delimiters, consider using <code>delimitedListToStringArray</code>\r
-        * @param str the String to tokenize\r
-        * @param delimiters the delimiter characters, assembled as String\r
-        * (each of those characters is individually considered as delimiter)\r
-        * @param trimTokens trim the tokens via String's <code>trim</code>\r
-        * @param ignoreEmptyTokens omit empty tokens from the result array\r
-        * (only applies to tokens that are empty after trimming; StringTokenizer\r
-        * will not consider subsequent delimiters as token in the first place).\r
-        * @return an array of the tokens (<code>null</code> if the input String\r
-        * was <code>null</code>)\r
-        * @see java.util.StringTokenizer\r
-        * @see java.lang.String#trim()\r
-        * @see #delimitedListToStringArray\r
-        */\r
-       public static String[] tokenizeToStringArray(\r
-                       String str, String delimiters, boolean trimTokens, boolean ignoreEmptyTokens) {\r
-\r
-               if (str == null) {\r
-                       return null;\r
-               }\r
-               StringTokenizer st = new StringTokenizer(str, delimiters);\r
-               List tokens = new ArrayList();\r
-               while (st.hasMoreTokens()) {\r
-                       String token = st.nextToken();\r
-                       if (trimTokens) {\r
-                               token = token.trim();\r
-                       }\r
-                       if (!ignoreEmptyTokens || token.length() > 0) {\r
-                               tokens.add(token);\r
-                       }\r
-               }\r
-               return toStringArray(tokens);\r
-       }\r
-\r
-       /**\r
-        * Take a String which is a delimited list and convert it to a String array.\r
-        * <p>A single delimiter can consists of more than one character: It will still\r
-        * be considered as single delimiter string, rather than as bunch of potential\r
-        * delimiter characters - in contrast to <code>tokenizeToStringArray</code>.\r
-        * @param str the input String\r
-        * @param delimiter the delimiter between elements (this is a single delimiter,\r
-        * rather than a bunch individual delimiter characters)\r
-        * @return an array of the tokens in the list\r
-        * @see #tokenizeToStringArray\r
-        */\r
-       public static String[] delimitedListToStringArray(String str, String delimiter) {\r
-               return delimitedListToStringArray(str, delimiter, null);\r
-       }\r
-\r
-       /**\r
-        * Take a String which is a delimited list and convert it to a String array.\r
-        * <p>A single delimiter can consists of more than one character: It will still\r
-        * be considered as single delimiter string, rather than as bunch of potential\r
-        * delimiter characters - in contrast to <code>tokenizeToStringArray</code>.\r
-        * @param str the input String\r
-        * @param delimiter the delimiter between elements (this is a single delimiter,\r
-        * rather than a bunch individual delimiter characters)\r
-        * @param charsToDelete a set of characters to delete. Useful for deleting unwanted\r
-        * line breaks: e.g. "\r\n\f" will delete all new lines and line feeds in a String.\r
-        * @return an array of the tokens in the list\r
-        * @see #tokenizeToStringArray\r
-        */\r
-       public static String[] delimitedListToStringArray(String str, String delimiter, String charsToDelete) {\r
-               if (str == null) {\r
-                       return new String[0];\r
-               }\r
-               if (delimiter == null) {\r
-                       return new String[] {str};\r
-               }\r
-               List result = new ArrayList();\r
-               if ("".equals(delimiter)) {\r
-                       for (int i = 0; i < str.length(); i++) {\r
-                               result.add(deleteAny(str.substring(i, i + 1), charsToDelete));\r
-                       }\r
-               }\r
-               else {\r
-                       int pos = 0;\r
-                       int delPos = 0;\r
-                       while ((delPos = str.indexOf(delimiter, pos)) != -1) {\r
-                               result.add(deleteAny(str.substring(pos, delPos), charsToDelete));\r
-                               pos = delPos + delimiter.length();\r
-                       }\r
-                       if (str.length() > 0 && pos <= str.length()) {\r
-                               // Add rest of String, but not in case of empty input.\r
-                               result.add(deleteAny(str.substring(pos), charsToDelete));\r
-                       }\r
-               }\r
-               return toStringArray(result);\r
-       }\r
-\r
-       /**\r
-        * Convert a CSV list into an array of Strings.\r
-        * @param str the input String\r
-        * @return an array of Strings, or the empty array in case of empty input\r
-        */\r
-       public static String[] commaDelimitedListToStringArray(String str) {\r
-               return delimitedListToStringArray(str, ",");\r
-       }\r
-\r
-       /**\r
-        * Convenience method to convert a CSV string list to a set.\r
-        * Note that this will suppress duplicates.\r
-        * @param str the input String\r
-        * @return a Set of String entries in the list\r
-        */\r
-       public static Set commaDelimitedListToSet(String str) {\r
-               Set set = new TreeSet();\r
-               String[] tokens = commaDelimitedListToStringArray(str);\r
-               for (int i = 0; i < tokens.length; i++) {\r
-                       set.add(tokens[i]);\r
-               }\r
-               return set;\r
-       }\r
-\r
-       /**\r
-        * Convenience method to return a Collection as a delimited (e.g. CSV)\r
-        * String. E.g. useful for <code>toString()</code> implementations.\r
-        * @param coll the Collection to display\r
-        * @param delim the delimiter to use (probably a ",")\r
-        * @param prefix the String to start each element with\r
-        * @param suffix the String to end each element with\r
-        * @return the delimited String\r
-        */\r
-       public static String collectionToDelimitedString(Collection coll, String delim, String prefix, String suffix) {\r
-               if (CollectionUtils.isEmpty(coll)) {\r
-                       return "";\r
-               }\r
-               StringBuffer sb = new StringBuffer();\r
-               Iterator it = coll.iterator();\r
-               while (it.hasNext()) {\r
-                       sb.append(prefix).append(it.next()).append(suffix);\r
-                       if (it.hasNext()) {\r
-                               sb.append(delim);\r
-                       }\r
-               }\r
-               return sb.toString();\r
-       }\r
-\r
-       /**\r
-        * Convenience method to return a Collection as a delimited (e.g. CSV)\r
-        * String. E.g. useful for <code>toString()</code> implementations.\r
-        * @param coll the Collection to display\r
-        * @param delim the delimiter to use (probably a ",")\r
-        * @return the delimited String\r
-        */\r
-       public static String collectionToDelimitedString(Collection coll, String delim) {\r
-               return collectionToDelimitedString(coll, delim, "", "");\r
-       }\r
-\r
-       /**\r
-        * Convenience method to return a Collection as a CSV String.\r
-        * E.g. useful for <code>toString()</code> implementations.\r
-        * @param coll the Collection to display\r
-        * @return the delimited String\r
-        */\r
-       public static String collectionToCommaDelimitedString(Collection coll) {\r
-               return collectionToDelimitedString(coll, ",");\r
-       }\r
-\r
-       /**\r
-        * Convenience method to return a String array as a delimited (e.g. CSV)\r
-        * String. E.g. useful for <code>toString()</code> implementations.\r
-        * @param arr the array to display\r
-        * @param delim the delimiter to use (probably a ",")\r
-        * @return the delimited String\r
-        */\r
-       public static String arrayToDelimitedString(Object[] arr, String delim) {\r
-               if (ObjectUtils.isEmpty(arr)) {\r
-                       return "";\r
-               }\r
-               StringBuffer sb = new StringBuffer();\r
-               for (int i = 0; i < arr.length; i++) {\r
-                       if (i > 0) {\r
-                               sb.append(delim);\r
-                       }\r
-                       sb.append(arr[i]);\r
-               }\r
-               return sb.toString();\r
-       }\r
-\r
-       /**\r
-        * Convenience method to return a String array as a CSV String.\r
-        * E.g. useful for <code>toString()</code> implementations.\r
-        * @param arr the array to display\r
-        * @return the delimited String\r
-        */\r
-       public static String arrayToCommaDelimitedString(Object[] arr) {\r
-               return arrayToDelimitedString(arr, ",");\r
-       }\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java
deleted file mode 100644 (file)
index f81adc2..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*\r
- * Copyright 2002-2008 the original author or authors.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.argeo.osgi.boot.internal.springutil;\r
-\r
-/**\r
- * Helper class for resolving placeholders in texts. Usually applied to file paths.\r
- *\r
- * <p>A text may contain <code>${...}</code> placeholders, to be resolved as\r
- * system properties: e.g. <code>${user.dir}</code>.\r
- *\r
- * @author Juergen Hoeller\r
- * @since 1.2.5\r
- * @see #PLACEHOLDER_PREFIX\r
- * @see #PLACEHOLDER_SUFFIX\r
- * @see System#getProperty(String)\r
- */\r
-public abstract class SystemPropertyUtils {\r
-\r
-       /** Prefix for system property placeholders: "${" */\r
-       public static final String PLACEHOLDER_PREFIX = "${";\r
-\r
-       /** Suffix for system property placeholders: "}" */\r
-       public static final String PLACEHOLDER_SUFFIX = "}";\r
-\r
-\r
-       /**\r
-        * Resolve ${...} placeholders in the given text,\r
-        * replacing them with corresponding system property values.\r
-        * @param text the String to resolve\r
-        * @return the resolved String\r
-        * @see #PLACEHOLDER_PREFIX\r
-        * @see #PLACEHOLDER_SUFFIX\r
-        */\r
-       public static String resolvePlaceholders(String text) {\r
-               StringBuffer buf = new StringBuffer(text);\r
-\r
-               int startIndex = buf.indexOf(PLACEHOLDER_PREFIX);\r
-               while (startIndex != -1) {\r
-                       int endIndex = buf.indexOf(PLACEHOLDER_SUFFIX, startIndex + PLACEHOLDER_PREFIX.length());\r
-                       if (endIndex != -1) {\r
-                               String placeholder = buf.substring(startIndex + PLACEHOLDER_PREFIX.length(), endIndex);\r
-                               int nextIndex = endIndex + PLACEHOLDER_SUFFIX.length();\r
-                               try {\r
-                                       String propVal = System.getProperty(placeholder);\r
-                                       if (propVal == null) {\r
-                                               // Fall back to searching the system environment.\r
-                                               //propVal = System.getenv(placeholder);// mbaudier - 2009-07-26\r
-                                               throw new Error("getenv no longer supported, use properties and -D instead: " + placeholder);\r
-                                       }\r
-                                       if (propVal != null) {\r
-                                               buf.replace(startIndex, endIndex + PLACEHOLDER_SUFFIX.length(), propVal);\r
-                                               nextIndex = startIndex + propVal.length();\r
-                                       }\r
-                                       else {\r
-                                               System.err.println("Could not resolve placeholder '" + placeholder + "' in [" + text +\r
-                                                               "] as system property: neither system property nor environment variable found");\r
-                                       }\r
-                               }\r
-                               catch (Throwable ex) {\r
-                                       System.err.println("Could not resolve placeholder '" + placeholder + "' in [" + text +\r
-                                                       "] as system property: " + ex);\r
-                               }\r
-                               startIndex = buf.indexOf(PLACEHOLDER_PREFIX, nextIndex);\r
-                       }\r
-                       else {\r
-                               startIndex = -1;\r
-                       }\r
-               }\r
-\r
-               return buf.toString();\r
-       }\r
-\r
-}\r
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar b/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/jars/test.jar
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF b/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/others/subdir/org.argeo.osgi.boot.test.bundle3/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index f23da44..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle3
-Bundle-Version: 0.1.0
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF b/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/excluded/org.argeo.osgi.boot.test.bundle0/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 9344d07..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle0
-Bundle-Version: 0.1.0
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF b/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle1/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 0fb66dc..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle1
-Bundle-Version: 0.1.0
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF b/osgi/runtime/org.argeo.osgi.boot/src/test/bundles/some/org.argeo.osgi.boot.test.bundle2/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 97ecd31..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.argeo.osgi.boot.test.bundle2
-Bundle-Version: 0.1.0
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
deleted file mode 100644 (file)
index dbc80c1..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import java.io.File;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.argeo.osgi.boot.OsgiBoot;
-
-/** Tests which do not require a runtime. */
-public class OsgiBootNoRuntimeTest extends TestCase {
-       public final static String BUNDLES = "src/test/bundles/some;in=*;ex=excluded,"
-                       + "src/test/bundles/others;in=**/org.argeo.*";
-
-       /** Tests that location lists are properly parsed. */
-       public void testLocations() {
-               String baseUrl = "file:";
-               String locations = "/mydir/myfile" + File.pathSeparator
-                               + "/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));
-               assertEquals("file:/myotherdir/myotherfile", urls.get(1));
-       }
-
-       /** Tests that bundle lists are properly parsed. */
-       public void testBundles() {
-               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));
-               assertEquals(3, urls.size());
-
-               List jarUrls = osgiBoot.getBundlesUrls(baseUrl,
-                               "src/test/bundles/jars;in=*.jar");
-               for (int i = 0; i < jarUrls.size(); i++)
-                       System.out.println(jarUrls.get(i));
-               assertEquals(1, jarUrls.size());
-       }
-}
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
deleted file mode 100644 (file)
index fd32f1a..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/** Starts an Equinox runtime and provision it with OSGi boot. */
-public class OsgiBootRuntimeTest extends TestCase {
-       protected OsgiBoot osgiBoot = null;
-       private boolean osgiRuntimeAlreadyRunning = false;
-
-       public void testInstallAndStart() throws Exception {
-               if (osgiRuntimeAlreadyRunning) {
-                       System.out
-                                       .println("OSGi runtime already running, skipping test...");
-                       return;
-               }
-               osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
-                               OsgiBootNoRuntimeTest.BUNDLES));
-               Map map = new TreeMap(osgiBoot.getBundlesBySymbolicName());
-               for (Iterator keys = map.keySet().iterator(); keys.hasNext();) {
-                       Object key = keys.next();
-                       Bundle bundle = (Bundle) map.get(key);
-                       System.out.println(key + " : " + bundle.getLocation());
-               }
-               assertEquals(4, map.size());
-               Iterator keys = map.keySet().iterator();
-               assertEquals("org.argeo.osgi.boot.test.bundle1", keys.next());
-               assertEquals("org.argeo.osgi.boot.test.bundle2", keys.next());
-               assertEquals("org.argeo.osgi.boot.test.bundle3", keys.next());
-               assertEquals("org.eclipse.osgi", keys.next());
-
-               osgiBoot.startBundles("org.argeo.osgi.boot.test.bundle2");
-               long begin = System.currentTimeMillis();
-               while (System.currentTimeMillis() - begin < 10000) {
-                       Map mapBundles = osgiBoot.getBundlesBySymbolicName();
-                       Bundle bundle = (Bundle) mapBundles
-                                       .get("org.argeo.osgi.boot.test.bundle2");
-                       if (bundle.getState() == Bundle.ACTIVE) {
-                               System.out.println("Bundle " + bundle + " started.");
-                               return;
-                       }
-               }
-               fail("Bundle not started after timeout limit.");
-       }
-
-       protected BundleContext startRuntime() throws Exception {
-               String[] args = { "-console", "-clean" };
-               BundleContext bundleContext = EclipseStarter.startup(args, null);
-               return bundleContext;
-       }
-
-       protected void stopRuntime() throws Exception {
-               EclipseStarter.shutdown();
-       }
-
-       public void setUp() throws Exception {
-               osgiRuntimeAlreadyRunning = EclipseStarter.isRunning();
-               if (osgiRuntimeAlreadyRunning)
-                       return;
-               BundleContext bundleContext = startRuntime();
-               osgiBoot = new OsgiBoot(bundleContext);
-       }
-
-       public void tearDown() throws Exception {
-               if (osgiRuntimeAlreadyRunning)
-                       return;
-               osgiBoot = null;
-               stopRuntime();
-       }
-
-}