You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by at...@apache.org on 2009/05/16 17:23:51 UTC
svn commit: r775485 - in /portals/applications:
dbbrowser/trunk/dbbrowser-jar/src/main/appended-resources/META-INF/
dbbrowser/trunk/dbbrowser-war/src/main/appended-resources/META-INF/
demo/trunk/ demo/trunk/src/main/appended-resources/ demo/trunk/src/m...
Author: ate
Date: Sat May 16 15:23:49 2009
New Revision: 775485
URL: http://svn.apache.org/viewvc?rev=775485&view=rev
Log:
APA-13: some cleanup and further additions (but still incomplete) of required redistribution license files
Added:
portals/applications/demo/trunk/LICENSE
portals/applications/demo/trunk/NOTICE
portals/applications/demo/trunk/src/main/appended-resources/
portals/applications/demo/trunk/src/main/appended-resources/META-INF/
portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm (with props)
portals/applications/demo/trunk/src/main/webapp/META-INF/ANTLR2-LICENSE
portals/applications/demo/trunk/src/main/webapp/META-INF/ASM-LICENSE
portals/applications/rss/trunk/rss-war/src/main/webapp/META-INF/JDOM-LICENSE
Modified:
portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/appended-resources/META-INF/NOTICE.vm
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/appended-resources/META-INF/NOTICE.vm
portals/applications/demo/trunk/pom.xml
portals/applications/gems/trunk/src/main/appended-resources/META-INF/NOTICE.vm
portals/applications/rss/trunk/rss-war/src/main/appended-resources/META-INF/NOTICE.vm
portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm
portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm
Modified: portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -1,3 +1 @@
-This product includes software developed from
-
-slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
\ No newline at end of file
+slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -1,3 +1 @@
-This product includes software developed from
-
-slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
\ No newline at end of file
+slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
Added: portals/applications/demo/trunk/LICENSE
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/LICENSE?rev=775485&view=auto
==============================================================================
--- portals/applications/demo/trunk/LICENSE (added)
+++ portals/applications/demo/trunk/LICENSE Sat May 16 15:23:49 2009
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
Added: portals/applications/demo/trunk/NOTICE
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/NOTICE?rev=775485&view=auto
==============================================================================
--- portals/applications/demo/trunk/NOTICE (added)
+++ portals/applications/demo/trunk/NOTICE Sat May 16 15:23:49 2009
@@ -0,0 +1,9 @@
+Apache Portals Applications Database Browser
+Copyright 2008-2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/
+
+This product includes software developed from
+
+slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
\ No newline at end of file
Modified: portals/applications/demo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Sat May 16 15:23:49 2009
@@ -212,9 +212,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
- <build>
- <finalName>apa-demo</finalName>
- </build>
<!-- Project Information -->
@@ -224,4 +221,48 @@
<url>http://svn.apache.org/viewcvs.cgi/portals/applications/demo/trunk</url>
</scm>
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <attached>false</attached>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- only include this in top level project poms -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Added: portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&view=auto
==============================================================================
--- portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -0,0 +1,4 @@
+slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
+asm from Object Web (http://asm.ow2.org) Copyright (c) 2000-2005 INRIA, France Telecom
+antlr2 from http://www.antlr2.org/ provided to the public domain
+
Propchange: portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/applications/demo/trunk/src/main/appended-resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/applications/demo/trunk/src/main/webapp/META-INF/ANTLR2-LICENSE
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/META-INF/ANTLR2-LICENSE?rev=775485&view=auto
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/META-INF/ANTLR2-LICENSE (added)
+++ portals/applications/demo/trunk/src/main/webapp/META-INF/ANTLR2-LICENSE Sat May 16 15:23:49 2009
@@ -0,0 +1,16 @@
+ANTLR 2 License
+
+We reserve no legal rights to the ANTLR--it is fully in the public domain.
+An individual or company may do whatever they wish with source code distributed
+with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR,
+or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However, we do ask that
+credit is given to us for developing ANTLR. By "credit", we mean that if you use
+ANTLR or incorporate any source code into one of your programs (commercial
+product, research project, or otherwise) that you acknowledge this fact
+somewhere in the documentation, research report, etc... If you like ANTLR and
+have developed a nice tool with the output, please mention that you developed it
+using ANTLR. In addition, we ask that the headers remain intact in our source
+code. As long as these guidelines are kept, we expect to continue enhancing this
+system and expect to make other tools available as they are completed.
Added: portals/applications/demo/trunk/src/main/webapp/META-INF/ASM-LICENSE
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/META-INF/ASM-LICENSE?rev=775485&view=auto
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/META-INF/ASM-LICENSE (added)
+++ portals/applications/demo/trunk/src/main/webapp/META-INF/ASM-LICENSE Sat May 16 15:23:49 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.
+
Modified: portals/applications/gems/trunk/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/gems/trunk/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ portals/applications/gems/trunk/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -1,5 +1,3 @@
-This product includes software developed from
-
slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
Springframework from Spring Source (http://www.springframework.org) licensed under the Apache License, Version 2.0.
-SWFHeader & PackedBitObj from www.brooksandrus.com (http://www.brooksandrus.com) licensed under the MIT license
\ No newline at end of file
+SWFHeader & PackedBitObj from www.brooksandrus.com (http://www.brooksandrus.com) licensed under the MIT license
Modified: portals/applications/rss/trunk/rss-war/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-war/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-war/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ portals/applications/rss/trunk/rss-war/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -1,5 +1,4 @@
-
slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
Springframework from Spring Source (http://www.springframework.org) licensed under the Apache License, Version 2.0.
Rome from rome.dev.java.net (https://rome.dev.java.net/) licensed under the Apache License, Version 2.0.
-Jdom from Jdom.org(http://www.jdom.org) Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
\ No newline at end of file
+Jdom from Jdom.org(http://www.jdom.org) Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
Added: portals/applications/rss/trunk/rss-war/src/main/webapp/META-INF/JDOM-LICENSE
URL: http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-war/src/main/webapp/META-INF/JDOM-LICENSE?rev=775485&view=auto
==============================================================================
--- portals/applications/rss/trunk/rss-war/src/main/webapp/META-INF/JDOM-LICENSE (added)
+++ portals/applications/rss/trunk/rss-war/src/main/webapp/META-INF/JDOM-LICENSE Sat May 16 15:23:49 2009
@@ -0,0 +1,56 @@
+/*--
+
+ $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
+
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ 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 disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``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 THE JDOM AUTHORS OR THE PROJECT
+ 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.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
Modified: portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -1,4 +1,3 @@
-
slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
castor from castor.org (http://www.castor.org) licensed under the Apache License, Version 2.0
-nekohtml from nekohtml.sourceforge.net (http://nekohtml.sourceforge.net) licensed under the Apache License, Version 2.0
\ No newline at end of file
+nekohtml from nekohtml.sourceforge.net (http://nekohtml.sourceforge.net) licensed under the Apache License, Version 2.0
Modified: portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm?rev=775485&r1=775484&r2=775485&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm Sat May 16 15:23:49 2009
@@ -1,4 +1,3 @@
-
slf4j from QOS.ch (http://slf4j.org) licensed under the X11 license
castor from castor.org (http://www.castor.org) licensed under the Apache License, Version 2.0
-nekohtml from nekohtml.sourceforge.net (http://nekohtml.sourceforge.net) licensed under the Apache License, Version 2.0
\ No newline at end of file
+nekohtml from nekohtml.sourceforge.net (http://nekohtml.sourceforge.net) licensed under the Apache License, Version 2.0