[prev in list] [next in list] [prev in thread] [next in thread] 

List:       james-dev
Subject:    svn commit: r164453 - in /james/server/branches/merge_v2_and_trunk/lib: ./
From:       noel () apache ! org
Date:       2005-04-24 6:43:12
Message-ID: 20050424064313.77346.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: noel
Date: Sat Apr 23 23:43:12 2005
New Revision: 164453

URL: http://svn.apache.org/viewcvs?rev=164453&view=rev
Log:
commit merged lib/ directory

Added:
    james/server/branches/merge_v2_and_trunk/lib/
      - copied from r164345, james/server/trunk/lib/
    james/server/branches/merge_v2_and_trunk/lib/dnsjava-1.6.2.jar
      - copied unchanged from r164345, \
james/server/branches/branch_2_1_fcs/lib/dnsjava-1.6.2.jar  \
                james/server/branches/merge_v2_and_trunk/lib/jakarta-oro-2.0.8.jar
      - copied unchanged from r164345, \
james/server/branches/branch_2_1_fcs/lib/jakarta-oro-2.0.8.jar Removed:
    james/server/branches/merge_v2_and_trunk/lib/commons-dbcp-1.1.jar
    james/server/branches/merge_v2_and_trunk/lib/commons-pool-1.1.jar
    james/server/branches/merge_v2_and_trunk/lib/dnsjava-1.4.3.jar
    james/server/branches/merge_v2_and_trunk/lib/jakarta-oro-2.0.1.jar
Modified:
    james/server/branches/merge_v2_and_trunk/lib/BouncyCastle.LICENSE
    james/server/branches/merge_v2_and_trunk/lib/readme.xml

Modified: james/server/branches/merge_v2_and_trunk/lib/BouncyCastle.LICENSE
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/lib/BouncyCastle.LICENSE?rev=164453&r1=164345&r2=164453&view=diff
 ==============================================================================
--- james/server/branches/merge_v2_and_trunk/lib/BouncyCastle.LICENSE (original)
+++ james/server/branches/merge_v2_and_trunk/lib/BouncyCastle.LICENSE Sat Apr 23 \
23:43:12 2005 @@ -1,22 +1,22 @@
-Copyright (c) 2000 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-[http://www.bouncycastle.org/license.html]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions: 
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software. 
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-
+Copyright (c) 2000 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+[http://www.bouncycastle.org/license.html]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions: 
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+

Modified: james/server/branches/merge_v2_and_trunk/lib/readme.xml
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/lib/readme.xml?rev=164453&r1=164345&r2=164453&view=diff
 ==============================================================================
--- james/server/branches/merge_v2_and_trunk/lib/readme.xml (original)
+++ james/server/branches/merge_v2_and_trunk/lib/readme.xml Sat Apr 23 23:43:12 2005
@@ -160,5 +160,5 @@
 CVS mailing list : openejb-cvs@exolab.org
          Website : www.OpenEJB.org
 ================================================================
-$Id: readme.xml,v 1.3 2003/01/08 06:03:11 serge Exp $
+$Id$
 



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


[prev in list] [next in list] [prev in thread] [next in thread]