From c2bb5a4d0467da3f103b2814454f296528ab7c45 Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Thu, 15 May 2014 11:40:42 +0900 Subject: [PATCH 1/2] Replace URLs to point from ngocdaothanh to xitrum-framework --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a96fc2a..39daedc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ JVM processes without any prior setup at the target process. ## Download Download and extract -[scalive-1.2.zip](https://github.com/ngocdaothanh/scalive/releases/download/v1.2/scalive-1.2.zip), +[scalive-1.2.zip](https://github.com/xitrum-framework/scalive/releases/download/v1.2/scalive-1.2.zip), you will see: ``` @@ -94,7 +94,7 @@ For simplicity and to avoid memory leak when you attach/detach many times, Scalive only supports processes with only the default system class loader, without additional class loaders (Ex: normal standalone JVM processes, like [Play](http://www.playframework.com/) or -[Xitrum](http://ngocdaothanh.github.io/xitrum/) in production mode). +[Xitrum](http://xitrum-framework.github.io/xitrum/) in production mode). Processes with multiple class loaders like Tomcat or [SBT](http://www.scala-sbt.org/) are not supported (with SBT, you already has @@ -104,5 +104,5 @@ the SBT console, so it's not a big deal). These features will be added in the future: -* [Use up/down arrows keys to navigate the console history, pasting multiline block of code etc.](https://github.com/ngocdaothanh/scalive/issues/1) -* [Use tab key for autocompletion](https://github.com/ngocdaothanh/scalive/issues/2) +* [Use up/down arrows keys to navigate the console history, pasting multiline block of code etc.](https://github.com/xitrum-framework/scalive/issues/1) +* [Use tab key for autocompletion](https://github.com/xitrum-framework/scalive/issues/2) From 769fdd4676c5ed24b403bbe5a2aada3bf06522b6 Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Thu, 22 May 2014 15:15:55 +0900 Subject: [PATCH 2/2] Update Scala from 2.11.0 to 2.11.1 --- README.md | 12 ++++-------- build.sbt | 6 +++--- dev/README.rst | 18 +++++++----------- src/main/java/scalive/Server.java | 2 +- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 39daedc..382a095 100644 --- a/README.md +++ b/README.md @@ -15,23 +15,19 @@ scalive-1.2/ scalive.cmd scalive-1.2.jar - scala-library-2.10.3.jar - scala-compiler-2.10.3.jar - scala-reflect-2.10.3.jar - scala-library-2.10.4.jar scala-compiler-2.10.4.jar scala-reflect-2.10.4.jar - scala-library-2.11.0.jar - scala-compiler-2.11.0.jar - scala-reflect-2.11.0.jar + scala-library-2.11.1.jar + scala-compiler-2.11.1.jar + scala-reflect-2.11.1.jar ``` scala-library, scala-compiler, and scala-reflect of the appropriate version will be loaded to your running JVM process, if they have not been loaded. -For convenience, Scala 2.10.3, 2.10.4, and 2.11.0 JARs are preincluded. If your +For convenience, Scala 2.10.4 and 2.11.1 JARs are preincluded. If your process is using a different Scala version, you need to manually download the corresponding JARs and save them as above. diff --git a/build.sbt b/build.sbt index cf095b2..40ada9f 100755 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,9 @@ organization := "tv.cntt" name := "scalive" -version := "1.2-SNAPSHOT" +version := "1.3-SNAPSHOT" -scalaVersion := "2.11.0" +scalaVersion := "2.11.1" autoScalaLibrary := false @@ -20,7 +20,7 @@ javacOptions ++= Seq("-source", "1.6", "-target", "1.6") // https://blogs.oracle.com/CoreJavaTechTips/entry/the_attach_api unmanagedJars in Compile := (file(System.getProperty("java.home")) / ".." / "lib" * "tools.jar").classpath -libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.0" +libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.1" packageOptions in (Compile, packageBin) += Package.ManifestAttributes( "Main-Class" -> "scalive.AgentLoader", diff --git a/dev/README.rst b/dev/README.rst index 42525b2..c58acde 100644 --- a/dev/README.rst +++ b/dev/README.rst @@ -27,17 +27,13 @@ This is the directory that will be zipped when Scalive is released. scalive.cmd scalive_2.11-1.2-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.2-SNAPSHOT.jar - scala-library-2.10.3.jar - scala-compiler-2.10.3.jar - scala-reflect-2.10.3.jar - scala-library-2.10.4.jar scala-compiler-2.10.4.jar scala-reflect-2.10.4.jar - scala-library-2.11.0.jar - scala-compiler-2.11.0.jar - scala-reflect-2.11.0.jar + scala-library-2.11.1.jar + scala-compiler-2.11.1.jar + scala-reflect-2.11.1.jar While developing: @@ -58,14 +54,14 @@ released (remember to remove uneccessary files, like .gitignore): scalive.cmd scalive-.jar <-- Doesn't depend on Scala, thus doesn't follow Scala JAR naming - scala-library-2.10.3.jar - scala-compiler-2.10.3.jar - scala-reflect-2.10.3.jar - scala-library-2.10.4.jar scala-compiler-2.10.4.jar scala-reflect-2.10.4.jar + scala-library-2.11.1.jar + scala-compiler-2.11.1.jar + scala-reflect-2.11.1.jar + Then zip it: :: diff --git a/src/main/java/scalive/Server.java b/src/main/java/scalive/Server.java index 0ef73b9..b2b890e 100644 --- a/src/main/java/scalive/Server.java +++ b/src/main/java/scalive/Server.java @@ -9,7 +9,7 @@ public class Server { // Load this Scala version if Scala has not been loaded in the target process - private static final String DEFAULT_SCALA_VERSION = "2.11.0"; + private static final String DEFAULT_SCALA_VERSION = "2.11.1"; public static void serve(Socket client, String[] jarpaths) throws Exception { InputStream in = client.getInputStream();