geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r675682 [15/15] - in /geronimo/devtools/eclipse-plugin/trunk/features: org.apache.geronimo.feature/ org.apache.geronimo.server.jetty.v20.feature/ org.apache.geronimo.server.jetty.v21.feature/ org.apache.geronimo.server.tomcat.v20.feature/ o...
Date Thu, 10 Jul 2008 19:05:37 GMT
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/feature.xml?rev=675682&r1=675681&r2=675682&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/feature.xml
Thu Jul 10 12:05:36 2008
@@ -1,47 +1,47 @@
-<?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.
-  -->
-
-<!-- $Rev: 674823 $ $Date: 2008-07-08 09:47:08 -0400 (Tue, 08 Jul 2008) $ -->
-
-<feature
-      id="org.apache.geronimo.server.tomcat.v21.feature"
-      label="Geronimo v2.1 Tomcat Server"
-      version="2.1.2"
-      provider-name="%providerName"
-      image="bigG.gif">
-
-   <description url="http://geronimo.apache.org/">
-        %description
-   </description>
-
-   <copyright url="http://www.apache.org/licenses/LICENSE-2.0.html">
-        %copyright
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
-        %license
-   </license>
-   
-   <data
-    id="geronimo-tomcat6-javaee5-2.1.2.zip"
-    download-size="76977"
-    install-size="143977"/>
-   
-    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
-   
-</feature>
+<?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.
+  -->
+
+<!-- $Rev: 674823 $ $Date: 2008-07-08 09:47:08 -0400 (Tue, 08 Jul 2008) $ -->
+
+<feature
+      id="org.apache.geronimo.server.tomcat.v21.feature"
+      label="Geronimo v2.1 Tomcat Server"
+      version="2.1.2"
+      provider-name="%providerName"
+      image="bigG.gif">
+
+   <description url="http://geronimo.apache.org/">
+        %description
+   </description>
+
+   <copyright url="http://www.apache.org/licenses/LICENSE-2.0.html">
+        %copyright
+   </copyright>
+
+   <license url="license.html">
+        %license
+   </license>
+   
+   <data
+    id="geronimo-tomcat6-javaee5-2.1.2.zip"
+    download-size="76977"
+    install-size="143977"/>
+   
+    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
+   
+</feature>

Added: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/license.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/license.html?rev=675682&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/license.html
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/license.html
Thu Jul 10 12:05:36 2008
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h3>License</h3>
+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.
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/license.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/license.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/pom.xml?rev=675682&r1=675681&r2=675682&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/pom.xml
Thu Jul 10 12:05:36 2008
@@ -37,6 +37,8 @@
                     <include>feature.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>
@@ -45,6 +47,26 @@
                     <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>
+	    		<targetPath>about_files</targetPath>
+	    		<directory>.</directory>
+	    		<includes>
+	    			<include>LICENSE.txt</include>
+	    			<include>NOTICE.txt</include>
+	    		</includes>
+	    	</resource>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>license.html</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>..</directory>
                 <includes>



Mime
View raw message