You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/12/17 13:17:33 UTC
svn commit: r1215476 - in /felix/trunk/webconsole: ./
src/main/appended-resources/ src/main/appended-resources/META-INF/
src/main/bare-resources/
Author: fmeschbe
Date: Sat Dec 17 12:17:32 2011
New Revision: 1215476
URL: http://svn.apache.org/viewvc?rev=1215476&view=rev
Log:
FELIX-3280 Upgrade to Parent POM 2.1
- cleanup license files
- remove old license files
- make sure only exported package JavaDoc is generated
- exclude JQuery JS, CSS and HTML temaples from RAT check
Added:
felix/trunk/webconsole/src/main/appended-resources/
felix/trunk/webconsole/src/main/appended-resources/META-INF/
felix/trunk/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES
- copied, changed from r1187718, felix/trunk/webconsole/src/main/bare-resources/DEPENDENCIES
felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE
- copied, changed from r1187718, felix/trunk/webconsole/src/main/bare-resources/LICENSE
felix/trunk/webconsole/src/main/appended-resources/META-INF/NOTICE
- copied, changed from r1187718, felix/trunk/webconsole/src/main/bare-resources/NOTICE
Removed:
felix/trunk/webconsole/DEPENDENCIES
felix/trunk/webconsole/LICENSE
felix/trunk/webconsole/NOTICE
felix/trunk/webconsole/src/main/bare-resources/DEPENDENCIES
felix/trunk/webconsole/src/main/bare-resources/LICENSE
felix/trunk/webconsole/src/main/bare-resources/NOTICE
Modified:
felix/trunk/webconsole/pom.xml
Modified: felix/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=1215476&r1=1215475&r2=1215476&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Sat Dec 17 12:17:32 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>2.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
@@ -132,6 +132,36 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <excludePackageNames>
+ *.internal
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>src/main/appended-resources/**</exclude>
+ <exclude>src/main/resources/res/lib/jquery-1.3.2.js</exclude>
+ <exclude>src/main/resources/res/lib/jquery-ui-1.7.2.js</exclude>
+ <exclude>src/main/resources/res/lib/jquery-ui-i18n-1.7.2.js</exclude>
+ <exclude>src/main/resources/res/lib/jquery.cookies-2.2.0.js</exclude>
+ <exclude>src/main/resources/res/lib/jquery.multifile-1.4.6.js</exclude>
+ <exclude>src/main/resources/res/lib/jquery.tablesorter-2.0.3.js</exclude>
+ <exclude>src/main/resources/res/lib/reset-min.css</exclude>
+ <exclude>src/main/resources/res/lib/themes/**</exclude>
+ <exclude>src/main/resources/res/ui/ui.tabs.paging.js</exclude>
+ <exclude>src/main/resources/templates/*.html</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Copied: felix/trunk/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES (from r1187718, felix/trunk/webconsole/src/main/bare-resources/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/webconsole/src/main/bare-resources/DEPENDENCIES&r1=1187718&r2=1215476&rev=1215476&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/bare-resources/DEPENDENCIES (original)
+++ felix/trunk/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES Sat Dec 17 12:17:32 2011
@@ -1,11 +1,3 @@
-Apache Felix OSGi Web Console
-Copyright 2007-2011 The Apache Software Foundation
-
-This software was developed at the Apache Software Foundation
-(http://www.apache.org) and may have dependencies on other
-Apache software licensed under Apache License 2.0.
-
-
I. Included Third-Party Software
This product includes software developed at
Copied: felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE (from r1187718, felix/trunk/webconsole/src/main/bare-resources/LICENSE)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE?p2=felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE&p1=felix/trunk/webconsole/src/main/bare-resources/LICENSE&r1=1187718&r2=1215476&rev=1215476&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/bare-resources/LICENSE (original)
+++ felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE Sat Dec 17 12:17:32 2011
@@ -1,206 +1,4 @@
- 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.
-
APACHE FELIX OSGI WEB CONSOLE SUBCOMPONENTS:
Copied: felix/trunk/webconsole/src/main/appended-resources/META-INF/NOTICE (from r1187718, felix/trunk/webconsole/src/main/bare-resources/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/appended-resources/META-INF/NOTICE?p2=felix/trunk/webconsole/src/main/appended-resources/META-INF/NOTICE&p1=felix/trunk/webconsole/src/main/bare-resources/NOTICE&r1=1187718&r2=1215476&rev=1215476&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/bare-resources/NOTICE (original)
+++ felix/trunk/webconsole/src/main/appended-resources/META-INF/NOTICE Sat Dec 17 12:17:32 2011
@@ -1,10 +1,3 @@
-Apache Felix OSGi Web Console
-Copyright 2007-2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
This product includes icons from the Silk Icon set
(http://www.famfamfam.com/lab/icons/silk/)
Copyright (c) 2006 Mark James