Author: reto
Date: Sun Dec 26 16:16:52 2010
New Revision: 1052909
URL: http://svn.apache.org/viewvc?rev=1052909&view=rev
Log:
CLEREZZA-373: writing to shell outputstream instead of system out
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/OsgiDsl.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/OsgiDsl.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/OsgiDsl.scala?rev=1052909&r1=1052908&r2=1052909&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/OsgiDsl.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/OsgiDsl.scala
Sun Dec 26 16:16:52 2010
@@ -18,14 +18,18 @@
*/
package org.apache.clerezza.shell
+import java.io.OutputStream
+import java.io.OutputStreamWriter
+import java.io.PrintWriter
import org.osgi.service.component.ComponentContext
-class OsgiDsl(context: ComponentContext) {
+class OsgiDsl(context: ComponentContext, outputStream: OutputStream) {
+ lazy val out = new PrintWriter(new OutputStreamWriter(outputStream,
"utf-8"), true)
val bundleContext = context.getBundleContext
def ps = {
- for (b <- bundleContext.getBundles) { println(b.getBundleId+" -
"+b.getSymbolicName+" "+b.getLocation)}
+ for (b <- bundleContext.getBundles)
{out.println(b.getBundleId+" - "+b.getSymbolicName+" "+b.getLocation)}
}
def install(uri: String) = {
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala?rev=1052909&r1=1052908&r2=1052909&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
Sun Dec 26 16:16:52 2010
@@ -48,7 +48,7 @@ class ShellFactory() {
val shell = new Shell(interpreterFactory, in, out, commands)
//shell.bind("bundleContext", classOf[BundleContext].getName,
componentContext.getBundleContext)
//shell.bind("componentContext",
classOf[ComponentContext].getName, componentContext)
- shell.bind("osgiDsl", classOf[OsgiDsl].getName, new
OsgiDsl(componentContext))
+ shell.bind("osgiDsl", classOf[OsgiDsl].getName, new
OsgiDsl(componentContext, out))
shell.addImport("org.apache.clerezza.{scala => zzscala, _ }")
shell.addImport("osgiDsl._")
shell
