Author: reto
Date: Wed Oct 6 06:55:45 2010
New Revision: 1004903
URL: http://svn.apache.org/viewvc?rev=1004903&view=rev
Log:
CLEREZZA-315: updated felix version, adapted because of nulls returned by
Bundle.getResource
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleFS.scala
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml?rev=1004903&r1=1004902&r2=1004903&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
Wed Oct 6 06:55:45 2010
@@ -213,7 +213,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<scope>provided</scope>
- <version>2.0.4</version>
+ <version>3.0.3</version>
</dependency>
<!-- framework bundles -->
@@ -226,7 +226,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
- <version>3.0.0</version>
+ <version>3.1.2</version>
</dependency>
<!-- <dependency>
<groupId>org.ops4j.pax.web</groupId>
@@ -292,32 +292,32 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<scope>provided</scope>
- <version>6.1.9</version>
+ <version>6.1.14</version>
</dependency>
<!-- Apache Felix framework bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<scope>provided</scope>
- <version>1.6.0</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<scope>provided</scope>
- <version>1.2.2</version>
+ <version>1.2.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<scope>provided</scope>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<scope>provided</scope>
- <version>1.2.4</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -341,7 +341,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework.security</artifactId>
<scope>provided</scope>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</dependency>
<!-- support for parameterhandling, etc -->
<dependency>
@@ -354,7 +354,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3</version>
</dependency>
</dependencies>
</project>
Modified:
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleFS.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleFS.scala?rev=1004903&r1=1004902&r2=1004903&view=diff
==============================================================================
---
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleFS.scala
(original)
+++
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleFS.scala
Wed Oct 6 06:55:45 2010
@@ -117,6 +117,13 @@ package org.apache.clerezza.scala.script
// a trailing slash
if (entryUrl == null)
entryUrl =
bundle.getResource("/" + removeTralingSlash(entry))
+
+ if (entryUrl == null) {
+ entryUrl = new
URL(bundle.getResource("/"), entry)
+ if (entryUrl ==
null) {
+ throw
new RuntimeException("Could not locate entry: "+entry+" in bundle: "+bundle)
+ }
+ }
if
(entry.endsWith(".class"))
new
FileEntry(entryUrl, DirEntry.this)
