Author: henning
Date: Thu Aug 25 02:44:06 2005
New Revision: 240028
URL: http://svn.apache.org/viewcvs?rev=240028&view=rev
Log:
make the binary distribution contain the dependency libraries that we
are allowed to distribute. Add a notice which will be put into
/libs/.
Use the dist.bundle trick that we invented for Torque here, too.
Added:
jakarta/commons/proper/email/trunk/conf/LIBS-NOTICE.txt (with props)
Modified:
jakarta/commons/proper/email/trunk/maven.xml
jakarta/commons/proper/email/trunk/project.xml
Added: jakarta/commons/proper/email/trunk/conf/LIBS-NOTICE.txt
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/conf/LIBS-NOTICE.txt?rev=240028&view=auto
==============================================================================
--- jakarta/commons/proper/email/trunk/conf/LIBS-NOTICE.txt (added)
+++ jakarta/commons/proper/email/trunk/conf/LIBS-NOTICE.txt Thu Aug 25 02:44:06
2005
@@ -0,0 +1,11 @@
+This product requires two libraries which cannot be distributed with
+the binary distribution:
+
+* Sun Javamail, available from
+ http://java.sun.com/products/javamail/
+
+* Sun Activation Framework, available from
+ http://java.sun.com/products/javabeans/glasgow/jaf.html
+
+please download these two libraries separately and put mail.jar and
+activation.jar on your classpath to use Jakarta commons-email.
Propchange: jakarta/commons/proper/email/trunk/conf/LIBS-NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/commons/proper/email/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/maven.xml?rev=240028&r1=240027&r2=240028&view=diff
==============================================================================
--- jakarta/commons/proper/email/trunk/maven.xml (original)
+++ jakarta/commons/proper/email/trunk/maven.xml Thu Aug 25 02:44:06 2005
@@ -16,7 +16,10 @@
limitations under the License.
-->
-<project default="jar:jar">
+<project
+ xmlns:ant="jelly:ant"
+ xmlns:j="jelly:core"
+ default="jar:jar">
<!-- ================================================================== -->
<!-- START : C O M M O N S - B U I L D -->
@@ -56,8 +59,17 @@
<fileset file="${basedir}/NOTICE.txt"/>
<fileset file="${basedir}/RELEASE-NOTES.txt"/>
</copy>
+
+ <!-- include listed dependencies that we are allowed to distribute-->
+ <j:forEach var="dep" items="${pom.dependencies}">
+ <j:if test="${dep.getProperty('dist.bundle') != null &&
dep.getProperty('dist.bundle').equalsIgnoreCase('true')}">
+ <copy todir="${maven.dist.bin.assembly.dir}/lib"
+
file="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
+ </j:if>
+ </j:forEach>
+ <copy todir="${maven.dist.bin.assembly.dir}/lib">
+ <fileset file="${basedir}/conf/LIBS-NOTICE.txt"/>
+ </copy>
</preGoal>
</project>
-
-
Modified: jakarta/commons/proper/email/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/project.xml?rev=240028&r1=240027&r2=240028&view=diff
==============================================================================
--- jakarta/commons/proper/email/trunk/project.xml (original)
+++ jakarta/commons/proper/email/trunk/project.xml Thu Aug 25 02:44:06 2005
@@ -114,6 +114,16 @@
<email>[EMAIL PROTECTED]</email>
<roles/>
</developer>
+ <developer>
+ <name>Henning P. Schmiedehausen</name>
+ <id>henning</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste
mbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>2</timezone>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -143,27 +153,27 @@
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang.html</url>
- <properties/>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>javamail</groupId>
<artifactId>javamail</artifactId>
<version>1.3.2</version>
<url>http://java.sun.com/products/javamail/</url>
- <properties/>
</dependency>
<dependency>
<groupId>activation</groupId>
<artifactId>activation</artifactId>
<version>1.0.2</version>
<url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
- <properties/>
</dependency>
<dependency>
<groupId>dumbster</groupId>
<artifactId>dumbster</artifactId>
<version>1.6</version>
- <properties/>
+ <url>http://quintanasoft.com/dumbster/</url>
</dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
