You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2013/12/31 10:35:04 UTC
[1/4] git commit: replaced deprecated annotation
Updated Branches:
refs/heads/master 0627f04a6 -> 12f839d90
replaced deprecated annotation
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/bb353f21
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/bb353f21
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/bb353f21
Branch: refs/heads/master
Commit: bb353f21280ff5e376a960f3da4802d99d869736
Parents: 3a9b5fa
Author: retobg <re...@apache.org>
Authored: Wed Dec 18 14:48:49 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Wed Dec 18 14:48:49 2013 +0100
----------------------------------------------------------------------
.../org/apache/clerezza/rdf/web/core/GraphManagement.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/bb353f21/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
----------------------------------------------------------------------
diff --git a/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java b/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
index 3e70c2c..9ded021 100644
--- a/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
+++ b/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
@@ -43,7 +43,6 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.access.security.TcPermission;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
@@ -51,7 +50,6 @@ import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.TCPROVIDER;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.web.ontologies.GRAPHMANAGEMENT;
-import org.apache.felix.scr.annotations.Services;
import org.osgi.service.component.ComponentContext;
/**
@@ -62,10 +60,7 @@ import org.osgi.service.component.ComponentContext;
* @author reto
*/
@Component
-@Services({
- @Service(value = Object.class),
- @Service(value = GlobalMenuItemsProvider.class)
-})
+@Service({Object.class, GlobalMenuItemsProvider.class})
@Property(name="javax.ws.rs", boolValue=true)
@Path("/admin/graphs")
public class GraphManagement implements GlobalMenuItemsProvider {
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/clerezza
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/e8ebca14
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/e8ebca14
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/e8ebca14
Branch: refs/heads/master
Commit: e8ebca14f87e2d92b3b50b1a0b991a118c8fb8a8
Parents: bb353f2 0627f04
Author: retobg <re...@apache.org>
Authored: Sun Dec 29 17:49:55 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Sun Dec 29 17:49:55 2013 +0100
----------------------------------------------------------------------
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[4/4] git commit: CLEREZZA-857: no longer unwrapping
CompilerErrorsException
Posted by re...@apache.org.
CLEREZZA-857: no longer unwrapping CompilerErrorsException
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/12f839d9
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/12f839d9
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/12f839d9
Branch: refs/heads/master
Commit: 12f839d90e5d88d958668b25e2fd98ee0781c667
Parents: 9f18b03
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 10:34:42 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 10:34:42 2013 +0100
----------------------------------------------------------------------
.../typerendering/scalaserverpages/ScalaServerPagesRenderlet.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/12f839d9/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 5e08af0..481993c 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
@@ -177,9 +177,6 @@ public class ScalaServerPagesRenderlet implements Renderlet {
if (cause instanceof RuntimeException) {
throw (RuntimeException) cause;
}
- if (cause instanceof CompileErrorsException) {
- throw (CompileErrorsException) cause;
- }
throw new RuntimeException(e);
}
try {
[3/4] git commit: CLEREZZA-857: code cleaning
Posted by re...@apache.org.
CLEREZZA-857: code cleaning
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/9f18b034
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/9f18b034
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/9f18b034
Branch: refs/heads/master
Commit: 9f18b034dc06b17bb6538412c2585feaf6a65fcd
Parents: e8ebca1
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 10:34:07 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 10:34:07 2013 +0100
----------------------------------------------------------------------
.../clerezza/scala/scripting/CompilerService.scala | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9f18b034/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/CompilerService.scala
----------------------------------------------------------------------
diff --git a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/CompilerService.scala b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/CompilerService.scala
index 56205b1..982204f 100644
--- a/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/CompilerService.scala
+++ b/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/CompilerService.scala
@@ -21,12 +21,8 @@ package org.apache.clerezza.scala.scripting;
import java.security.AccessController
import java.security.Permission
-import java.security.PrivilegedAction
import java.security.PrivilegedActionException
import java.security.PrivilegedExceptionAction
-import org.apache.clerezza.scala.scripting.util.FileWrapper
-import org.apache.clerezza.scala.scripting.util.GenericFileWrapperTrait
-import org.apache.clerezza.scala.scripting.util.VirtualDirectoryWrapper
import org.osgi.framework.BundleContext
import org.osgi.framework.BundleEvent
import org.osgi.framework.BundleListener
@@ -35,19 +31,16 @@ import scala.tools.nsc._;
import scala.tools.nsc.interpreter._;
import scala.tools.nsc.io.AbstractFile
import scala.tools.nsc.io.VirtualDirectory
-import scala.tools.nsc.reporters.ConsoleReporter
import scala.tools.nsc.util._
import java.io.ByteArrayOutputStream
-import java.io.File
import java.io.IOException
import java.io.OutputStream
import java.io.PrintWriter
-import java.io.Reader
import java.net._
class CompileErrorsException(message: String, cause: Exception) extends Exception(message, cause) {
- def this(cause: Exception) = this(null, cause)
- def this() = this(null)
+ def this(cause: Exception) = this("Compilation failed", cause)
+ def this() = this("Compile failed", null)
}
class CompilePermission extends Permission("Compile Permssion") {
@@ -120,8 +113,9 @@ class CompilerService() extends BundleListener {
sharedCompiler.compile(sources)
} catch {
case c: CompileErrorsException => {
+ val compilerOutput = new String(baos.toByteArray, "utf-8")
throw new CompileErrorsException(
- new String(baos.toByteArray, "utf-8"), c)
+ compilerOutput, c)
}
case e: Exception => throw e
} finally {