Do some clean up in SLC

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.osgi / src / main / java / org / argeo / slc / osgi / OsgiExecutionResources.java

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionResources.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionResources.java
index 5582d9ca02f3df556f26e953e43ba4ed663352da..b4658bdffd7fd4bf0711c5135726592ba0937d20 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionResources.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionResources.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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.slc.osgi;
 
 import java.io.File;
@@ -46,13 +62,18 @@ public class OsgiExecutionResources extends FileExecutionResources implements
                        // TODO: Equinox specific?
                        String relPath = location.substring("initial@reference:file:"
                                        .length());
-                       if (relPath.startsWith("../"))// relative to the framework jar
-                               relPath = relPath.substring("../".length());
-                       String framework = System.getProperty("osgi.framework").substring(
-                                       "file:".length());
-                       int sepIndex = framework.lastIndexOf(File.separatorChar);
-                       framework = framework.substring(0, sepIndex);
-                       base = framework + '/' + relPath;
+//                     if (relPath.startsWith("../"))// relative to the framework jar
+//                             relPath = relPath.substring("../".length());
+//                     String framework = System.getProperty("osgi.framework").substring(
+//                                     "file:".length());
+//                     log.debug(framework);
+                       String installArea = System.getProperty("osgi.install.area")
+                                       .substring("file:".length());
+//                     log.debug(installArea);
+                       base = installArea + '/' + relPath;
+                       // int sepIndex = framework.lastIndexOf(File.separatorChar);
+                       // framework = framework.substring(0, sepIndex);
+                       // base = framework + '/' + relPath;
                } else {
                        return null;
                }
@@ -64,6 +85,12 @@ public class OsgiExecutionResources extends FileExecutionResources implements
                        throw new SlcException("Cannot determine canonical path for "
                                        + path, e);
                }
+
+               if (!file.exists())
+                       throw new SlcException(file
+                                       + " was retrieved in bundle located at '" + location
+                                       + "' for resource " + resource + " but it does not exist");
+
                if (log.isTraceEnabled())
                        log.debug("OSGi local resource: " + file + " from " + resource);
                return file;