Build, notice, and documentation updates for 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/branches/1.X@1807779 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index 3f59805..1d36b80 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,2 +1,5 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Apache Commons Jelly
+Copyright 2001-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/README-binary-dist.txt b/README-binary-dist.txt
index a5ff314..2788eda 100644
--- a/README-binary-dist.txt
+++ b/README-binary-dist.txt
@@ -1,4 +1,4 @@
- Copyright 2002,2004 The Apache Software Foundation.
+ Copyright 2001-2017 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.
@@ -15,9 +15,9 @@
Jelly
=====
-Welcome to Jakarta commons Jelly.
+Welcome to Apache Commons Jelly.
The home page of the project is at
- http://jakarta.apache.org/commons/jelly
+ http://commons.apache.org/commons/jelly
This binary distribution allows you to run jelly out of
the box. It is enough to have the java and jelly (or jelly.bat)
@@ -43,7 +43,7 @@
Please refer to the shipped documentation (in the docs directory) and the
project website for documentation for each tag-libraries and for example.
-Jakarta Commons Jelly is an open-source project of the Apache Software Foundation
+Apache Commons Jelly is an open-source project of the Apache Software Foundation
which relies on feedback of its users on both the issue tracking and the
mailing-lists. We look forward to hear from you!
diff --git a/README.txt b/README.txt
index 502f04c..0abefa5 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
- Copyright 2002,2004 The Apache Software Foundation.
+ Copyright 2001-2017 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.
@@ -15,19 +15,11 @@
Jelly
=====
-The primary build tool for this project is Maven.
-So all you should need to do is install Maven and just type
-
- maven
-
-Some common maven goals for building and testing this project are
-
- clean : cleans up the build so new builds will start from fresh
- test : just run the unit tests
- jar : compiles, runs unit tests and if they work build the jar
- javadoc : creates the javadoc
- site : build the complete documentation with reports, javadoc etc
- dist : creates a distribution
+The primary build tool for this project is Ant due to the need for
+flexibility in building elderly projects. More specifically, we have
+focused on building with Ant 1.6, and Java 1.5. For help with building
+the project see the BUILDING.md, as we have supplied the mechanics for
+using docker to build the project due to its antiquity.
Jelly contains a number of individual tag libraries which can be built
@@ -35,11 +27,12 @@
above commands to build the library you're interested in.
-For more help using Maven please go to
+For more help using Docker, please go to
- http://maven.apache.org
+ https://www.docker.com/
-Maven also supports the auto-generation of Ant build files so
-you may also be able to use Ant to build the code.
+For more help using Ant, please go to
+
+ http://ant.apache.org
Enjoy!
diff --git a/build.xml b/build.xml
index fbca3eb..27de8b3 100644
--- a/build.xml
+++ b/build.xml
@@ -99,6 +99,7 @@
<include name="${final.name}-tests.jar"/>
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
+ <include name="README-binary-dist.txt" />
<include name="RELEASE-NOTES.txt" />
<include name="docs/**" />
</fileset>
@@ -175,12 +176,12 @@
</fileset>
</copy>
<copy file="pom.xml" tofile="dist/${final.name}.pom" />
- <mkdir dir="dist/sources"/>
- <copy todir="dist/sources">
+ <mkdir dir="dist/sources/${final.name}-src"/>
+ <copy todir="dist/sources/${final.name}-src">
<fileset refid="sources"/>
</copy>
- <mkdir dir="dist/binaries"/>
- <copy todir="dist/binaries">
+ <mkdir dir="dist/binaries/${final.name}"/>
+ <copy todir="dist/binaries/${final.name}">
<fileset refid="binaries"/>
</copy>
<zip destfile="dist/${final.name}-bin.zip" basedir="dist/binaries"/>
diff --git a/pom.xml b/pom.xml
index c3ca0db..b40487d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,15 +365,15 @@
</organization>
<build>
<sourceDirectory>
- c:\home\Brett\cvs\apache\jakarta-commons\jelly/src/java
+ ${project.basedir}/src/java
</sourceDirectory>
<testSourceDirectory>
- c:\home\Brett\cvs\apache\jakarta-commons\jelly/src/test
+ ${project.basedir}/src/test
</testSourceDirectory>
<resources>
<resource>
<targetPath>META-INF</targetPath>
- <directory>c:\home\Brett\cvs\apache\jakarta-commons\jelly</directory>
+ <directory>${project.basedir}</directory>
<includes>
<include>NOTICE.txt</include>
</includes>
@@ -381,7 +381,7 @@
<resource>
<targetPath/>
<directory>
- c:\home\Brett\cvs\apache\jakarta-commons\jelly/src/java
+ ${project.basedir}/src/java
</directory>
<includes>
<include>**/*.properties</include>
