Author: vkumar Date: Fri May 15 21:22:46 2009 New Revision: 775349 URL: http://svn.apache.org/viewvc?rev=775349&view=rev Log: Adding licenses and notice files Preparing for apa-webcontent 1.0 release
http://issues.apache.org/jira/browse/apa-13 Added: portals/applications/webcontent/trunk/LICENSE portals/applications/webcontent/trunk/NOTICE portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/ portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/ portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/ portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/ portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm Modified: portals/applications/webcontent/trunk/pom.xml portals/applications/webcontent/trunk/webcontent-jar/pom.xml portals/applications/webcontent/trunk/webcontent-war/pom.xml Added: portals/applications/webcontent/trunk/LICENSE URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/LICENSE?rev=775349&view=auto ============================================================================== --- portals/applications/webcontent/trunk/LICENSE (added) +++ portals/applications/webcontent/trunk/LICENSE Fri May 15 21:22:46 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/webcontent/trunk/NOTICE URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/NOTICE?rev=775349&view=auto ============================================================================== --- portals/applications/webcontent/trunk/NOTICE (added) +++ portals/applications/webcontent/trunk/NOTICE Fri May 15 21:22:46 2009 @@ -0,0 +1,9 @@ +Apache Portals Application Web Content Application +Copyright 2008-2009 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +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 Modified: portals/applications/webcontent/trunk/pom.xml URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/pom.xml?rev=775349&r1=775348&r2=775349&view=diff ============================================================================== --- portals/applications/webcontent/trunk/pom.xml (original) +++ portals/applications/webcontent/trunk/pom.xml Fri May 15 21:22:46 2009 @@ -1,60 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You 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. - - $Id$ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with this + work for additional information regarding copyright ownership. The ASF + licenses this file to You 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. $Id: pom.xml 765893 + 2009-04-17 08:05:43Z woonsan $ --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>2.0.4</maven> - </prerequisites> - - <!-- POM Identification --> - <parent> - <groupId>org.apache.portals</groupId> - <artifactId>applications-pom</artifactId> - <version>1.0</version> - </parent> - - <groupId>org.apache.portals.applications</groupId> - <artifactId>apa-webcontent</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Portals Web Content Application</name> - <description> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <!-- POM Identification --> + <parent> + <groupId>org.apache.portals</groupId> + <artifactId>applications-pom</artifactId> + <version>1.1</version> + </parent> + + <groupId>org.apache.portals.applications</groupId> + <artifactId>apa-webcontent</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Apache Portals Application Web Content Application</name> + <description> Web Content Application </description> - <!-- Application Modules --> - - <modules> - <module>webcontent-jar</module> - <module>webcontent-war</module> - </modules> - - <!-- Project Information --> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/portals/applications/webcontent</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/applications/webcontent</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/portals/applications/webcontent/</url> - </scm> + <!-- Application Modules --> + <modules> + <module>webcontent-jar</module> + <module>webcontent-war</module> + </modules> + + <!-- Project Information --> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/portals/applications/webcontent</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/applications/webcontent</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/portals/applications/webcontent/</url> + </scm> + + <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> Modified: portals/applications/webcontent/trunk/webcontent-jar/pom.xml URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/pom.xml?rev=775349&r1=775348&r2=775349&view=diff ============================================================================== --- portals/applications/webcontent/trunk/webcontent-jar/pom.xml (original) +++ portals/applications/webcontent/trunk/webcontent-jar/pom.xml Fri May 15 21:22:46 2009 @@ -1,27 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with this - work for additional information regarding copyright ownership. The ASF - licenses this file to You 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. $Id: pom.xml 765879 - 2009-04-17 07:36:52Z woonsan $ - --> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with this + work for additional information regarding copyright ownership. The ASF + licenses this file to You 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. $Id: pom.xml 765879 + 2009-04-17 07:36:52Z woonsan $ +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>2.0.4</maven> - </prerequisites> - <!-- POM Identification --> <parent> <groupId>org.apache.portals.applications</groupId> @@ -31,7 +27,7 @@ <artifactId>apa-webcontent-jar</artifactId> <packaging>jar</packaging> - <name>Portals Web Content Application JAR</name> + <name>Apache Portals Applications Web Content JAR</name> <properties> <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version> @@ -138,5 +134,16 @@ </dependency> </dependencies> - + <build> + <plugins> + <plugin> + <!-- only include this in top level project poms --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </plugin> + </plugins> + </build> </project> Added: 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=775349&view=auto ============================================================================== --- portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm (added) +++ portals/applications/webcontent/trunk/webcontent-jar/src/main/appended-resources/META-INF/NOTICE.vm Fri May 15 21:22:46 2009 @@ -0,0 +1,4 @@ + +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 Modified: portals/applications/webcontent/trunk/webcontent-war/pom.xml URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/pom.xml?rev=775349&r1=775348&r2=775349&view=diff ============================================================================== --- portals/applications/webcontent/trunk/webcontent-war/pom.xml (original) +++ portals/applications/webcontent/trunk/webcontent-war/pom.xml Fri May 15 21:22:46 2009 @@ -18,9 +18,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>2.0.4</maven> - </prerequisites> <!-- POM Identification --> <artifactId>apa-webcontent-war</artifactId> @@ -30,7 +27,7 @@ <version>1.0-SNAPSHOT</version> </parent> <packaging>war</packaging> - <name>Portals Web Content Application WAR</name> + <name>Apache Portals Applications Web Content WAR</name> <!-- Dependencies --> <properties> @@ -77,12 +74,12 @@ <artifactId>commons-digester</artifactId> <version>${commons-digester.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> @@ -90,4 +87,46 @@ <finalName>apa-webcontent</finalName> </build> + + <build> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <attach>false</attach> + </configuration> + </plugin> + <plugin> + <!-- only include this in top level project poms --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <skipAssembly>true</skipAssembly> + </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> + </project> Added: 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=775349&view=auto ============================================================================== --- portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm (added) +++ portals/applications/webcontent/trunk/webcontent-war/src/main/appended-resources/META-INF/NOTICE.vm Fri May 15 21:22:46 2009 @@ -0,0 +1,4 @@ + +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
