geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r509560 - in /geronimo/devtools/eclipse-plugin/trunk/features: ./ org.apache.geronimo.feature/ org.apache.geronimo.installableruntime.jetty.feature/ org.apache.geronimo.installableruntime.tomcat.feature/
Date Tue, 20 Feb 2007 13:56:30 GMT
Author: sppatel
Date: Tue Feb 20 05:56:29 2007
New Revision: 509560

URL: http://svn.apache.org/viewvc?view=rev&rev=509560
Log:
 r4203@sppatel (orig r483963):  sppatel | 2006-12-08 07:32:56 -0500
 create branch for 1.2.1
 
 r6115@sppatel (orig r497805):  sppatel | 2007-01-19 08:22:33 -0500
 fix compilation issues due to removed dependencies
 r6587@sppatel (orig r509559):  sppatel | 2007-02-20 08:54:00 -0500
 add required feature imamge for new installable server adapter support

Added:
    geronimo/devtools/eclipse-plugin/trunk/features/bigG.gif   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/features/   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Feb 20 05:56:29 2007
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1/features:509559

Added: geronimo/devtools/eclipse-plugin/trunk/features/bigG.gif
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/bigG.gif?view=auto&rev=509560
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/bigG.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?view=diff&rev=509560&r1=509559&r2=509560
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
Tue Feb 20 05:56:29 2007
@@ -1,39 +1,21 @@
 <?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$ $Date$ -->
-
 <feature
       id="org.apache.geronimo.feature"
       label="org.apache.geronimo.feature"
       version="${org.apache.geronimo.feature_version}"
-      provider-name="Apache Software Foundation">
+      provider-name="Apache Software Foundation"
+      image="bigG.gif">
 
    <description url="http://geronimo.apache.org/devtools">
-        %description
+      %description
    </description>
 
    <copyright url="http://www.apache.org/licenses/LICENSE-2.0.txt">
-        $copyright
+      $copyright
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">
-        %license
+      %license
    </license>
 
    <url>
@@ -41,40 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="com.ibm.etools.emf.event"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.wst.rdb.models.sql.edit"/>
-      <import plugin="org.eclipse.wst.rdb.models.sql"/>
-      <import plugin="org.eclipse.wst.rdb.models.dbdefinition"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.core.commands"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core"/>
-      <import plugin="org.apache.ant"/>
-      <import plugin="org.eclipse.wst.server.ui"/>
-      <import plugin="org.eclipse.jst.server.core"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.emf.mapping.xsd2ecore.editor"/>
-      <import plugin="org.eclipse.wst.web"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.jst.j2ee.ejb"/>
-      <import plugin="org.eclipse.jst.j2ee.jca"/>
-      <import plugin="org.eclipse.emf.common"/>
+      <import feature="org.eclipse.jst" version="1.5.3" match="compatible"/>
    </requires>
 
    <plugin
@@ -103,7 +52,7 @@
          install-size="0"
          version="${org.apache.geronimo.v11.deployment.model.edit_version}"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.geronimo.common.deployment.model.edit"
          download-size="0"
@@ -117,7 +66,7 @@
          install-size="0"
          version="${org.apache.geronimo.v11.deployment.model_version}"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.geronimo.common.deployment.model"
          download-size="0"
@@ -180,6 +129,12 @@
          install-size="0"
          version="${org.apache.geronimo.runtime.v11_version}"/>
          
+   <plugin
+         id="org.apache.geronimo.runtime.v12"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.geronimo.runtime.v12_version}"/>
+
    <plugin
          id="org.apache.geronimo.runtime.v12"
          download-size="0"

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?view=diff&rev=509560&r1=509559&r2=509560
==============================================================================
--- 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 Tue
Feb 20 05:56:29 2007
@@ -47,6 +47,12 @@
                     <include>NOTICE</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>..</directory>
+                <includes>
+                    <include>bigG.gif</include>
+                </includes>
+            </resource>
         </resources>
     </build>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml?view=diff&rev=509560&r1=509559&r2=509560
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
Tue Feb 20 05:56:29 2007
@@ -22,7 +22,8 @@
       id="org.apache.geronimo.installableruntime.jetty.feature"
       label="org.apache.geronimo.installableruntime.jetty.feature"
       version="${org.apache.geronimo.installableruntime.jetty.feature_version}"
-      provider-name="Apache.org">
+      provider-name="Apache Software Foundation"
+      image="bigG.gif">
 
    <description url="http://geronimo.apache.org/">
         %description

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml?view=diff&rev=509560&r1=509559&r2=509560
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
Tue Feb 20 05:56:29 2007
@@ -14,45 +14,49 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <!-- $Rev$ $Date$ -->
-
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
-  <packaging>jar</packaging>
-  <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
-  <name>${artifactId}</name>
-  <parent>
-    <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>eclipse-features-parent</artifactId>
-    <version>1.0</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>feature.xml</include>
-          <include>feature.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>..</directory>
-        <includes>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>maven-geronimodevtools-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
+    <packaging>jar</packaging>
+    <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>eclipse-features-parent</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>feature.xml</include>
+                    <include>feature.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>..</directory>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>..</directory>
+                <includes>
+                    <include>bigG.gif</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-geronimodevtools-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml?view=diff&rev=509560&r1=509559&r2=509560
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
Tue Feb 20 05:56:29 2007
@@ -22,7 +22,8 @@
       id="org.apache.geronimo.installableruntime.tomcat.feature"
       label="org.apache.geronimo.installableruntime.tomcat.feature"
       version="${org.apache.geronimo.installableruntime.tomcat.feature_version}"
-      provider-name="Apache.org">
+      provider-name="Apache Software Foundation"
+      image="bigG.gif">
 
    <description url="http://geronimo.apache.org/">
         %description

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml?view=diff&rev=509560&r1=509559&r2=509560
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
Tue Feb 20 05:56:29 2007
@@ -14,45 +14,49 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <!-- $Rev$ $Date$ -->
-
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
-  <packaging>jar</packaging>
-  <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
-  <name>${artifactId}</name>
-  <parent>
-    <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>eclipse-features-parent</artifactId>
-    <version>1.0</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>feature.xml</include>
-          <include>feature.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>..</directory>
-        <includes>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>maven-geronimodevtools-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
+    <packaging>jar</packaging>
+    <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>eclipse-features-parent</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>feature.xml</include>
+                    <include>feature.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>..</directory>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>..</directory>
+                <includes>
+                    <include>bigG.gif</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-geronimodevtools-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>



Mime
View raw message