Author: reto
Date: Mon Feb 11 20:26:47 2013
New Revision: 1444949
URL: http://svn.apache.org/r1444949
Log:
CLEREZZA-729: updated felix budles to the latest version. Updated OSGi bundles.
Also updated some stanbol snapshot dependencies to the now released version
Modified:
incubator/clerezza/trunk/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml
incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala
incubator/clerezza/trunk/osgi.services/src/main/scala/org/apache/clerezza/osgi/services/ActivationHelper.scala
incubator/clerezza/trunk/parent/pom.xml
incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/platform.logging/initializer/src/main/scala/org/apache/clerezza/platform/logging/initializer/Activator.scala
incubator/clerezza/trunk/platform.mail/pom.xml
incubator/clerezza/trunk/platform.typerendering.gui/src/main/scala/Activator.scala
incubator/clerezza/trunk/rdf.storage.web/src/main/scala/WebProxy.scala
incubator/clerezza/trunk/sshshell/pom.xml
Modified:
incubator/clerezza/trunk/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
(original)
+++
incubator/clerezza/trunk/bundledevtool/src/main/scala/org/apache/clerezza/bundledevtool/BundleRoot.scala
Mon Feb 11 20:26:47 2013
@@ -164,7 +164,7 @@ class BundleRoot {
var bundle: Bundle = existingBundle
if (fileFastUpdate) {
val pathNode = new PermissionGrantingPathNode(new
FilePathNode(new File(dir,"src/main/resources/CLEREZZA-INF/web-resources/")))
- val registration =
bundleContext.registerService(Array(classOf[PathNode].getName), pathNode, null:
java.util.Dictionary[_, _])
+ val registration =
bundleContext.registerService(Array(classOf[PathNode].getName), pathNode, null:
java.util.Dictionary[String, _])
//println("registered "+classOf[PathNode].getName+":
"+registration)
}
Modified: incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml (original)
+++ incubator/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml Mon Feb 11
20:26:47 2013
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
Modified:
incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala
(original)
+++
incubator/clerezza/trunk/jaxrs.stanbol.fragments/src/main/scala/org/apache/clerezza/jaxrs/stanbol/webfragements/WebFragmentRunner.scala
Mon Feb 11 20:26:47 2013
@@ -37,6 +37,7 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.ScriptResource
import org.apache.stanbol.commons.web.base.WebFragment
import org.osgi.framework.BundleContext
+import org.osgi.framework.ServiceReference
import org.osgi.service.component.ComponentContext
import org.slf4j.scala.Logging
@@ -256,16 +257,16 @@ class WebFragmentRunner extends javax.se
if (result != null) {
result
} else {
- val serviceReference = bundleContext.getServiceReference(name)
+ val serviceReference = bundleContext.getServiceReference(name)
//: ServiceReference[Object]
if (serviceReference != null) {
- bundleContext.getService(serviceReference)
+
bundleContext.getService(serviceReference).asInstanceOf[Object]
} else null
}
}
def getInitParameterNames() :java.util.Enumeration[_] =
{ wrapped.getInitParameterNames()}
def getInitParameter(name: String) :String = {
wrapped.getInitParameter(name)}
def getServerInfo() :String = { wrapped.getServerInfo()}
- def getRealPath(name: String) :String = {
wrapped.getRealPath(name)}
+ def getRealPath(name: String) :String = {
wrapped.getRealPath(name)}
def log(message: String, exception: Throwable) :Unit =
{ wrapped.log(message,exception)}
def log(exception: Exception, message: String) :Unit =
{ wrapped.log(exception, message)}
def log(message: String) :Unit = { wrapped.log(message)}
Modified:
incubator/clerezza/trunk/osgi.services/src/main/scala/org/apache/clerezza/osgi/services/ActivationHelper.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/osgi.services/src/main/scala/org/apache/clerezza/osgi/services/ActivationHelper.scala?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/osgi.services/src/main/scala/org/apache/clerezza/osgi/services/ActivationHelper.scala
(original)
+++
incubator/clerezza/trunk/osgi.services/src/main/scala/org/apache/clerezza/osgi/services/ActivationHelper.scala
Mon Feb 11 20:26:47 2013
@@ -109,5 +109,5 @@ trait ActivationHelper extends BundleAct
private var managedServices: List[(() => Any, Seq[String], Map[String,
Any])] = Nil
- private var registeredServices: List[ServiceRegistration] = null
+ private var registeredServices: List[ServiceRegistration[_]] = null
}
\ No newline at end of file
Modified: incubator/clerezza/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/pom.xml (original)
+++ incubator/clerezza/trunk/parent/pom.xml Mon Feb 11 20:26:47 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>12</version>
+ <version>13</version>
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
@@ -398,7 +398,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -438,7 +438,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml
(original)
+++ incubator/clerezza/trunk/platform.dashboard/platform.dashboard.core/pom.xml
Mon Feb 11 20:26:47 2013
@@ -78,8 +78,8 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.commons.security.core</artifactId>
+ <version>0.11.0</version>
</dependency>
</dependencies>
<build>
Modified:
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
(original)
+++
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
Mon Feb 11 20:26:47 2013
@@ -105,7 +105,7 @@
<useRepositoryLayout>true</useRepositoryLayout>
<excludeTransitive>true</excludeTransitive>
<includeScope>runtime</includeScope>
-
<excludeArtifactIds>rdf.core,slf4j-api,platform.security,platform.security.conditions,shell</excludeArtifactIds>
+
<excludeArtifactIds>rdf.core,slf4j-api,platform.security,platform.security.conditions,shell,org.apache.stanbol.commons.frameworkfragment</excludeArtifactIds>
</configuration>
</execution>
<execution>
@@ -137,12 +137,13 @@
<goals>
<goal>copy-dependencies</goal>
</goals>
- <!-- it seems that
security.condition has to be in startlevel 1 to work -->
+ <!-- After the security
fragment is loaded other fragments
+ are no longer accepted, so having them here -->
<id>copy-extension-bundles</id>
<configuration>
<useRepositoryLayout>true</useRepositoryLayout>
<outputDirectory>${basedir}/target/bundles/startlevel-1</outputDirectory>
-
<includeArtifactIds>platform.security.conditions</includeArtifactIds>
+
<includeArtifactIds>platform.security.conditions,org.apache.stanbol.commons.frameworkfragment</includeArtifactIds>
</configuration>
</execution>
<execution>
@@ -252,7 +253,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<scope>provided</scope>
- <version>3.2.0</version>
+ <version>4.2.0</version>
</dependency>
<!-- framework bundles -->
@@ -265,8 +266,24 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
- <version>3.1.8</version>
+ <version>4.0.0</version>
</dependency>
+ <!-- needed by webconsole -->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211_1</version>
+ </dependency>
<!-- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
@@ -348,31 +365,31 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<scope>provided</scope>
- <version>1.6.4</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<scope>provided</scope>
- <version>1.2.10</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<scope>provided</scope>
- <version>1.6.0</version>
+ <version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<scope>provided</scope>
- <version>1.2.8</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
<scope>provided</scope>
- <version>1.0.4</version>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -384,7 +401,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework.security</artifactId>
<scope>provided</scope>
- <version>1.4.2</version>
+ <version>2.0.1</version>
</dependency>
<!-- support for parameterhandling, etc -->
<dependency>
Modified:
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
(original)
+++
incubator/clerezza/trunk/platform.launcher.storageless.parent/platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/ClerezzaApp.java
Mon Feb 11 20:26:47 2013
@@ -382,6 +382,7 @@ public class ClerezzaApp {
private Properties getConfigProps(LauncherArguments arguments) {
Properties configProps = new Properties();
+
configProps.putAll(System.getProperties());
//ignored as we're setting the starlevel manually to last used
start-level + 20
//configProps.put("org.osgi.framework.startlevel.beginning",
"20");
@@ -391,7 +392,7 @@ public class ClerezzaApp {
"true");
}
}
-
+
{
String argLogLevel = arguments.getLogLevel();
if (argLogLevel == null) {
@@ -408,15 +409,16 @@ public class ClerezzaApp {
}
configProps.put("org.ops4j.pax.url.mvn.repositories",
getCommaSeparatedListOfMavenRepos());
}
+
{
+ //sun.reflect added because of
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6265952 and loading of scala
scripts
String extraPackages = (String)
configProps.get("org.osgi.framework.system.packages.extra");
if (extraPackages == null) {
- extraPackages = "";
- }
- //sun.reflect added because of
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6265952 and loading of scala
scripts
-
configProps.put("org.osgi.framework.system.packages.extra",
- "sun.misc;sun.reflect;"
- + extraPackages);
+ extraPackages = "sun.misc;sun.reflect";
+ } else {
+ extraPackages = "sun.misc;sun.reflect;"+extraPackages;
+ }
+
configProps.put("org.osgi.framework.system.packages.extra",extraPackages);
}
//public static final String CONTEXT_PROPERTY_HTTP_PORT_SECURE
= "";
Modified: incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml
(original)
+++ incubator/clerezza/trunk/platform.launcher.storageless.parent/pom.xml Mon
Feb 11 20:26:47 2013
@@ -36,6 +36,12 @@
<module>platform.launcher.storageless</module>
</modules>
<dependencies>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
+ <version>0.11.0</version>
+ <scope>provided</scope>
+ </dependency>
<!--
Clerezza Dependencies
@@ -413,27 +419,27 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.resources</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.commons.security.core</artifactId>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.authentication.basic</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.usermanagement</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+
<artifactId>org.apache.stanbol.commons.security.usermanagement</artifactId>
+ <version>0.11.0</version>
</dependency>
<dependency> <!-- LD Path -->
<groupId>at.newmedialab.ldpath</groupId>
@@ -448,27 +454,27 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.viewable</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0</version>
</dependency>
<dependency> <!-- used also for all the other JSON parsing/writing in
Stanbol -->
<groupId>org.codehaus.jettison</groupId>
Modified:
incubator/clerezza/trunk/platform.logging/initializer/src/main/scala/org/apache/clerezza/platform/logging/initializer/Activator.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.logging/initializer/src/main/scala/org/apache/clerezza/platform/logging/initializer/Activator.scala?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/platform.logging/initializer/src/main/scala/org/apache/clerezza/platform/logging/initializer/Activator.scala
(original)
+++
incubator/clerezza/trunk/platform.logging/initializer/src/main/scala/org/apache/clerezza/platform/logging/initializer/Activator.scala
Mon Feb 11 20:26:47 2013
@@ -45,7 +45,7 @@ class Activator extends BundleActivator
case _ => throw new
RuntimeException("org.ops4j.pax.logging.pax-logging-service not found")
}
val serviceReference =
context.getServiceReference(configurationAdminClassName);
- def configureIfUnconfigured(serviceReference: ServiceReference)
{
+ def configureIfUnconfigured(serviceReference:
ServiceReference[_]) {
val configurationAdmin =
context.getService(serviceReference).asInstanceOf[ConfigurationAdmin]
val config: Configuration =
configurationAdmin.getConfiguration(
"org.ops4j.pax.logging", paxLoggingLocation);
Modified: incubator/clerezza/trunk/platform.mail/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.mail/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/platform.mail/pom.xml (original)
+++ incubator/clerezza/trunk/platform.mail/pom.xml Mon Feb 11 20:26:47 2013
@@ -61,8 +61,8 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.commons.security.core</artifactId>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified:
incubator/clerezza/trunk/platform.typerendering.gui/src/main/scala/Activator.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/platform.typerendering.gui/src/main/scala/Activator.scala?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
---
incubator/clerezza/trunk/platform.typerendering.gui/src/main/scala/Activator.scala
(original)
+++
incubator/clerezza/trunk/platform.typerendering.gui/src/main/scala/Activator.scala
Mon Feb 11 20:26:47 2013
@@ -41,8 +41,9 @@ import java.security.{AccessControlExcep
*/
class Activator extends BundleActivator {
- private var renderletsOverview: ServiceRegistration = null
- private var renderletRegistration, menuProviderRegistration:
ServiceRegistration = null
+ private var renderletsOverview: ServiceRegistration[Object] = null
+ private var renderletRegistration: ServiceRegistration[TypeRenderlet] =
null
+ private var menuProviderRegistration:
ServiceRegistration[GlobalMenuItemsProvider] = null
private var bundleContext: BundleContext = null
@@ -102,13 +103,13 @@ class Activator extends BundleActivator
def start(context: BundleContext) {
this.bundleContext = context
val args = scala.collection.mutable.Map("javax.ws.rs" -> true)
- renderletsOverview =
context.registerService(classOf[Object].getName,
+ renderletsOverview = context.registerService(classOf[Object],
RenderletsOverview, args)
val renderlet = new RenderletDescriptionRenderlet
val serviceReference =
context.getServiceReference(classOf[RenderletManager].getName)
- renderletRegistration =
context.registerService(classOf[TypeRenderlet].getName,
+ renderletRegistration =
context.registerService(classOf[TypeRenderlet],
renderlet, null)
- menuProviderRegistration =
context.registerService(classOf[GlobalMenuItemsProvider].getName,
+ menuProviderRegistration =
context.registerService(classOf[GlobalMenuItemsProvider],
MenuProvider, null)
}
Modified: incubator/clerezza/trunk/rdf.storage.web/src/main/scala/WebProxy.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/rdf.storage.web/src/main/scala/WebProxy.scala?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/rdf.storage.web/src/main/scala/WebProxy.scala
(original)
+++ incubator/clerezza/trunk/rdf.storage.web/src/main/scala/WebProxy.scala Mon
Feb 11 20:26:47 2013
@@ -169,6 +169,10 @@ class WebProxy extends WeightedTcProvide
logger.debug("not dereferencing URI with hash sign.
Please see CLEREZZA-533 for debate.")
throw new NoSuchEntityException(name)
}
+ if (name.getUnicodeString.startsWith("urn")) {
+ //these are not dereferenceable
+ throw new NoSuchEntityException(name)
+ }
val cacheGraphName = new UriRef("urn:x-localinstance:/cache/" +
name.getUnicodeString)
//todo: follow redirects and keep track of them
//todo: keep track of headers especially date and etag. test
for etag similarity
Modified: incubator/clerezza/trunk/sshshell/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/sshshell/pom.xml?rev=1444949&r1=1444948&r2=1444949&view=diff
==============================================================================
--- incubator/clerezza/trunk/sshshell/pom.xml (original)
+++ incubator/clerezza/trunk/sshshell/pom.xml Mon Feb 11 20:26:47 2013
@@ -61,8 +61,8 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.commons.security.core</artifactId>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
