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:12 UTC

[08/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/8c21101c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/8c21101c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/8c21101c

Branch: refs/heads/master
Commit: 8c21101c48bcefe302ec7422c6c737b73a0bceed
Parents: 4d3e86b
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Fri Nov 11 02:10:57 2016 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Fri Nov 11 02:10:57 2016 -0800

----------------------------------------------------------------------
 pom.xml                                           |  1 +
 scripts/training/templates/hadoop/core-site.xml   | 16 ++++++++++++++++
 scripts/training/templates/hadoop/hdfs-site.xml   | 16 ++++++++++++++++
 scripts/training/templates/hadoop/mapred-site.xml | 16 ++++++++++++++++
 scripts/training/templates/thrax-hiero.conf       | 15 +++++++++++++++
 scripts/training/templates/thrax-phrasal.conf     | 15 +++++++++++++++
 scripts/training/templates/thrax-phrase-gt.conf   | 15 +++++++++++++++
 scripts/training/templates/thrax-phrase.conf      | 15 +++++++++++++++
 scripts/training/templates/thrax-samt.conf        | 15 +++++++++++++++
 9 files changed, 124 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ca29c8..766d7a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,6 +385,7 @@
                 <exclude>distribution/joshua-runtime/icon.svg</exclude>
                 <exclude>distribution/joshua-runtime/README.md</exclude>
                 <exclude>examples/**</exclude>
+                <exclude>scripts/preparation/nonbreaking_prefixes/**</exclude>
               </excludes>
             </configuration>
           </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/hadoop/core-site.xml
----------------------------------------------------------------------
diff --git a/scripts/training/templates/hadoop/core-site.xml b/scripts/training/templates/hadoop/core-site.xml
index 6c5571f..a3d9d36 100644
--- a/scripts/training/templates/hadoop/core-site.xml
+++ b/scripts/training/templates/hadoop/core-site.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
 <configuration>
   <property>
     <name>hadoop.tmp.dir</name>

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/hadoop/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/scripts/training/templates/hadoop/hdfs-site.xml b/scripts/training/templates/hadoop/hdfs-site.xml
index 015b159..7871478 100644
--- a/scripts/training/templates/hadoop/hdfs-site.xml
+++ b/scripts/training/templates/hadoop/hdfs-site.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
 <configuration>
  <property>
     <name>dfs.replication</name>

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/hadoop/mapred-site.xml
----------------------------------------------------------------------
diff --git a/scripts/training/templates/hadoop/mapred-site.xml b/scripts/training/templates/hadoop/mapred-site.xml
index 104a7c7..f28c67d 100644
--- a/scripts/training/templates/hadoop/mapred-site.xml
+++ b/scripts/training/templates/hadoop/mapred-site.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
 <configuration>
   <property>
     <name>mapred.job.tracker</name>

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/thrax-hiero.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/thrax-hiero.conf b/scripts/training/templates/thrax-hiero.conf
index cd33e6b..b38098a 100644
--- a/scripts/training/templates/thrax-hiero.conf
+++ b/scripts/training/templates/thrax-hiero.conf
@@ -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 is an example Thrax configuration file
 # <- this symbol indicates a comment
 # each line should be a key-value pair separated by whitespace

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/thrax-phrasal.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/thrax-phrasal.conf b/scripts/training/templates/thrax-phrasal.conf
index 883cf04..380b230 100644
--- a/scripts/training/templates/thrax-phrasal.conf
+++ b/scripts/training/templates/thrax-phrasal.conf
@@ -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 is an example Thrax configuration file
 # <- this symbol indicates a comment
 # each line should be a key-value pair separated by whitespace

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/thrax-phrase-gt.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/thrax-phrase-gt.conf b/scripts/training/templates/thrax-phrase-gt.conf
index 5d2efe4..0bfd815 100644
--- a/scripts/training/templates/thrax-phrase-gt.conf
+++ b/scripts/training/templates/thrax-phrase-gt.conf
@@ -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 is an example Thrax configuration file
 # <- this symbol indicates a comment
 # each line should be a key-value pair separated by whitespace

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/thrax-phrase.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/thrax-phrase.conf b/scripts/training/templates/thrax-phrase.conf
index 3c89a22..fbf113a 100644
--- a/scripts/training/templates/thrax-phrase.conf
+++ b/scripts/training/templates/thrax-phrase.conf
@@ -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 is an example Thrax configuration file
 # <- this symbol indicates a comment
 # each line should be a key-value pair separated by whitespace

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/8c21101c/scripts/training/templates/thrax-samt.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/thrax-samt.conf b/scripts/training/templates/thrax-samt.conf
index 5460a41..48aa2b1 100644
--- a/scripts/training/templates/thrax-samt.conf
+++ b/scripts/training/templates/thrax-samt.conf
@@ -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 is an example Thrax configuration file
 # <- this symbol indicates a comment
 # each line should be a key-value pair separated by whitespace