You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/06/07 17:26:22 UTC

[1/2] incubator-groovy git commit: Documentation: Rework the "Embedding the Console" section (remove link to codehaus page)

Repository: incubator-groovy
Updated Branches:
  refs/heads/master 3a70d8eaf -> 9ab147674


Documentation: Rework the "Embedding the Console" section (remove link to codehaus page)


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/353e5cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/353e5cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/353e5cea

Branch: refs/heads/master
Commit: 353e5ceaca5d4ac4c4271ed4dd765d334aeff411
Parents: 3a70d8e
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Jun 7 16:58:58 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Jun 7 16:58:58 2015 +0200

----------------------------------------------------------------------
 .../groovy-console/src/spec/doc/groovy-console.adoc    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/353e5cea/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/spec/doc/groovy-console.adoc b/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
index cab889f..2703201 100644
--- a/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
+++ b/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
@@ -103,33 +103,24 @@ expected or when an exception is thrown
 == Embedding the Console
 
 To embed a Swing console in your application, simply create the Console
-object, +
- load some variables, and then launch it. The console can be embedded in
-either Java or Groovy code. +
- The Java code for this is:
+object, load some variables, and then launch it. The console can be embedded in
+either Java or Groovy code. The Java code for this is:
 
 [source,java]
 --------------------------------------------------
 import groovy.ui.Console;
 
     ...
-
     Console console = new Console();
     console.setVariable("var1", getValueOfVar1());
     console.setVariable("var2", getValueOfVar2());
     console.run();
-
     ...
 --------------------------------------------------
 
 Once the console is launched, you can use the variable values in Groovy
 code.
 
-An example of how to embed either the GroovyConsole or GroovyShell in a
-Spring Web application can be found at
-http://groovy.codehaus.org/Embedding+a+Groovy+Console+in+a+Java+Server+Application[Embedding
-a Groovy Console in a Java Server Application]
-
 [[GroovyConsole-Visualizingscriptoutputresults]]
 == Visualizing script output results
 


[2/2] incubator-groovy git commit: Documentation: Replace links to codehaus.org with groovy-lang.org

Posted by pa...@apache.org.
Documentation: Replace links to codehaus.org with groovy-lang.org


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/9ab14767
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/9ab14767
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/9ab14767

Branch: refs/heads/master
Commit: 9ab1476749784c59a91522156dbad57178fab20f
Parents: 353e5ce
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Jun 7 17:20:19 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Jun 7 17:20:19 2015 +0200

----------------------------------------------------------------------
 src/conf/groovy-starter.conf                                    | 2 +-
 src/main/groovy/lang/Grab.java                                  | 2 +-
 src/main/groovy/lang/GrabConfig.java                            | 2 +-
 src/main/groovy/lang/GrabExclude.java                           | 2 +-
 src/main/groovy/lang/GrabResolver.java                          | 2 +-
 src/main/groovy/ui/GroovySocketServer.java                      | 5 +++--
 .../src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java     | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/src/conf/groovy-starter.conf
----------------------------------------------------------------------
diff --git a/src/conf/groovy-starter.conf b/src/conf/groovy-starter.conf
index daac85d..5778ffd 100644
--- a/src/conf/groovy-starter.conf
+++ b/src/conf/groovy-starter.conf
@@ -10,7 +10,7 @@
 ## Note: do not add classes from java.lang here. No rt.jar and on some
 ##       platforms no tools.jar
 ##
-## See http://groovy.codehaus.org/api/org/codehaus/groovy/tools/LoaderConfiguration.html
+## See http://docs.groovy-lang.org/docs/latest/html/api/org/codehaus/groovy/tools/LoaderConfiguration.html
 ## for the file format
 
     # load required libraries

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/src/main/groovy/lang/Grab.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/Grab.java b/src/main/groovy/lang/Grab.java
index e32d2d0..54bceb0 100644
--- a/src/main/groovy/lang/Grab.java
+++ b/src/main/groovy/lang/Grab.java
@@ -46,7 +46,7 @@ import java.lang.annotation.ElementType;
  * </pre>
  * Further information such as where artifacts are downloaded to, how to add additional resolvers,
  * how to customise artifact resolution etc., can be found on the Grape documentation page:
