You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by cn...@apache.org on 2016/03/19 22:48:11 UTC
svn commit: r1735820 - in /zookeeper/trunk: ./ docs/ src/contrib/loggraph/
src/contrib/rest/ src/contrib/zooinspector/
src/docs/src/documentation/content/xdocs/ src/java/lib/
Author: cnauroth
Date: Sat Mar 19 21:48:11 2016
New Revision: 1735820
URL: http://svn.apache.org/viewvc?rev=1735820&view=rev
Log:
ZOOKEEPER-2393: Revert run-time dependency on log4j and slf4j-log4j12 (Arshad Mohammad via cnauroth)
Added:
zookeeper/trunk/src/java/lib/log4j-1.2.17.LICENSE.txt
Removed:
zookeeper/trunk/src/java/lib/log4j-1.2.16.LICENSE.txt
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/build.xml
zookeeper/trunk/docs/index.pdf
zookeeper/trunk/docs/javaExample.pdf
zookeeper/trunk/docs/linkmap.pdf
zookeeper/trunk/docs/recipes.pdf
zookeeper/trunk/docs/zookeeperAdmin.html
zookeeper/trunk/docs/zookeeperAdmin.pdf
zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf
zookeeper/trunk/docs/zookeeperInternals.pdf
zookeeper/trunk/docs/zookeeperJMX.pdf
zookeeper/trunk/docs/zookeeperObservers.pdf
zookeeper/trunk/docs/zookeeperOver.pdf
zookeeper/trunk/docs/zookeeperProgrammers.pdf
zookeeper/trunk/docs/zookeeperQuotas.pdf
zookeeper/trunk/docs/zookeeperReconfig.pdf
zookeeper/trunk/docs/zookeeperStarted.pdf
zookeeper/trunk/docs/zookeeperTutorial.pdf
zookeeper/trunk/ivy.xml
zookeeper/trunk/src/contrib/loggraph/ivy.xml
zookeeper/trunk/src/contrib/rest/ivy.xml
zookeeper/trunk/src/contrib/zooinspector/ivy.xml
zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Mar 19 21:48:11 2016
@@ -288,6 +288,9 @@ BUGFIXES:
ZOOKEEPER-2392 Update netty to 3.7.1.Final (Hendy Irawan via phunt)
+ ZOOKEEPER-2393: Revert run-time dependency on log4j and slf4j-log4j12
+ (Arshad Mohammad via cnauroth)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Sat Mar 19 21:48:11 2016
@@ -231,14 +231,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
</fileset>
<path refid="java.classpath"/>
</path>
- <path id="test.java.classpath.without.log4j">
- <pathelement location="${test.java.classes}" />
- <fileset dir="${ivy.test.lib}">
- <include name="**/*.jar" />
- <exclude name="**/*log4j*.jar"/>
- </fileset>
- <path refid="java.classpath"/>
- </path>
<!-- ====================================================== -->
<!-- Generate and compile the Java files -->
@@ -1176,46 +1168,15 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
<fileset id="quicktest.files" dir="${test.src.dir}">
<include name="**/*${test.category}Test.java" />
<exclude name="**/*HammerTest.java" />
- <exclude name="**/*${test.category}NoLog4j*.java"/>
</fileset>
<fileset id="fulltest.files" dir="${test.src.dir}">
<include name="**/*${test.category}Test.java" />
- <exclude name="**/*${test.category}NoLog4j*.java"/>
</fileset>
<fileset id="testcase.files" dir="${test.src.dir}">
<include name="**/${testcase}.java" />
- <exclude name="**/*${test.category}NoLog4j*.java"/>
</fileset>
</target>
- <target name="junit.run.nolog4j">
- <junit showoutput="${test.output}"
- printsummary="${test.junit.printsummary}"
- haltonfailure="${test.junit.haltonfailure}"
- fork="yes"
- forkmode="${test.junit.fork.mode}"
- maxmemory="${test.junit.maxmem}"
- dir="${basedir}" timeout="${test.timeout}"
- errorProperty="tests.failed.nolog4j"
- failureProperty="tests.failed.nolog4j">
- <sysproperty key="build.test.dir" value="${test.tmp.dir}"/>
- <sysproperty key="test.data.dir" value="${test.data.dir}"/>
- <!-- superDigest is used by the tests/main code. If this is not set
- as part of starting the jvm there is no guarantee that the static
- initializers in the java code will see this (esp when running
- with junit fork mode set to "once")-->
- <sysproperty key="zookeeper.DigestAuthenticationProvider.superDigest"
- value="super:D/InIHSb7yEEbrWz8b9l71RjZJU="/>
- <classpath refid="test.java.classpath.without.log4j"/>
- <formatter type="${test.junit.output.format}"/>
- <batchtest todir="${test.log.dir}" if="fulltest">
- <fileset dir="${test.src.dir}">
- <include name="**/*${test.category}NoLog4j*.java"/>
- </fileset>
- </batchtest>
- </junit>
- <fail if="tests.failed.nolog4j">Tests failed!</fail>
- </target>
<target name="junit.run" depends="junit-init,junit.run-single,junit.run-concurrent" />
<target name="junit.run-concurrent" if="ant.supports.concurrent.junit.processes">
@@ -1368,11 +1329,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
<target name="test-core-java" depends="test-init, test-category, junit.run"/>
- <target name="test-core-java-nolog4j" depends="test-init, test-category, junit.run.nolog4j"/>
-
<target name="test-core-cppunit" depends="test-init, test-category, call-test-cppunit"/>
- <target name="test-core" depends="test-core-java, test-core-java-nolog4j, test-core-cppunit"/>
+ <target name="test-core" depends="test-core-java, test-core-cppunit"/>
<!-- ====================================================== -->
<!-- Run optional third-party tool targets -->
Modified: zookeeper/trunk/docs/index.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/index.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/javaExample.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/javaExample.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/linkmap.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/recipes.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/recipes.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperAdmin.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperAdmin.html?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/docs/zookeeperAdmin.html (original)
+++ zookeeper/trunk/docs/zookeeperAdmin.html Sat Mar 19 21:48:11 2016
@@ -615,7 +615,7 @@ server.3=zoo3:2888:3888</pre>
<p>
-<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.16.jar:conf \
+<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf \
org.apache.zookeeper.server.quorum.QuorumPeerMain zoo.cfg
</span>
</p>
@@ -652,7 +652,7 @@ server.3=zoo3:2888:3888</pre>
<p>
-<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.16.jar:conf:src/java/lib/jline-2.11.jar \
+<span class="codefrag computeroutput">$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf:src/java/lib/jline-2.11.jar \
org.apache.zookeeper.ZooKeeperMain -server 127.0.0.1:2181</span>
</p>
@@ -976,7 +976,7 @@ server.3=zoo3:2888:3888</pre>
in the unlikely event a recent log has become corrupted). This
can be run as a cron job on the ZooKeeper server machines to
clean up the logs daily.</p>
-<pre class="code"> java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.16.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></pre>
+<pre class="code"> java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></pre>
<p>Automatic purging of the snapshots and corresponding
transaction logs was introduced in version 3.4.0 and can be
enabled via the following configuration parameters <strong>autopurge.snapRetainCount</strong> and <strong>autopurge.purgeInterval</strong>. For more on
@@ -1028,7 +1028,7 @@ server.3=zoo3:2888:3888</pre>
<h3 class="h4">Logging</h3>
<p>
ZooKeeper uses <strong><a href="http://www.slf4j.org">SLF4J</a></strong>
- version 1.7 as its logging infrastructure. For backward compatibility it is bound to
+ version 1.7.5 as its logging infrastructure. For backward compatibility it is bound to
<strong>LOG4J</strong> but you can use
<strong><a href="http://logback.qos.ch/">LOGBack</a></strong>
or any other supported logging framework of your choice.
Modified: zookeeper/trunk/docs/zookeeperAdmin.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperAdmin.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf (original) and zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf Sat Mar 19 21:48:11 2016 differ
Modified: zookeeper/trunk/docs/zookeeperInternals.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperInternals.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperJMX.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperJMX.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files zookeeper/trunk/docs/zookeeperJMX.pdf (original) and zookeeper/trunk/docs/zookeeperJMX.pdf Sat Mar 19 21:48:11 2016 differ
Modified: zookeeper/trunk/docs/zookeeperObservers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperObservers.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files zookeeper/trunk/docs/zookeeperObservers.pdf (original) and zookeeper/trunk/docs/zookeeperObservers.pdf Sat Mar 19 21:48:11 2016 differ
Modified: zookeeper/trunk/docs/zookeeperOver.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperOver.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperProgrammers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperProgrammers.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperQuotas.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperQuotas.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files zookeeper/trunk/docs/zookeeperQuotas.pdf (original) and zookeeper/trunk/docs/zookeeperQuotas.pdf Sat Mar 19 21:48:11 2016 differ
Modified: zookeeper/trunk/docs/zookeeperReconfig.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperReconfig.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperStarted.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/docs/zookeeperTutorial.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperTutorial.pdf?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Sat Mar 19 21:48:11 2016
@@ -41,13 +41,13 @@
<dependencies>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false" conf="test->default"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false"/>
<dependency org="commons-cli" name="commons-cli" rev="1.2" />
<dependency org="org.apache.maven.wagon" name="wagon-http" rev="2.4" conf="mvn-ant-task->default"/>
<dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->master"/>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="test->default"/>
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="jline" name="jline" rev="2.11" transitive="false" conf="optional->default"/>
<dependency org="io.netty" name="netty" conf="default" rev="3.7.1.Final">
Modified: zookeeper/trunk/src/contrib/loggraph/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/ivy.xml?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/loggraph/ivy.xml Sat Mar 19 21:48:11 2016
@@ -32,10 +32,10 @@
<dependencies>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false" conf="test->default" />
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false"/>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="test->default" />
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="7.0.1.v20091125" />
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.0.1.v20091125" />
<dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1" />
Modified: zookeeper/trunk/src/contrib/rest/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/ivy.xml?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/rest/ivy.xml Sat Mar 19 21:48:11 2016
@@ -32,10 +32,10 @@
<dependencies>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false" conf="test->default" />
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false"/>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="test->default" />
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="asm" name="asm" rev="3.1" />
<dependency org="com.sun.grizzly" name="grizzly-servlet-webserver" rev="1.9.8" />
<dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" />
Modified: zookeeper/trunk/src/contrib/zooinspector/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/ivy.xml?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/zooinspector/ivy.xml Sat Mar 19 21:48:11 2016
@@ -35,9 +35,9 @@
<dependency org="com.google.guava" name="guava" rev="18.0" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false" conf="test->default" />
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" transitive="false"/>
- <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="test->default" />
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
rev="0.6" conf="releaseaudit->default"/>
Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1735820&r1=1735819&r2=1735820&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Sat Mar 19 21:48:11 2016
@@ -260,7 +260,7 @@ server.3=zoo3:2888:3888</programlisting>
<para>If your configuration file is set up, you can start a
ZooKeeper server:</para>
- <para><computeroutput>$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.16.jar:conf \
+ <para><computeroutput>$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf \
org.apache.zookeeper.server.quorum.QuorumPeerMain zoo.cfg
</computeroutput></para>
@@ -286,7 +286,7 @@ server.3=zoo3:2888:3888</programlisting>
<para>In Java, you can run the following command to execute
simple operations:</para>
- <para><computeroutput>$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.16.jar:conf:src/java/lib/jline-2.11.jar \
+ <para><computeroutput>$ java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf:src/java/lib/jline-2.11.jar \
org.apache.zookeeper.ZooKeeperMain -server 127.0.0.1:2181</computeroutput></para>
</listitem>
@@ -543,7 +543,7 @@ server.3=zoo3:2888:3888</programlisting>
can be run as a cron job on the ZooKeeper server machines to
clean up the logs daily.</para>
- <programlisting> java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.16.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></programlisting>
+ <programlisting> java -cp zookeeper.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></programlisting>
<para>Automatic purging of the snapshots and corresponding
transaction logs was introduced in version 3.4.0 and can be
@@ -620,7 +620,7 @@ server.3=zoo3:2888:3888</programlisting>
<para>
ZooKeeper uses <emphasis role="bold"><ulink url="http://www.slf4j.org">SLF4J</ulink></emphasis>
- version 1.7 as its logging infrastructure. For backward compatibility it is bound to
+ version 1.7.5 as its logging infrastructure. For backward compatibility it is bound to
<emphasis role="bold">LOG4J</emphasis> but you can use
<emphasis role="bold"><ulink url="http://logback.qos.ch/">LOGBack</ulink></emphasis>
or any other supported logging framework of your choice.
Added: zookeeper/trunk/src/java/lib/log4j-1.2.17.LICENSE.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/lib/log4j-1.2.17.LICENSE.txt?rev=1735820&view=auto
==============================================================================
--- zookeeper/trunk/src/java/lib/log4j-1.2.17.LICENSE.txt (added)
+++ zookeeper/trunk/src/java/lib/log4j-1.2.17.LICENSE.txt Sat Mar 19 21:48:11 2016
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed 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.