clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [67/87] [abbrv] clerezza git commit: CLEREZZA-960: ported the odules used by linked-data-launcher
Date Tue, 14 Apr 2015 13:13:42 GMT
CLEREZZA-960: ported the odules used by linked-data-launcher

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f221ae68
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f221ae68
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f221ae68

Branch: refs/heads/master
Commit: f221ae688268b2bca529eb747a198235cc461e39
Parents: d0f43e9
Author: Reto Gmuer <reto@apache.org>
Authored: Sun Mar 29 20:23:19 2015 +0000
Committer: Reto Gmuer <reto@apache.org>
Committed: Sun Mar 29 20:23:19 2015 +0000

----------------------------------------------------------------------
 .../content/ContentGraphProvider.java           |  9 ++++--
 platform/logging/core/pom.xml                   | 32 +++++++++++---------
 .../platform/logging/LoggingManager.java        | 12 ++++----
 platform/logging/initializer/pom.xml            |  5 +--
 platform/logging/ontologies/pom.xml             | 13 ++++----
 platform/logging/pom.xml                        |  6 ++--
 platform/typehandlerspace.jaxrs2/pom.xml        |  8 +++++
 .../ScalaServerPagesRenderlet.java              |  6 +++-
 .../scalaserverpages/implicit-header.txt        |  1 +
 .../typerendering/GenericGraphNodeMBW.java      |  5 ++-
 .../typerendering/exception-template.ssp        |  2 +-
 provisioning/typerendering/pom.xml              |  2 +-
 .../clerezza/rdf/web/core/graph-management.ssp  |  6 ++--
 scala-scripting/pom.xml                         |  8 ++---
 .../BundleContextScalaInterpreter.scala         |  4 ++-
 .../scala/scripting/ScriptEngineFactory.scala   |  2 +-
 .../util/GenericFileWrapperTrait.scala          |  3 --
 .../scripting/util/SplittingDirectory.scala     |  3 --
 .../util/VirtualDirectoryWrapper.scala          |  6 ++--
 scala-scripting/tests/pom.xml                   | 26 ++++++++++++----
 20 files changed, 96 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
index 8d6ace8..80d5862 100644
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
+++ b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
@@ -31,6 +31,8 @@ import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.rdf.utils.UnionGraph;
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 
 /**
@@ -58,11 +60,12 @@ public class ContentGraphProvider {
      *               additional Graphs that are added to the content
      *               graph for reading"
      */
+    @Property(name = "additions", description = "Contains "
+     +               "additional Graphs that are added to the content "
+     +               "graph for reading", value = {"",""})
     public static final String CONTENT_ADDITIONS = "additions";
 
-    /**
-     * @scr.reference
-     */
+    @Reference
     private TcManager tcManager;
 
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/logging/core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/logging/core/pom.xml b/platform/logging/core/pom.xml
index 68bcf42..2e059bd 100644
--- a/platform/logging/core/pom.xml
+++ b/platform/logging/core/pom.xml
@@ -23,8 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.clerezza</groupId>
-        <artifactId>platform.logging.parent</artifactId>
-        <version>0.2</version>
+        <artifactId>clerezza</artifactId>
+        <version>7-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <groupId>org.apache.clerezza</groupId>
     <artifactId>platform.logging.core</artifactId>
@@ -34,12 +35,19 @@
     <description>
         Configure logging for the Clerezza Platform Core
     </description>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform.logging.ontologies</artifactId>
-            <version>0.2</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
@@ -49,32 +57,32 @@
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>rdf.core</artifactId>
-            <version>0.14</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform</artifactId>
-            <version>0.2</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform.globalmenu.api</artifactId>
-            <version>0.3</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform.graphprovider.content</artifactId>
-            <version>0.7</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform.typerendering.core</artifactId>
-            <version>0.3</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform.typerendering.scalaserverpages</artifactId>
-            <version>0.4</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
@@ -82,10 +90,6 @@
             <version>0.10</version>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
