You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by tk...@apache.org on 2008/06/25 19:21:56 UTC
svn commit: r671607 - in /geronimo/devtools/eclipse-plugin/trunk:
features/org.apache.geronimo.feature/
features/org.apache.geronimo.v20.feature/
features/org.apache.geronimo.v21.feature/
plugins/org.apache.geronimo.jee.v21.jaxbmodel/ plugins/org.apach...
Author: tkirby
Date: Wed Jun 25 10:21:56 2008
New Revision: 671607
URL: http://svn.apache.org/viewvc?rev=671607&view=rev
Log:
GERONIMODEVTOOLS-406 Display more and better NOTICE and LICENSE info before and after installation via Eclipse Update Manager
Add code comments.
Remove obsolete text in license.html saying links only work after installation
Modified:
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/license.html
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/license.html
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/license.html
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/license.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/license.html?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/license.html (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/license.html Wed Jun 25 10:21:56 2008
@@ -4,7 +4,5 @@
The license for this feature is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
<h3>Notices</h3>
The notices for this feature are found here in the <a href="about_files/NOTICE.txt">about_files/NOTICE.txt</a> file.
-<h3>Note</h3>
-The above links only work after the feature is installed.
</body>
</html>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml Wed Jun 25 10:21:56 2008
@@ -43,6 +43,8 @@
<include>bigG.gif</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -51,6 +53,12 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ This is the place/mechanism for user to see licenses associated with
+ all plugins in the feature. The plugin with all the unique content
+ is the runtime plugin, so use its licenses and notices to display to user.
+ -->
<resource>
<directory>.</directory>
<includes>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/license.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/license.html?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/license.html (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/license.html Wed Jun 25 10:21:56 2008
@@ -4,7 +4,5 @@
The license for this feature is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
<h3>Notices</h3>
The notices for this feature are found here in the <a href="about_files/NOTICE.txt">about_files/NOTICE.txt</a> file.
-<h3>Note</h3>
-The above links only work after the feature is installed.
</body>
</html>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/pom.xml Wed Jun 25 10:21:56 2008
@@ -43,6 +43,8 @@
<include>bigG.gif</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -51,6 +53,12 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ This is the place/mechanism for user to see licenses associated with
+ all plugins in the feature. The plugin with all the unique content
+ is the runtime plugin, so use its licenses and notices to display to user.
+ -->
<resource>
<directory>.</directory>
<includes>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/license.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/license.html?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/license.html (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/license.html Wed Jun 25 10:21:56 2008
@@ -4,7 +4,5 @@
The license for this feature is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
<h3>Notices</h3>
The notices for this feature are found here in the <a href="about_files/NOTICE.txt">about_files/NOTICE.txt</a> file.
-<h3>Note</h3>
-The above links only work after the feature is installed.
</body>
</html>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/pom.xml Wed Jun 25 10:21:56 2008
@@ -43,6 +43,8 @@
<include>bigG.gif</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -51,6 +53,12 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ This is the place/mechanism for user to see licenses associated with
+ all plugins in the feature. The plugin with all the unique content
+ is the runtime plugin, so use its licenses and notices to display to user.
+ -->
<resource>
<directory>.</directory>
<includes>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml Wed Jun 25 10:21:56 2008
@@ -64,6 +64,11 @@
<build>
<resources>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<directory>.</directory>
<includes>
@@ -78,6 +83,8 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Wed Jun 25 10:21:56 2008
@@ -42,6 +42,8 @@
<include>*.jar</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -50,6 +52,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Wed Jun 25 10:21:56 2008
@@ -45,6 +45,8 @@
<include>*.jar</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -53,6 +55,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Wed Jun 25 10:21:56 2008
@@ -45,6 +45,8 @@
<include>*.jar</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -53,6 +55,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Wed Jun 25 10:21:56 2008
@@ -57,7 +57,9 @@
<includes>
<include>Messages.properties</include>
</includes>
- </resource>
+ </resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -66,6 +68,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml Wed Jun 25 10:21:56 2008
@@ -58,6 +58,8 @@
<include>Messages.properties</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -66,6 +68,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml Wed Jun 25 10:21:56 2008
@@ -38,6 +38,8 @@
</includes>
</resource>
<resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<targetPath>META-INF</targetPath>
<directory>.</directory>
<includes>
@@ -45,6 +47,19 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml Wed Jun 25 10:21:56 2008
@@ -44,6 +44,8 @@
<include>Messages.properties</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -52,6 +54,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml Wed Jun 25 10:21:56 2008
@@ -39,6 +39,8 @@
<include>about.html</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -47,6 +49,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=671607&r1=671606&r2=671607&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml Wed Jun 25 10:21:56 2008
@@ -44,6 +44,8 @@
<include>Messages.properties</include>
</includes>
</resource>
+ <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
+ in the jar's meta-inf directory -->
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
@@ -52,6 +54,11 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
<resource>
<targetPath>about_files</targetPath>
<directory>.</directory>