Index: LICENSE.txt =================================================================== --- LICENSE.txt (revision 1138299) +++ LICENSE.txt (working copy) @@ -290,3 +290,29 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. + +========================================================== +The following license applies to the SLF4J library +========================================================== +Copyright (c) 2004-2008 QOS.ch +All rights reserved. + +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. + Index: pom.xml =================================================================== --- pom.xml (revision 1138299) +++ pom.xml (working copy) @@ -15,20 +15,19 @@ limitations under the License. --> - - + + org.apache apache 8 - + 4.0.0 org.apache.hama hama-core Apache Hama - 0.3.0-incubating-SNAPSHOT + 0.3.0-incubating Apache Hama http://incubator.apache.org/hama jar @@ -78,48 +77,195 @@ - scm:svn:http://svn.apache.org/repos/asf/incubator/hama + scm:svn:http://svn.apache.org/repos/asf/incubator/hama/tags/hama-core-0.3.0-incubating - scm:svn:https://svn.apache.org/repos/asf/incubator/hama + scm:svn:https://svn.apache.org/repos/asf/incubator/hama/tags/hama-core-0.3.0-incubating + http://svn.apache.org/viewvc/maven/pom/tags/hama-core-0.3.0-incubating + + + + + 1.1.1 + 0.20.2 + 6.1.26 + 4.8.1 + 1.5.2 + 6.0.32 + 1.2.16 + 3.3.1 + + commons-logging commons-logging - 1.0.4 + ${commons-logging.version} org.mortbay.jetty jetty - 6.1H.22 + ${jetty.version} + + + org.mortbay.jetty + servlet-api + + + org.apache.tomcat + servlet-api + ${servlet-api.version} + + org.mortbay.jetty + jetty-annotations + ${jetty.version} + + + geronimo-spec + geronimo-spec-jta + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + + + org.mortbay.jetty + jetty-naming + ${jetty.version} + + + javax.mail + mail + + + + + org.mortbay.jetty jetty-util - 6.1H.22 + ${jetty.version} org.apache.hadoop hadoop-core - 0.20.2 + ${hadoop.version} + + + ant + ant + + + commons-codec + commons-codec + + + commons-el + commons-el + + + commons-httpclient + commons-httpclient + + + commons-net + commons-net + + + org.eclipse.jdt + core + + + hsqldb + hsqldb + + + oro + oro + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + + net.java.dev.jets3t + jets3t + + + org.mortbay.jetty + jsp-api-2.1 + + + org.mortbay.jetty + jsp-2.1 + + + org.mortbay.jetty + servlet-api-2.5 + + + xmlenc + xmlenc + + + net.sf.kosmosfs + kfs + + org.apache.hadoop hadoop-test - 0.20.2 + ${hadoop.version} + + + org.apache.ftpserver + ftplet-api + + + org.apache.ftpserver + ftpserver-core + + + org.apache.ftpserver + ftpserver-deprecated + + + org.apache.mina + mina-core + + junit junit - 3.8.1 + ${junit.version} test + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12.version} + + + org.slf4j + slf4j-api + + + + log4j log4j - 1.2.15 + ${log4j.version} provided @@ -143,12 +289,16 @@ org.apache.hadoop zookeeper - 3.3.1 + ${zookeeper.version} log4j log4j + + jline + jline + @@ -202,7 +352,6 @@ ${basedir}/lib false true - true @@ -239,8 +388,7 @@ - + org.apache.hama.examples.ExampleDriver @@ -269,8 +417,7 @@ package - + @@ -289,4 +436,3 @@ -