portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r777747 - in /portals/jetspeed-2/portal/trunk: ./ jetspeed-installer/ jetspeed-installer/etc/ jetspeed-installer/etc/ant-installer/license/ jetspeed-installer/etc/tomcat/
Date Fri, 22 May 2009 23:52:36 GMT
Author: ate
Date: Fri May 22 23:52:35 2009
New Revision: 777747

URL: http://svn.apache.org/viewvc?rev=777747&view=rev
Log:
JS2-1018: Release 2.2.0 preparation
See: http://issues.apache.org/jira/browse/JS2-1018
- hopefully last bit of required license and notice files and updated rat exclusion filter
configuration for that

Added:
    portals/jetspeed-2/portal/trunk/JGOODIES-LICENSE   (contents, props changed)
      - copied, changed from r777729, portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/license/LICENSE-jgoodies.txt
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/ASM-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/CREATIVECOMMONS-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOJO-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOM4J-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JAVOLUTION-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JGOODIES-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JSCOOKMENU-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/MIT-LICENSE
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE   (contents, props
changed)
      - copied, changed from r777729, portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/NOTICE.txt
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/SLF4J-LICENSE
Removed:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/NOTICE.txt
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/license/
Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Copied: portals/jetspeed-2/portal/trunk/JGOODIES-LICENSE (from r777729, portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/license/LICENSE-jgoodies.txt)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/JGOODIES-LICENSE?p2=portals/jetspeed-2/portal/trunk/JGOODIES-LICENSE&p1=portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/license/LICENSE-jgoodies.txt&r1=777729&r2=777747&rev=777747&view=diff
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/portal/trunk/JGOODIES-LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/JGOODIES-LICENSE
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/ASM-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/ASM-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/ASM-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/ASM-LICENSE Fri May 22 23:52:35
2009
@@ -0,0 +1,30 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+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 following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
+

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/CREATIVECOMMONS-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/CREATIVECOMMONS-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/CREATIVECOMMONS-LICENSE
(added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/CREATIVECOMMONS-LICENSE
Fri May 22 23:52:35 2009
@@ -0,0 +1,67 @@
+Creative Commons Attribution-ShareAlike 2.5 License Agreement
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION
OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES
THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE
("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY
USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE
TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia,
in which the Work in its entirety in unmodified form, along with a number of other contributions,
constituting separate and independent works in themselves, are assembled into a collective
whole. A work that constitutes a Collective Work will not be considered a Derivative Work
(as defined below) for the purposes of this License.
+   2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing
works, such as a translation, musical arrangement, dramatization, fictionalization, motion
picture version, sound recording, art reproduction, abridgment, condensation, or any other
form in which the Work may be recast, transformed, or adapted, except that a work that constitutes
a Collective Work will not be considered a Derivative Work for the purpose of this License.
For the avoidance of doubt, where the Work is a musical composition or sound recording, the
synchronization of the Work in timed-relation with a moving image ("synching") will be considered
a Derivative Work for the purpose of this License.
+   3. "Licensor" means the individual or entity that offers the Work under the terms of this
License.
+   4. "Original Author" means the individual or entity who created the Work.
+   5. "Work" means the copyrightable work of authorship offered under the terms of this License.
+   6. "You" means an individual or entity exercising rights under this License who has not
previously violated the terms of this License with respect to the Work, or who has received
express permission from the Licensor to exercise rights under this License despite a previous
violation.
+   7. "License Elements" means the following high-level license attributes as selected by
Licensor and indicated in the title of this License: Attribution, ShareAlike.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any
rights arising from fair use, first sale or other limitations on the exclusive rights of the
copyright owner under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants
You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable
copyright) license to exercise the rights in the Work as stated below:
+
+   1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and
to reproduce the Work as incorporated in the Collective Works;
+   2. to create and reproduce Derivative Works;
+   3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform
publicly by means of a digital audio transmission the Work including as incorporated in Collective
Works;
+   4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform
publicly by means of a digital audio transmission Derivative Works.
+   5.
+
+      For the avoidance of doubt, where the work is a musical composition:
+         1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right
to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC),
royalties for the public performance or public digital performance (e.g. webcast) of the Work.
+         2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right
to collect, whether individually or via a music rights society or designated agent (e.g. Harry
Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and
distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright
Act (or the equivalent in other jurisdictions).
+   6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work
is a sound recording, Licensor waives the exclusive right to collect, whether individually
or via a performance-rights society (e.g. SoundExchange), royalties for the public digital
performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC
Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known or hereafter
devised. The above rights include the right to make such modifications as are technically
necessary to exercise the rights in other media and formats. All rights not expressly granted
by Licensor are hereby reserved.
+
+4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited
by the following restrictions:
+
+   1. You may distribute, publicly display, publicly perform, or publicly digitally perform
the Work only under the terms of this License, and You must include a copy of, or the Uniform
Resource Identifier for, this License with every copy or phonorecord of the Work You distribute,
publicly display, publicly perform, or publicly digitally perform. You may not offer or impose
any terms on the Work that alter or restrict the terms of this License or the recipients'
exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact
all notices that refer to this License and to the disclaimer of warranties. You may not distribute,
publicly display, publicly perform, or publicly digitally perform the Work with any technological
measures that control access or use of the Work in a manner inconsistent with the terms of
this License Agreement. The above applies to the Work as incorporated in a Collective Work,
but this does not require the Collective Wor
 k apart from the Work itself to be made subject to the terms of this License. If You create
a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove
from the Collective Work any credit as required by clause 4(c), as requested. If You create
a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove
from the Derivative Work any credit as required by clause 4(c), as requested.
+   2. You may distribute, publicly display, publicly perform, or publicly digitally perform
a Derivative Work only under the terms of this License, a later version of this License with
the same License Elements as this License, or a Creative Commons iCommons license that contains
the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must
include a copy of, or the Uniform Resource Identifier for, this License or other license specified
in the previous sentence with every copy or phonorecord of each Derivative Work You distribute,
publicly display, publicly perform, or publicly digitally perform. You may not offer or impose
any terms on the Derivative Works that alter or restrict the terms of this License or the
recipients' exercise of the rights granted hereunder, and You must keep intact all notices
that refer to this License and to the disclaimer of warranties. You may not distribute, publicly
display, publicly perform, or publicly digitally
  perform the Derivative Work with any technological measures that control access or use of
the Work in a manner inconsistent with the terms of this License Agreement. The above applies
to the Derivative Work as incorporated in a Collective Work, but this does not require the
Collective Work apart from the Derivative Work itself to be made subject to the terms of this
License.
+   3. If you distribute, publicly display, publicly perform, or publicly digitally perform
the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices
for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name
of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original
Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing
entity, journal) for attribution in Licensor's copyright notice, terms of service or by other
reasonable means, the name of such party or parties; the title of the Work if supplied; to
the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor
specifies to be associated with the Work, unless such URI does not refer to the copyright
notice or licensing information for the Work; and in the case of a Derivative Work, a credit
identifying the use of the Work in the Derivative Work (e.g.,
  "French translation of the Work by Original Author," or "Screenplay based on original Work
by Original Author"). Such credit may be implemented in any reasonable manner; provided, however,
that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear
where any other comparable authorship credit appears and in a manner at least as prominent
as such other comparable authorship credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND
MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED,
STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS
DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT
WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL,
PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any
breach by You of the terms of this License. Individuals or entities who have received Derivative
Works or Collective Works from You under this License, however, will not have their licenses
terminated provided such individuals or entities remain in full compliance with those licenses.
Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for
the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor
reserves the right to release the Work under different license terms or to stop distributing
the Work at any time; provided, however that any such election will not serve to withdraw
this License (or any other license that has been, or is required to be, granted under the
terms of this License), and this License will continue in full force and effect unless terminated
as stated above.
+
+8. Miscellaneous
+
+   1. Each time You distribute or publicly digitally perform the Work or a Collective Work,
the Licensor offers to the recipient a license to the Work on the same terms and conditions
as the license granted to You under this License.
+   2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor
offers to the recipient a license to the original Work on the same terms and conditions as
the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law,
it shall not affect the validity or enforceability of the remainder of the terms of this License,
and without further action by the parties to this agreement, such provision shall be reformed
to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented
to unless such waiver or consent shall be in writing and signed by the party to be charged
with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the
Work licensed here. There are no understandings, agreements or representations with respect
to the Work not specified here. Licensor shall not be bound by any additional provisions that
may appear in any communication from You. This License may not be modified without the mutual
written agreement of the Licensor and You.
+
+Creative Commons is not a party to this License, and makes no warranty whatsoever in connection
with the Work. Creative Commons will not be liable to You or any party on any legal theory
for any damages whatsoever, including without limitation any general, special, incidental
or consequential damages arising in connection to this license. Notwithstanding the foregoing
two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder,
it shall have all rights and obligations of Licensor.
+
+Except for the limited purpose of indicating to the public that the Work is licensed under
the CCPL, neither party will use the trademark "Creative Commons" or any related trademark
or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted
use will be in compliance with Creative Commons' then-current trademark usage guidelines,
as may be published on its website or otherwise made available upon request from time to time.
+
+Creative Commons may be contacted at http://creativecommons.org/.

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOJO-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOJO-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOJO-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOJO-LICENSE Fri May 22
23:52:35 2009
@@ -0,0 +1,30 @@
+**********************
+The "New" BSD License:
+**********************
+	
+	Copyright (c) 2005-2009, The Dojo Foundation
+	All rights reserved.
+	
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	
+	  * Redistributions of source code must retain the above copyright notice, this
+	    list of conditions and the following disclaimer.
+	  * Redistributions in binary form must reproduce the above copyright notice,
+	    this list of conditions and the following disclaimer in the documentation
+	    and/or other materials provided with the distribution.
+	  * Neither the name of the Dojo Foundation nor the names of its contributors
+	    may be used to endorse or promote products derived from this software
+	    without specific prior written permission.
+	
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+	ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
+	
\ No newline at end of file

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOM4J-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOM4J-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOM4J-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/DOM4J-LICENSE Fri May 22
23:52:35 2009
@@ -0,0 +1,11 @@
+ Redistribution and use of this software and associated documentation ("Software"), with
or without modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain copyright statements and notices. Redistributions
must also contain a copy of this document.
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
of conditions and the following disclaimer in the documentation and/or other materials provided
with the distribution.
+   3. The name "DOM4J" must not be used to endorse or promote products derived from this
Software without prior written permission of MetaStuff, Ltd. For written permission, please
contact dom4j-info@metastuff.com.
+   4. Products derived from this Software may not be called "DOM4J" nor may "DOM4J" appear
in their names without prior written permission of MetaStuff, Ltd. DOM4J is a registered trademark
of MetaStuff, Ltd.
+   5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``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 METASTUFF, LTD. OR
ITS 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.
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. 
\ No newline at end of file

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JAVOLUTION-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JAVOLUTION-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JAVOLUTION-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JAVOLUTION-LICENSE Fri May
22 23:52:35 2009
@@ -0,0 +1,25 @@
+* Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+* Copyright (c) 2005 - Javolution (http://javolution.org/)
+* 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 following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
+* 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.

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JGOODIES-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JGOODIES-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JGOODIES-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JGOODIES-LICENSE Fri May
22 23:52:35 2009
@@ -0,0 +1,31 @@
+
+           The BSD License for the JGoodies Looks
+           ======================================
+
+Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+ o Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer. 
+    
+ o Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution. 
+    
+ o Neither the name of JGoodies Karsten Lentzsch nor the names of 
+   its contributors may be used to endorse or promote products derived 
+   from this software without specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS 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 COPYRIGHT OWNER OR 
+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.

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JSCOOKMENU-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JSCOOKMENU-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JSCOOKMENU-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/JSCOOKMENU-LICENSE Fri May
22 23:52:35 2009
@@ -0,0 +1,19 @@
+JSCookMenu v1.4.  (c) Copyright 2002-2005 by Heng Yuan
+
+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,
+ITNESS 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.

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/MIT-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/MIT-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/MIT-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/MIT-LICENSE Fri May 22 23:52:35
2009
@@ -0,0 +1,19 @@
+Copyright (c) <2006> <http://www.brooksandrus.com>
+
+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.
\ No newline at end of file

Copied: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE (from r777729,
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/NOTICE.txt)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE?p2=portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE&p1=portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/NOTICE.txt&r1=777729&r2=777747&rev=777747&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/NOTICE.txt (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE Fri May 22 23:52:35
2009
@@ -1,12 +1,16 @@
 Apache Portals Jetspeed-2
-   Copyright 1999-2007 The Apache Software Foundation
+Copyright 1999-2009 The Apache Software Foundation
 
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
 
-   This product includes software from AntInstaller (http://antinstaller.sf.net)
-   Copyright 2001-2004 The Apache Software Foundation
+This product includes software developed from 
 
-   This product includes software from Karsten Lentzsch
-   Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All rights reserved.
-   
\ No newline at end of file
+JSCookMenu v1.4 FROM (c) Copyright 2002-2005 by Heng Yuan (http://jscook.yuanheng.org/JSCookMenu/copyright.html)
licensed under the JSCookMenu license
+Tango Free Desktop Icons (http://creativecommons.org/) licensed under the Creative Commons
Attribution-ShareAlike 2.5 License
+SWFObject v2.0 beta5 (http://code.google.com/p/swfobject) Copyright (c) 2007 Geoff Stearns,
Michael Williams, and Bobby van der Sluis licensed under the MIT License
+Dom4J 1.6.1 from the DOM4J Project (http://www.dom4j.org) Copyright 2001-2005 (C) MetaStuff,
Ltd licensed under BSD style license
+Javolution - Java(tm) Solution for Real-Time and Embedded Systems, Copyright (c) 2005 - Javolution
(http://javolution.org/) licensed under the BSD license
+AntInstaller (http://antinstaller.sf.net) Copyright 2001-2004 licensed under the Apache Software
License 2
+JGoodies Looks from Karsten Lentzsch Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All
rights reserved.
+Java compilation software for JSP pages is provided by Eclipse (http://www.eclipse.org),
which is open source software.
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/NOTICE
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/SLF4J-LICENSE
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/SLF4J-LICENSE?rev=777747&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/SLF4J-LICENSE (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/SLF4J-LICENSE Fri May 22
23:52:35 2009
@@ -0,0 +1,21 @@
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+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. 
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=777747&r1=777746&r2=777747&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Fri May 22 23:52:35 2009
@@ -74,6 +74,7 @@
                     <unzip src="resources/${tomcat.name}.zip" dest="${project.build.directory}"
                       overwrite="false"/>
 
+                    <delete file="${org.apache.jetspeed.portal.home}/NOTICE"/>
                     <delete file="${org.apache.jetspeed.portal.home}/bin/catalina.bat"/>
                     <delete file="${org.apache.jetspeed.portal.home}/bin/catalina.sh"/>
                     <delete file="${org.apache.jetspeed.portal.home}/conf/context.xml"/>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=777747&r1=777746&r2=777747&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri May 22 23:52:35 2009
@@ -1733,9 +1733,11 @@
             <artifactId>rat-maven-plugin</artifactId>            
             <configuration>
               <excludes combine.children="append">
+                <exclude>jetspeed-mvn-settings.xml</exclude>                
           
                 <exclude>MIT-LICENSE</exclude>                            
                 <exclude>JSCOOKMENU-LICENSE</exclude>              
                 <exclude>CREATIVECOMMONS-LICENSE</exclude>  
+                <exclude>JGOODIES-LICENSE</exclude>                         
  
                 <exclude>docs/release/JETSPEED-2.0-ANNOUNCEMENT.txt</exclude>
                 <exclude>docs/release/JETSPEED-2.0-M1-README.txt</exclude>
                 <exclude>docs/release/JETSPEED-2.0-M2-README.txt</exclude>
@@ -1753,9 +1755,17 @@
                 <exclude>applications/jetspeed/src/main/webapp/javascript/swfobject/swfobject.js</exclude>
                 <exclude>components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/web-app_2_3.dtd</exclude>
                 <exclude>components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/web-app_2_3.dtd</exclude>
-                <exclude>jetspeed-installer/etc/ant-installer/license/LICENSE-dom.txt</exclude>
-                <exclude>jetspeed-installer/etc/ant-installer/license/LICENSE-jgoodies.txt</exclude>
-                <exclude>jetspeed-installer/etc/ant-installer/license/LICENSE-xerces.txt</exclude>
+                <!-- temporary download resources folder -->
+                <exclude>jetspeed-installer/resources/*</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/ASM-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/CREATIVECOMMONS-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/DOJO-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/DOM4J-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/JAVOLUTION-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/JGOODIES-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/JSCOOKMENU-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/MIT-LICENSE</exclude>
+                <exclude>jetspeed-installer/etc/tomcat/SLF4J-LICENSE</exclude>
                 <exclude>applications/jetspeed/src/main/webapp/META-INF/ASM-LICENSE</exclude>
                 <exclude>applications/jetspeed/src/main/webapp/META-INF/CREATIVECOMMONS-LICENSE</exclude>
                 <exclude>applications/jetspeed/src/main/webapp/META-INF/DOJO-LICENSE</exclude>



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


Mime
View raw message