- * <a href="http://groovy.codehaus.org/Grape">http://groovy.codehaus.org/Grape</a>.
+ * <a href="http://groovy-lang.org/grape.html">http://groovy-lang.org/grape.html</a>.
  */
 @Retention(RetentionPolicy.SOURCE)
 @Target({

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/src/main/groovy/lang/GrabConfig.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/GrabConfig.java b/src/main/groovy/lang/GrabConfig.java
index 8865fe4..e67e875 100644
--- a/src/main/groovy/lang/GrabConfig.java
+++ b/src/main/groovy/lang/GrabConfig.java
@@ -66,7 +66,7 @@ import java.lang.annotation.Target;
  * </pre>
  * <p>
  * Further information about customising grape behavior can be found on the Grape documentation page:
- * <a href="http://groovy.codehaus.org/Grape">http://groovy.codehaus.org/Grape</a>.
+ * <a href="http://groovy-lang.org/grape.html">http://groovy-lang.org/grape.html</a>.
  */
 @Retention(RetentionPolicy.SOURCE)
 @Target({

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/src/main/groovy/lang/GrabExclude.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/GrabExclude.java b/src/main/groovy/lang/GrabExclude.java
index cf4f87d..327cb43 100644
--- a/src/main/groovy/lang/GrabExclude.java
+++ b/src/main/groovy/lang/GrabExclude.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
  * {@code @GrabExclude('mysql:mysql-connector-java') // compact form}<br>
  * <p>
  * Further information about customising grape behavior can be found on the Grape documentation page:
- * <a href="http://groovy.codehaus.org/Grape">http://groovy.codehaus.org/Grape</a>.
+ * <a href="http://groovy-lang.org/grape.html">http://groovy-lang.org/grape.html</a>.
  */
 @Retention(RetentionPolicy.SOURCE)
 @Target({

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/src/main/groovy/lang/GrabResolver.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/GrabResolver.java b/src/main/groovy/lang/GrabResolver.java
index bfc1138..2a16aed 100644
--- a/src/main/groovy/lang/GrabResolver.java
+++ b/src/main/groovy/lang/GrabResolver.java
@@ -41,7 +41,7 @@ import java.lang.annotation.ElementType;
  * to resolve artifacts in the order specified in the chain of resolvers.
  * <p>
  * Further information about customising grape behavior can be found on the Grape documentation page:
- * <a href="http://groovy.codehaus.org/Grape">http://groovy.codehaus.org/Grape</a>.
+ * <a href="http://groovy-lang.org/grape.html">http://groovy-lang.org/grape.html</a>.
  *
  * @author Merlyn Albery-Speyer
  */

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/src/main/groovy/ui/GroovySocketServer.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/ui/GroovySocketServer.java b/src/main/groovy/ui/GroovySocketServer.java
index 612a255..5e7aee1 100644
--- a/src/main/groovy/ui/GroovySocketServer.java
+++ b/src/main/groovy/ui/GroovySocketServer.java
@@ -40,8 +40,9 @@ import java.util.regex.Pattern;
  * <p>
  * Typically this is used from the groovy command line agent but it can be 
  * invoked programatically. To run this program from the command line please
- * refer to the command line documentation at <a href="http://groovy.codehaus.org/Groovy+CLI">
- * Groovy CLI</a>.
+ * refer to the command line documentation at
+ * <a href="http://docs.groovy-lang.org/docs/latest/html/documentation/#_running_groovy_from_the_commandline">
+ * Running Groovy from the commandline</a>.
  * <p>
  * Here is an example of how to use this class to open a listening socket on the server, 
  * listen for incoming data, and then echo the data back to the client in reverse order: 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9ab14767/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
index 540c933..ae27024 100644
--- a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
+++ b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
@@ -30,7 +30,7 @@ import org.codehaus.groovy.runtime.InvokerHelper;
 import java.util.Vector;
 
 /**
- * A BSF Engine for the <a href="http://groovy.codehaus.org/">Groovy</a>
+ * A BSF Engine for the <a href="http://groovy-lang.org/">Groovy</a>
  * scripting language.
  * <p>
  * It's derived from the Jython / JPython engine