Author: sebb
Date: Wed Mar 7 17:11:39 2007
New Revision: 515874
URL: http://svn.apache.org/viewvc?view=rev&rev=515874
Log:
Move documentation jars to lib/doc
Added:
jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt (with props)
jakarta/jmeter/branches/rel-2-2/lib/doc/jdom-b9.jar (with props)
jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.4.jar (with props)
Removed:
jakarta/jmeter/branches/rel-2-2/legacy/LICENSE(jdom).txt
jakarta/jmeter/branches/rel-2-2/legacy/jdom-b9.jar
jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4.jar
Modified:
jakarta/jmeter/branches/rel-2-2/build.properties
jakarta/jmeter/branches/rel-2-2/build.xml
Modified: jakarta/jmeter/branches/rel-2-2/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.properties?view=diff&rev=515874&r1=515873&r2=515874
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/build.properties Wed Mar 7 17:11:39 2007
@@ -35,5 +35,7 @@
xerces.jar = ${lib.dir}/xercesImpl.jar
xml-apis.jar = ${lib.dir}/xml-apis.jar
-# The following jar is only needed for source distributions
-velocity.jar = ${lib.dir}/velocity-1.4.jar
\ No newline at end of file
+# The following jars are only needed for source distributions
+# They are used for building the documentation
+jdom-b9.jar = ${lib.doc}/jdom-b9.jar
+velocity.jar = ${lib.doc}/velocity-1.4.jar
\ No newline at end of file
Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diff&rev=515874&r1=515873&r2=515874
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Wed Mar 7 17:11:39 2007
@@ -250,13 +250,13 @@
<property name="dest.docs" value="docs"/>
<property name="dest.printable_docs" value="printable_docs"/>
- <!-- Directory where these 3rd party libraries will live -->
+ <!-- Directory where jars needed for creating documentation live -->
+ <property name="lib.doc" value="lib/doc"/>
+
+ <!-- Directory where these 3rd party libraries live -->
<property name="lib.dir" value="lib"/>
- <!-- Currently just for old version of jdom needed for Anakia -->
- <property name="legacy.dir" value="legacy"/>
-
- <!-- Directory where Optional 3rd party libraries will live -->
+ <!-- Directory where Optional 3rd party libraries live -->
<property name="lib.opt" value="lib/opt"/>
<!-- Other stuff -->
@@ -372,7 +372,7 @@
<!-- Anakia classpath -->
<path id="anakia.classpath">
<pathelement location="${velocity.jar}"/>
- <fileset dir="${legacy.dir}" includes="jdom-b9.jar"/>
+ <pathelement location="${jdom-b9.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${logkit.jar}"/>
</path>
@@ -1111,7 +1111,7 @@
<patternset refid="dist.sources"/>
<include name="${dest.docs}/api/**"/>
<include name="${velocity.jar}"/>
- <include name="${legacy.dir}/"/>
+ <include name="${jdom-b9.jar}/"/>
</patternset>
<!-- Invoke with -Djmeter.version=m.n
Added: jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE%28jdom%29.txt?view=auto&rev=515874
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt (added)
+++ jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt Wed Mar 7
17:11:39 2007
@@ -0,0 +1,56 @@
+/*--
+
+ $Id$
+
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
Propchange: jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: jakarta/jmeter/branches/rel-2-2/lib/doc/jdom-b9.jar
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/doc/jdom-b9.jar?view=auto&rev=515874
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/doc/jdom-b9.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.4.jar
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.4.jar?view=auto&rev=515874
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
