You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by le...@apache.org on 2016/11/11 10:34:10 UTC
[06/10] incubator-joshua git commit: JOSHUA-323 Joshua 6.1 Release
Management
JOSHUA-323 Joshua 6.1 Release Management
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/eb994e31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/eb994e31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/eb994e31
Branch: refs/heads/master
Commit: eb994e311a0c7593ad1899df6153b65585760cc8
Parents: c2c59d8
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Thu Nov 10 21:20:32 2016 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Thu Nov 10 21:20:32 2016 -0800
----------------------------------------------------------------------
LICENSE | 28 +++++++++++++++++++-
demo/bootstrap/js/npm.js | 15 +++++++++++
demo/demo.config | 15 +++++++++++
demo/demo.js | 19 +++++++++++++
demo/index.html | 16 +++++++++++
demo/scripts/joshua.sh | 14 ++++++++++
demo/scripts/web_server.py | 14 ++++++++++
distribution/docker/ar-en-phrase/Dockerfile | 15 +++++++++++
distribution/docker/zh-en-hiero/Dockerfile | 15 +++++++++++
download-deps.sh | 14 ++++++++++
pom.xml | 7 +++++
.../decoder/LanguageModelStateManager.java | 18 +++++++++++++
.../java/org/apache/joshua/decoder/LmPool.java | 18 +++++++++++++
13 files changed, 207 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f49a4e1..0aa5e64 100644
--- a/LICENSE
+++ b/LICENSE
@@ -198,4 +198,30 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ limitations under the License.
+
+The following libraries are all available under these terms of the MIT license
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Bootstrap v3.3.6, an html, css, and javascript framework.
+Copyright (c) 2011-2015 Twitter, Inc.
+
+jquery 2.2.0, a javascript library.
+Copyright 2014 jQuery Foundation and other contributors, https://jquery.org/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/demo/bootstrap/js/npm.js
----------------------------------------------------------------------
diff --git a/demo/bootstrap/js/npm.js b/demo/bootstrap/js/npm.js
index bf6aa80..8c2cdb6 100644
--- a/demo/bootstrap/js/npm.js
+++ b/demo/bootstrap/js/npm.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
require('../../js/transition.js')
require('../../js/alert.js')
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/demo/demo.config
----------------------------------------------------------------------
diff --git a/demo/demo.config b/demo/demo.config
index 4c29c9a..2a4c109 100644
--- a/demo/demo.config
+++ b/demo/demo.config
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
server-type = http
server-port = 5674
mark-oovs = true
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index 131683b..28ef4e5 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
/* Global variables */
var RULES;
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/demo/index.html
----------------------------------------------------------------------
diff --git a/demo/index.html b/demo/index.html
index 576c035..c9a9711 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -1,4 +1,20 @@
<!DOCTYPE html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<html lang="en">
<head>
<meta charset="utf-8">
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/demo/scripts/joshua.sh
----------------------------------------------------------------------
diff --git a/demo/scripts/joshua.sh b/demo/scripts/joshua.sh
index c42a10c..624a0fe 100755
--- a/demo/scripts/joshua.sh
+++ b/demo/scripts/joshua.sh
@@ -1,4 +1,18 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# Easy way to start up Joshua
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/demo/scripts/web_server.py
----------------------------------------------------------------------
diff --git a/demo/scripts/web_server.py b/demo/scripts/web_server.py
index 75ca3cc..77951b6 100755
--- a/demo/scripts/web_server.py
+++ b/demo/scripts/web_server.py
@@ -1,4 +1,18 @@
#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""
Starts a web server on port 8000. Start it in the current directory and
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/distribution/docker/ar-en-phrase/Dockerfile
----------------------------------------------------------------------
diff --git a/distribution/docker/ar-en-phrase/Dockerfile b/distribution/docker/ar-en-phrase/Dockerfile
index c34e009..5b7d94c 100644
--- a/distribution/docker/ar-en-phrase/Dockerfile
+++ b/distribution/docker/ar-en-phrase/Dockerfile
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
FROM joshua
ENV language_pack=ar-en-phrase
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/distribution/docker/zh-en-hiero/Dockerfile
----------------------------------------------------------------------
diff --git a/distribution/docker/zh-en-hiero/Dockerfile b/distribution/docker/zh-en-hiero/Dockerfile
index d49a804..4c099a1 100644
--- a/distribution/docker/zh-en-hiero/Dockerfile
+++ b/distribution/docker/zh-en-hiero/Dockerfile
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
FROM joshua
ENV language_pack=zh-en-hiero
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/download-deps.sh
----------------------------------------------------------------------
diff --git a/download-deps.sh b/download-deps.sh
index 8fbdf69..637a631 100755
--- a/download-deps.sh
+++ b/download-deps.sh
@@ -1,4 +1,18 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
git clone https://github.com/kpu/kenlm.git ext/kenlm
(cd ext/kenlm; git checkout 56fdb5c44fca34d5a2e07d96139c28fb163983c5)
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 540f0e1..6ca29c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -378,6 +378,13 @@
<exclude>KEYS</exclude>
<exclude>doap_joshua.rdf</exclude>
<exclude>src/test/**</exclude>
+ <exclude>demo/bootstrap/**</exclude>
+ <exclude>demo/README.md</exclude>
+ <exclude>distribution/joshua-full/icon.svg</exclude>
+ <exclude>distribution/joshua-full/README.md</exclude>
+ <exclude>distribution/joshua-runtime/icon.svg</exclude>
+ <exclude>distribution/joshua-runtime/README.md</exclude>
+ <exclude>examples/**</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/src/main/java/org/apache/joshua/decoder/LanguageModelStateManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/LanguageModelStateManager.java b/src/main/java/org/apache/joshua/decoder/LanguageModelStateManager.java
index 82c3212..7382013 100644
--- a/src/main/java/org/apache/joshua/decoder/LanguageModelStateManager.java
+++ b/src/main/java/org/apache/joshua/decoder/LanguageModelStateManager.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.joshua.decoder;
import org.apache.joshua.decoder.ff.lm.KenLM;
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb994e31/src/main/java/org/apache/joshua/decoder/LmPool.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/LmPool.java b/src/main/java/org/apache/joshua/decoder/LmPool.java
index 73af0a6..b59be40 100644
--- a/src/main/java/org/apache/joshua/decoder/LmPool.java
+++ b/src/main/java/org/apache/joshua/decoder/LmPool.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.joshua.decoder;
import org.apache.joshua.decoder.ff.lm.KenLM;