----------------------------------------------------------------------
diff --git a/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
b/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
index ec342d3..95158fd 100644
--- a/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
+++ b/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
@@ -44,9 +44,9 @@ import org.apache.clerezza.platform.globalmenu.GlobalMenuItemsProvider;
 import org.apache.clerezza.platform.logging.ontologies.LOGGING;
 import org.apache.clerezza.platform.typerendering.RenderletManager;
 import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.Iri;
+import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
 import org.apache.clerezza.rdf.ontologies.PLATFORM;
 import org.apache.clerezza.rdf.ontologies.RDF;
 import org.apache.clerezza.rdf.utils.GraphNode;
@@ -78,7 +78,7 @@ public class LoggingManager implements GlobalMenuItemsProvider {
     public void activate(ComponentContext context)
             throws URISyntaxException, IOException {
         renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                new UriRef(getClass().getResource(
+                new Iri(getClass().getResource(
                 "config-page-naked.ssp").toURI().toString()),
                 LOGGING.LoggingConfigPage, "naked",
                 MediaType.APPLICATION_XHTML_XML_TYPE, true);
@@ -112,8 +112,8 @@ public class LoggingManager implements GlobalMenuItemsProvider {
             throws IOException {
         AccessController.checkPermission(new LoggingManagerAccessPermission());
         TrailingSlash.enforcePresent(uriInfo);
-        SimpleMGraph resultMGraph = new SimpleMGraph();
-        GraphNode result = new GraphNode(new BNode(), resultMGraph);
+        SimpleGraph resultGraph = new SimpleGraph();
+        GraphNode result = new GraphNode(new BlankNode(), resultGraph);
         result.addPropertyValue(LOGGING.loggingConfig, getPropertiesAsString());
         result.addProperty(RDF.type, PLATFORM.HeadedPage);
         result.addProperty(RDF.type, LOGGING.LoggingConfigPage);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/logging/initializer/pom.xml
----------------------------------------------------------------------
diff --git a/platform/logging/initializer/pom.xml b/platform/logging/initializer/pom.xml
index 99e8299..92a798d 100644
--- a/platform/logging/initializer/pom.xml
+++ b/platform/logging/initializer/pom.xml
@@ -21,8 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.clerezza</groupId>
-        <artifactId>platform.logging.parent</artifactId>
-        <version>0.2</version>
+        <artifactId>clerezza</artifactId>
+        <version>7-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <groupId>org.apache.clerezza</groupId>
     <artifactId>platform.logging.initializer</artifactId>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/logging/ontologies/pom.xml
----------------------------------------------------------------------
diff --git a/platform/logging/ontologies/pom.xml b/platform/logging/ontologies/pom.xml
index cfb8f09..2815e28 100644
--- a/platform/logging/ontologies/pom.xml
+++ b/platform/logging/ontologies/pom.xml
@@ -18,13 +18,14 @@
  specific language governing permissions and limitations
  under the License.
 
--->
+    -->
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.clerezza</groupId>
-        <artifactId>platform.logging.parent</artifactId>
-        <version>0.2</version>
+        <artifactId>clerezza</artifactId>
+        <version>7-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <groupId>org.apache.clerezza</groupId>
     <artifactId>platform.logging.ontologies</artifactId>
@@ -38,7 +39,7 @@
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>rdf.core</artifactId>
-            <version>0.14</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -60,8 +61,8 @@
                         </goals>
                     </execution>
                 </executions>
-                <version>0.4</version>
-        </plugin>
+                <version>1.0.0-SNAPSHOT</version>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/logging/pom.xml
----------------------------------------------------------------------
diff --git a/platform/logging/pom.xml b/platform/logging/pom.xml
index 11ac529..e21b6d2 100644
--- a/platform/logging/pom.xml
+++ b/platform/logging/pom.xml
@@ -24,8 +24,8 @@
     <parent>
         <groupId>org.apache.clerezza</groupId>
         <artifactId>clerezza</artifactId>
-        <version>0.5</version>
-        <relativePath>../parent</relativePath>
+        <version>7-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <groupId>org.apache.clerezza</groupId>
     <artifactId>platform.logging.parent</artifactId>
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.apache.clerezza.platform.logging</groupId>
                 <artifactId>ontologies</artifactId>
-                <version>0.1-SNAPSHOT</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/typehandlerspace.jaxrs2/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace.jaxrs2/pom.xml b/platform/typehandlerspace.jaxrs2/pom.xml
index b82c6de..67e5f81 100644
--- a/platform/typehandlerspace.jaxrs2/pom.xml
+++ b/platform/typehandlerspace.jaxrs2/pom.xml
@@ -32,6 +32,14 @@
     <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Clerezza - Platform Type Handler Space Jaxrs 2.0 Based Implementation</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>javax.ws.rs</groupId>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
index 481993c..0e1e3c8 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
@@ -121,7 +121,8 @@ public class ScalaServerPagesRenderlet implements Renderlet {
         } catch (MalformedURLException ex) {
             throw new WebApplicationException(ex);
         } catch (CompileErrorsException ex) {
-            logger.debug("ScriptException rendering ScalaServerPage: ", ex);
+            //logger.debug("ScriptException rendering ScalaServerPage: ", ex);
+            logger.error("Error compiling "+renderingSpecification+": "+ex.getMessage());
             Exception cause = (Exception) ex.getCause();
             if (cause != null) {
                 if (cause instanceof TypeRenderingException) {
@@ -177,6 +178,9 @@ public class ScalaServerPagesRenderlet implements Renderlet {
                 if (cause instanceof RuntimeException) {
                     throw (RuntimeException) cause;
                 }
+                if (cause instanceof CompileErrorsException) {
+                    throw (CompileErrorsException) cause;
+                }
                 throw new RuntimeException(e);
             }
             try {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
b/platform/typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
index 070985e..236786c 100644
--- a/platform/typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
+++ b/platform/typerendering.scalaserverpages/src/main/resources/org/apache/clerezza/platform/typerendering/scalaserverpages/implicit-header.txt
@@ -4,6 +4,7 @@ import org.apache.clerezza.rdf.utils._
 import org.apache.clerezza.rdf.scala.utils._
 import org.apache.clerezza.rdf.scala.utils.Preamble._
 import org.apache.clerezza.platform.typerendering.scala._
+import org.apache.commons.rdf._
 import javax.ws.rs.core.UriInfo
 
  class CompiledScalaServerPage extends AbstractRenderlet {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
index 957ff18..391acf8 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
@@ -73,7 +73,7 @@ import org.xml.sax.SAXException;
  * 
  * @author daniel, mir, rbn
  */
-@Component
+@Component(immediate = true)
 @Service(Object.class)
 @Property(name = "javax.ws.rs", boolValue = true)
 @Reference(name = "contextProvider", referenceInterface = UserContextProvider.class,
@@ -187,6 +187,9 @@ public class GenericGraphNodeMBW implements MessageBodyWriter<GraphNode>
{
                 } catch (TransformerException ex) {
                     throw new RuntimeException(ex);
                 }
+            } catch (RuntimeException ex) {
+                logger.error("error rendering GraphNode", ex);
+                throw ex;
             } finally {
                 ResultDocModifier.dispose();
             }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
b/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
index 384ec60..a450e08 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
+++ b/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
@@ -19,7 +19,7 @@
  *
 */
 
-def typerendering(s: Any) = new UriRef("http://clerezza.org/2009/04/typerendering#"+s)
+def typerendering(s: Any) = new Iri("http://clerezza.org/2009/04/typerendering#"+s)
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/provisioning/typerendering/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/typerendering/pom.xml b/provisioning/typerendering/pom.xml
index 48a290d..b362b29 100644
--- a/provisioning/typerendering/pom.xml
+++ b/provisioning/typerendering/pom.xml
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>org.apache.clerezza.scala</groupId>
             <artifactId>script-engine</artifactId>
-            <version>0.3</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         
     </dependencies>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
index 0b71676..85f32ee 100644
--- a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
+++ b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
@@ -19,9 +19,9 @@
  *
 */
 
-def gm(s: Any) = new UriRef("http://clerezza.org/2010/03/graph-management#"+s)
-def rdf(s: Any) = new UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
-def tcp(s: Any) = new UriRef("http://clerezza.org/2009/06/tcprovider#"+s)
+def gm(s: Any) = new Iri("http://clerezza.org/2010/03/graph-management#"+s)
+def rdf(s: Any) = new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
+def tcp(s: Any) = new Iri("http://clerezza.org/2009/06/tcprovider#"+s)
 
 resultDocModifier.setTitle("Manage Triple Collections");
 resultDocModifier.addNodes2Elem("tx-module", <h1>Manage Triple Collections</h1>);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/pom.xml
----------------------------------------------------------------------
diff --git a/scala-scripting/pom.xml b/scala-scripting/pom.xml
index 3109f07..9e10aeb 100644
--- a/scala-scripting/pom.xml
+++ b/scala-scripting/pom.xml
@@ -41,22 +41,22 @@
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-library</artifactId>
-                <version>2.10.3</version>
+                <version>2.11.6</version>
             </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-compiler</artifactId>
-                <version>2.10.3</version>
+                <version>2.11.6</version>
             </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-actors</artifactId>
-                <version>2.10.3</version>
+                <version>2.11.6</version>
             </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-reflect</artifactId>
-                <version>2.10.3</version>
+                <version>2.11.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleContextScalaInterpreter.scala
----------------------------------------------------------------------
diff --git a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleContextScalaInterpreter.scala
b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleContextScalaInterpreter.scala
index 0f174ba..a1590d6 100644
--- a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleContextScalaInterpreter.scala
+++ b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/BundleContextScalaInterpreter.scala
@@ -20,10 +20,12 @@ package org.apache.clerezza.scala.scripting;
 
 import org.osgi.framework.BundleContext
 import scala.tools.nsc._;
-import scala.tools.nsc.interpreter._;
+//import scala.tools.nsc.interpreter._;
 import scala.tools.nsc.util._
 import java.io.PrintWriter
 import java.net._
+import scala.tools.nsc.interpreter.AbstractFileClassLoader
+import scala.tools.nsc.interpreter.IMain
 import scala.tools.nsc.reporters.Reporter
 
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
----------------------------------------------------------------------
diff --git a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
index 5f66c77..496bf8f 100644
--- a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
+++ b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
@@ -163,7 +163,7 @@ class ScriptEngineFactory() extends  JavaxEngineFactory with BundleListener
 {
                 println("visible stuff:")
                 System.out.println("stuff stuff stuff");
                 println("interpreter.valueOfTerm(\"zzScriptResult\"): "+interpreter.valueOfTerm("zzScriptResult"))
-                interpreter.visibleTermNames.foreach(println)
+                interpreter.allDefinedNames.foreach(println)
                 if (interpreter.reporter.hasErrors) {
                   throw new ScriptException("some error","script-file",1)
                 }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/GenericFileWrapperTrait.scala
----------------------------------------------------------------------
diff --git a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/GenericFileWrapperTrait.scala
b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/GenericFileWrapperTrait.scala
index d443eaa..aa228f7 100644
--- a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/GenericFileWrapperTrait.scala
+++ b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/GenericFileWrapperTrait.scala
@@ -75,9 +75,6 @@ trait GenericFileWrapperTrait extends AbstractFile with Wrapper[AbstractFile]
{
     wrapped.sizeOption
   }
 
-  override def lookupPath(path: String, directory: Boolean): AbstractFile = {
-    childWrapper(wrapped.lookupPath(path, directory))
-  }
   override def lookupPathUnchecked(path: String, directory: Boolean): AbstractFile = {
     childWrapper(wrapped.lookupPathUnchecked(path, directory))
   }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/SplittingDirectory.scala
----------------------------------------------------------------------
diff --git a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/SplittingDirectory.scala
b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/SplittingDirectory.scala
index 2d318c0..b99f55d 100644
--- a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/SplittingDirectory.scala
+++ b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/SplittingDirectory.scala
@@ -70,9 +70,6 @@ class SplittingDirectory()
   }
   override val name = "(splitting)"
   
-  override def lookupPath(path: String, directory: Boolean): AbstractFile = {
-    childWrapper(wrapped.lookupPath(path, directory))
-  }
   override def lookupPathUnchecked(path: String, directory: Boolean): AbstractFile = {
     childWrapper(wrapped.lookupPathUnchecked(path, directory))
   }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/VirtualDirectoryWrapper.scala
----------------------------------------------------------------------
diff --git a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/VirtualDirectoryWrapper.scala
b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/VirtualDirectoryWrapper.scala
index b56de63..dedd702 100644
--- a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/VirtualDirectoryWrapper.scala
+++ b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/util/VirtualDirectoryWrapper.scala
@@ -32,7 +32,7 @@ import scala.reflect.io.VirtualDirectory
 class VirtualDirectoryWrapper(val wrapped: AbstractFile,
                 val childWrapper: (AbstractFile) => AbstractFile) extends VirtualDirectory(null,
None)
                                            with GenericFileWrapperTrait {
-  lastModified =wrapped.lastModified
+  override val lastModified =wrapped.lastModified
 
   override def output = {
     wrapped.asInstanceOf[VirtualDirectory].output
@@ -52,9 +52,7 @@ class VirtualDirectoryWrapper(val wrapped: AbstractFile,
   override val name = {
     wrapped.name
   }
-  override def lookupPath(path: String, directory: Boolean): AbstractFile = {
-    childWrapper(wrapped.lookupPath(path, directory))
-  }
+
   override def lookupPathUnchecked(path: String, directory: Boolean): AbstractFile = {
     childWrapper(wrapped.lookupPathUnchecked(path, directory))
   }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f221ae68/scala-scripting/tests/pom.xml
----------------------------------------------------------------------
diff --git a/scala-scripting/tests/pom.xml b/scala-scripting/tests/pom.xml
index df59e35..ba222da 100644
--- a/scala-scripting/tests/pom.xml
+++ b/scala-scripting/tests/pom.xml
@@ -29,6 +29,20 @@
     <packaging>jar</packaging>
     <name>Scala OSGi Services - Tests</name>
     <description>Tests for Scala OSGi Services.</description>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.ops4j.pax.runner</groupId>
+                <artifactId>pax-runner</artifactId>
+                <version>1.8.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.runner</groupId>
+                <artifactId>pax-runner-no-jcl</artifactId>
+                <version>1.8.6</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -42,7 +56,7 @@
             <version>4.8.2</version>
         </dependency>
         
-<!-- pax exam related stuff -->
+        <!-- pax exam related stuff -->
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
@@ -85,13 +99,13 @@
             <groupId>org.apache.clerezza.scala</groupId>
             <artifactId>script-engine</artifactId>
             <scope>provided</scope>
-            <version>0.3</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-          <groupId>org.apache.clerezza.ext</groupId>
-          <artifactId>slf4j-scala-api</artifactId>
-          <version>1.6.3</version>
-          <scope>provided</scope>
+            <groupId>org.apache.clerezza.ext</groupId>
+            <artifactId>slf4j-scala-api</artifactId>
+            <version>1.6.3</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>


Mime
View raw message