You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/07/28 21:49:05 UTC
[1/5] incubator-joshua git commit: Replace old joshua-decoder.org
links with joshua.apache.org
Repository: incubator-joshua
Updated Branches:
refs/heads/master 9d65bcbab -> a169f716d
Replace old joshua-decoder.org links with joshua.apache.org
Updating links to documentation and support to reflect the
move to Apache. Gitignore entry was kept to keep the repo
clean. References to the old git repo were updated as well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/36a58e75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/36a58e75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/36a58e75
Branch: refs/heads/master
Commit: 36a58e75e5deb71bdeed2980e740502fe3d516c2
Parents: 80c17ef
Author: John Hewitt <jo...@gmail.com>
Authored: Wed Jul 27 22:57:04 2016 -0400
Committer: John Hewitt <jo...@gmail.com>
Committed: Wed Jul 27 22:57:04 2016 -0400
----------------------------------------------------------------------
.gitignore | 1 +
CHANGELOG | 2 +-
scripts/support/make-release.sh | 6 +++---
src/main/java/org/apache/joshua/decoder/Decoder.java | 2 +-
src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/36a58e75/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 84c52b1..7130d4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ doxygen_*.tmp
.cachepipe
joshua-decoder.org
+joshua.apache.org
release
scripts/training/MGIZA/
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/36a58e75/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 95cbaf4..5c65ea5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -139,7 +139,7 @@ They include:
- Significantly improved and expanded documentation (both user and developer)
- See http://joshua-decoder.org/4.0 or ./joshua-decoder.org/4.0/index.html (local mirror)
+ See http://apache.joshua.org/4.0 or ./apache.joshua.org/4.0/index.html (local mirror)
- Synchronous parsing
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/36a58e75/scripts/support/make-release.sh
----------------------------------------------------------------------
diff --git a/scripts/support/make-release.sh b/scripts/support/make-release.sh
index 1b593c0..b0d4582 100755
--- a/scripts/support/make-release.sh
+++ b/scripts/support/make-release.sh
@@ -40,7 +40,7 @@ echo "Bundling up joshua-$version"
[[ ! -d release ]] && mkdir release
rm -f joshua-$version && ln -s $JOSHUA joshua-$version
-wget -r http://joshua-decoder.org/
+wget -r http://joshua.apache.org/6.0/
tar czf release/joshua-$version.tgz \
--exclude='*~' --exclude='#*' \
@@ -54,7 +54,7 @@ tar czf release/joshua-$version.tgz \
joshua-$version/test \
joshua-$version/examples \
joshua-$version/thrax/bin/thrax.jar \
- joshua-$version/joshua-decoder.org
+ joshua-$version/joshua.apache.org
ln -sf joshua-$version release/joshua-runtime-$version
tar czf release/joshua-runtime-$version.tgz \
@@ -67,7 +67,7 @@ tar czf release/joshua-runtime-$version.tgz \
joshua-runtime-$version/lib/{ant*,jung*,junit*jar,README,LICENSES} \
joshua-runtime-$version/scripts \
joshua-runtime-$version/examples \
- joshua-runtime-$version/joshua-decoder.org
+ joshua-runtime-$version/joshua.apache.org
rm -f joshua-$version
rm -f VERSION
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/36a58e75/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index f319e40..bee313a 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -496,7 +496,7 @@ public class Decoder {
errMsg.append("FATAL: Invalid feature weight line found in config file.\n");
errMsg.append(String.format("The line was '%s'\n", pairStr));
errMsg.append("You might be using an old version of the config file that is no longer supported\n");
- errMsg.append("Check joshua-decoder.org or email joshua_support@googlegroups.com for help\n");
+ errMsg.append("Check joshua.apache.org or email joshua_support@googlegroups.com for help\n");
errMsg.append("Code = " + 17);
throw new RuntimeException(errMsg.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/36a58e75/src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java b/src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java
index af07133..8fd9562 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java
@@ -49,7 +49,7 @@ public class KenLM implements NGramLanguageModel, Comparable<KenLM> {
LOG.error("* Make sure that BOOST_ROOT is set to the root of your boost");
LOG.error("* installation (it's not /opt/local/, the default), change to");
LOG.error("* $JOSHUA, and type 'ant kenlm'. If problems persist, see the");
- LOG.error("* website (joshua-decoder.org)."); //FIXME: update link to newer url
+ LOG.error("* website (joshua.apache.org).");
throw new RuntimeException(e);
}
}
[4/5] incubator-joshua git commit: Merge branch 'JOSHUA-286' of
https://github.com/john-hewitt/incubator-joshua
Posted by mj...@apache.org.
Merge branch 'JOSHUA-286' of https://github.com/john-hewitt/incubator-joshua
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/d2c0adbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/d2c0adbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/d2c0adbe
Branch: refs/heads/master
Commit: d2c0adbe2645cc31c55acf0168c54f0053c6441b
Parents: af2956e 903770f
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Jul 28 17:47:50 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Jul 28 17:47:50 2016 -0400
----------------------------------------------------------------------
.gitignore | 1 -
scripts/support/make-release.sh | 3 ---
src/main/java/org/apache/joshua/decoder/Decoder.java | 2 +-
src/main/java/org/apache/joshua/decoder/ff/lm/KenLM.java | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-joshua git commit: fix for when multiple jar files
are in $JOSHUA/target
Posted by mj...@apache.org.
fix for when multiple jar files are in $JOSHUA/target
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/af2956ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/af2956ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/af2956ed
Branch: refs/heads/master
Commit: af2956edcedd629a28af9fd0d7b0d0e5783c5292
Parents: 9d65bcb
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Jul 28 17:47:44 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Jul 28 17:47:44 2016 -0400
----------------------------------------------------------------------
bin/joshua-decoder | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/af2956ed/bin/joshua-decoder
----------------------------------------------------------------------
diff --git a/bin/joshua-decoder b/bin/joshua-decoder
index 9bcfc74..429188e 100755
--- a/bin/joshua-decoder
+++ b/bin/joshua-decoder
@@ -40,8 +40,9 @@ fi
set -u
JOSHUA=$(dirname $0)/..
-JAR_PATH=$JOSHUA/target/joshua-*-jar-with-dependencies.jar
RES_OVERRIDE_PATH=$JOSHUA/src/main/resources
+# Get the jar file (only the most recent, if there are many)
+JAR_PATH=$(ls -t $JOSHUA/target/joshua-*-jar-with-dependencies.jar | head -n1)
exec java -Xmx${mem} \
-Dfile.encoding=utf8 \
-Djava.library.path=$JOSHUA/lib \
[2/5] incubator-joshua git commit: JOSHUA-286 - Update replacement of
old joshua-decoder.org links
Posted by mj...@apache.org.
JOSHUA-286 - Update replacement of old joshua-decoder.org links
- Revert CHANGELOG
- Remove website crawl from documentation
- Remove website crawl folders from gitignore
- Update support email address in Decoder.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/903770f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/903770f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/903770f0
Branch: refs/heads/master
Commit: 903770f0fd5a97979512ca40b422f0ee7a494fda
Parents: 36a58e7
Author: John Hewitt <jo...@seas.upenn.edu>
Authored: Thu Jul 28 10:48:55 2016 -0400
Committer: John Hewitt <jo...@seas.upenn.edu>
Committed: Thu Jul 28 10:48:55 2016 -0400
----------------------------------------------------------------------
.gitignore | 2 --
CHANGELOG | 2 +-
scripts/support/make-release.sh | 3 ---
src/main/java/org/apache/joshua/decoder/Decoder.java | 2 +-
4 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/903770f0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7130d4f..d3d311e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,8 +41,6 @@ doxygen_*.tmp
*.so
.cachepipe
-joshua-decoder.org
-joshua.apache.org
release
scripts/training/MGIZA/
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/903770f0/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5c65ea5..95cbaf4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -139,7 +139,7 @@ They include:
- Significantly improved and expanded documentation (both user and developer)
- See http://apache.joshua.org/4.0 or ./apache.joshua.org/4.0/index.html (local mirror)
+ See http://joshua-decoder.org/4.0 or ./joshua-decoder.org/4.0/index.html (local mirror)
- Synchronous parsing
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/903770f0/scripts/support/make-release.sh
----------------------------------------------------------------------
diff --git a/scripts/support/make-release.sh b/scripts/support/make-release.sh
index b0d4582..ad4739b 100755
--- a/scripts/support/make-release.sh
+++ b/scripts/support/make-release.sh
@@ -40,7 +40,6 @@ echo "Bundling up joshua-$version"
[[ ! -d release ]] && mkdir release
rm -f joshua-$version && ln -s $JOSHUA joshua-$version
-wget -r http://joshua.apache.org/6.0/
tar czf release/joshua-$version.tgz \
--exclude='*~' --exclude='#*' \
@@ -54,7 +53,6 @@ tar czf release/joshua-$version.tgz \
joshua-$version/test \
joshua-$version/examples \
joshua-$version/thrax/bin/thrax.jar \
- joshua-$version/joshua.apache.org
ln -sf joshua-$version release/joshua-runtime-$version
tar czf release/joshua-runtime-$version.tgz \
@@ -67,7 +65,6 @@ tar czf release/joshua-runtime-$version.tgz \
joshua-runtime-$version/lib/{ant*,jung*,junit*jar,README,LICENSES} \
joshua-runtime-$version/scripts \
joshua-runtime-$version/examples \
- joshua-runtime-$version/joshua.apache.org
rm -f joshua-$version
rm -f VERSION
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/903770f0/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index bee313a..e1eadb1 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -496,7 +496,7 @@ public class Decoder {
errMsg.append("FATAL: Invalid feature weight line found in config file.\n");
errMsg.append(String.format("The line was '%s'\n", pairStr));
errMsg.append("You might be using an old version of the config file that is no longer supported\n");
- errMsg.append("Check joshua.apache.org or email joshua_support@googlegroups.com for help\n");
+ errMsg.append("Check joshua.apache.org or email dev@joshua.apache.org for help\n");
errMsg.append("Code = " + 17);
throw new RuntimeException(errMsg.toString());
}
[5/5] incubator-joshua git commit: removed trailing backslashes
Posted by mj...@apache.org.
removed trailing backslashes
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/a169f716
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/a169f716
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/a169f716
Branch: refs/heads/master
Commit: a169f716d2d815974d799254839fa4271ba89da0
Parents: d2c0adb
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Jul 28 17:48:59 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Jul 28 17:48:59 2016 -0400
----------------------------------------------------------------------
scripts/support/make-release.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/a169f716/scripts/support/make-release.sh
----------------------------------------------------------------------
diff --git a/scripts/support/make-release.sh b/scripts/support/make-release.sh
index ad4739b..b198c0b 100755
--- a/scripts/support/make-release.sh
+++ b/scripts/support/make-release.sh
@@ -52,7 +52,7 @@ tar czf release/joshua-$version.tgz \
joshua-$version/scripts \
joshua-$version/test \
joshua-$version/examples \
- joshua-$version/thrax/bin/thrax.jar \
+ joshua-$version/thrax/bin/thrax.jar
ln -sf joshua-$version release/joshua-runtime-$version
tar czf release/joshua-runtime-$version.tgz \
@@ -64,7 +64,7 @@ tar czf release/joshua-runtime-$version.tgz \
joshua-runtime-$version/class \
joshua-runtime-$version/lib/{ant*,jung*,junit*jar,README,LICENSES} \
joshua-runtime-$version/scripts \
- joshua-runtime-$version/examples \
+ joshua-runtime-$version/examples
rm -f joshua-$version
rm -f VERSION