You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/08/19 22:50:54 UTC

svn commit: r805967 - in /james/mailet/crypto/trunk: LICENSE.apache LICENSE.txt NOTICE.txt src/assemble/bin.xml

Author: rdonkin
Date: Wed Aug 19 20:50:53 2009
New Revision: 805967

URL: http://svn.apache.org/viewvc?rev=805967&view=rev
Log:
MAILETCRYPTO-8 Update maven build so that it doesn't refer to stage https://issues.apache.org/jira/browse/MAILETCRYPTO-8

Removed:
    james/mailet/crypto/trunk/LICENSE.apache
Modified:
    james/mailet/crypto/trunk/LICENSE.txt
    james/mailet/crypto/trunk/NOTICE.txt
    james/mailet/crypto/trunk/src/assemble/bin.xml

Modified: james/mailet/crypto/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/LICENSE.txt?rev=805967&r1=805966&r2=805967&view=diff
==============================================================================
--- james/mailet/crypto/trunk/LICENSE.txt (original)
+++ james/mailet/crypto/trunk/LICENSE.txt Wed Aug 19 20:50:53 2009
@@ -174,27 +174,4 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-   
-   
-   
-
-   THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
-   FOLLOWING LICENSES:
-   
-   BouncyCastle, MIT License 
-     (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
-     http://www.bouncycastle.org/licence.html
-     
-   JavaBeans Activation Framework, CDDL License
-     http://glassfish.dev.java.net/public/CDDLv1.0.html
-     
-   JavaMail, CDDL License
-     http://glassfish.dev.java.net/public/CDDLv1.0.html
- 
-   JUnit, Common Public License - v 1.0
-     http://www.junit.org/
-     
-   Bnd, Bundle Tool, The Apache License, Version 2.0
-     http://www.aqute.biz/Code/Bnd
- 
-      
\ No newline at end of file
+      

Modified: james/mailet/crypto/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/NOTICE.txt?rev=805967&r1=805966&r2=805967&view=diff
==============================================================================
--- james/mailet/crypto/trunk/NOTICE.txt (original)
+++ james/mailet/crypto/trunk/NOTICE.txt Wed Aug 19 20:50:53 2009
@@ -1,21 +1,5 @@
-   =========================================================================
-   ==      NOTICE file for use with the Apache License, Version 2.0,      ==
-   =========================================================================
-
    Apache JAMES Crytographic Mailets
    Copyright 2009 The Apache Software Foundation
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).
-
-   This product also includes software developed by :
-     - Sun Microsystems (http://java.sun.com/)
-     - The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-   This product may include software developed at
-   aQute / Peter Kriens (http://www.aqute.biz/)
-   Package in stage\biz.aQute\jars\bnd-0.0.249.jar
-   License in stage\biz.aQute\jars\bnd-0.0.249.LICENSE
-
-   Please read the LICENSE.txt and README.txt files in the root directory of 
-   this distribution.

Modified: james/mailet/crypto/trunk/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/src/assemble/bin.xml?rev=805967&r1=805966&r2=805967&view=diff
==============================================================================
--- james/mailet/crypto/trunk/src/assemble/bin.xml (original)
+++ james/mailet/crypto/trunk/src/assemble/bin.xml Wed Aug 19 20:50:53 2009
@@ -46,43 +46,10 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>stage/javax.mail/jars/</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>mail.LICENSE</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>stage/javax.activation/jars/</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>activation.LICENSE</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>stage/org.bouncycastle/jars/</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>BouncyCastle.LICENSE</include>
-      </includes>
-    </fileSet>
-    <fileSet>
       <directory>target/site/apidocs</directory>
       <outputDirectory>javadocs</outputDirectory>
     </fileSet>
   </fileSets>
-  <files>
-    <file>
-      <source>LICENSE.apache</source>
-      <outputDirectory>lib</outputDirectory>
-      <destName>apache-mailet-LICENSE</destName>
-    </file>
-    <file>
-      <source>LICENSE.apache</source>
-      <outputDirectory>lib</outputDirectory>
-      <destName>apache-mailet-base.LICENSE</destName>
-    </file>
-  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib/</outputDirectory>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org