You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/12/05 01:37:36 UTC
svn commit: r353945 - in /geronimo/devtools/trunk/modules/eclipse-plugin: ./
features/org.apache.geronimo.feature.source/
features/org.apache.geronimo.feature/
plugins/org.apache.geronimo.devtools.eclipse.core/
Author: sppatel
Date: Sun Dec 4 16:37:31 2005
New Revision: 353945
URL: http://svn.apache.org/viewcvs?rev=353945&view=rev
Log:
include source feature in main feature
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/feature.xml
geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/feature.xml
geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.properties
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/feature.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/feature.xml?rev=353945&r1=353944&r2=353945&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/feature.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/feature.xml Sun Dec 4 16:37:31 2005
@@ -1,10 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature primary="false" label="org.apache.geronimo.feature" id="org.apache.geronimo.source.feature" version="1.0.0">
- <description >
- %description
- </description>
- <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- %license
- </license>
- <plugin fragment="false" download-size="0" install-size="0" id="org.apache.geronimo.feature.source" version="1.0.0"/>
-</feature>
\ No newline at end of file
+<feature
+ id="org.apache.geronimo.source.feature"
+ label="org.apache.geronimo.feature"
+ version="0.5.0">
+
+ <description>
+ %description
+ </description>
+
+ <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
+ %license
+ </license>
+
+ <url>
+ <update label="Apache Geronimo Eclipse Update Site" url="http://geronimo.apache.org/devtools/"/>
+ </url>
+
+ <plugin
+ id="org.apache.geronimo.feature.source"
+ download-size="0"
+ install-size="0"
+ version="1.0.0"/>
+
+</feature>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/feature.xml?rev=353945&r1=353944&r2=353945&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/feature.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/feature.xml Sun Dec 4 16:37:31 2005
@@ -1,91 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.apache.geronimo.feature"
+ label="org.apache.geronimo.feature"
+ version="0.5.0"
+ provider-name="Apache Software Foundation">
- Copyright 2004 The Apache Software Foundation
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
- 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.
--->
-<feature
- id="org.apache.geronimo.feature"
- label="org.apache.geronimo.feature"
- version="0.5.0"
- provider-name="Apache Software Foundation">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
- </copyright>
-
- <license url="http://www.apache.org/licenses/LICENSE-2.0">
+ <copyright url="http://www.example.com/copyright">
+ Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
+ </copyright>
+
+ <license url="http://www.apache.org/licenses/LICENSE-2.0">
Copyright 2005
-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.
- </license>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.jst.server.core"/>
- <import plugin="org.eclipse.jst.j2ee"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.jst.j2ee.web"/>
- <import plugin="org.eclipse.jst.j2ee.ejb"/>
- <import plugin="org.eclipse.jst.server.generic.core"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.wst.common.modulecore"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.core.commands"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.emf.ecore.edit"/>
- <import plugin="org.eclipse.emf.common"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.jst.server.generic.ui"/>
- </requires>
-
- <plugin
- id="org.apache.geronimo.devtools.eclipse.core"
- download-size="0"
- install-size="0"
- version="0.5.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.geronimo.deployment.model"
- download-size="0"
- install-size="0"
- version="0.5.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.geronimo.runtime.v1"
- download-size="0"
- install-size="0"
- version="0.5.0"/>
-
- <plugin
- id="org.apache.geronimo.ui"
- download-size="0"
- install-size="0"
- version="0.5.0"
- unpack="false"/>
-
-</feature>
+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.
+ </license>
+
+ <url>
+ <update label="Apache Geronimo Eclipse Update Site" url="http://geronimo.apache.org/devtools/"/>
+ </url>
+
+ <includes
+ id="org.apache.geronimo.source.feature"
+ version="0.0.0"
+ optional="true"/>
+
+ <requires>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.debug.core"/>
+ <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.jdt.launching"/>
+ <import plugin="org.eclipse.wst.server.core"/>
+ <import plugin="org.eclipse.jst.server.core"/>
+ <import plugin="org.eclipse.jst.j2ee"/>
+ <import plugin="org.eclipse.jst.j2ee.core"/>
+ <import plugin="org.eclipse.jst.j2ee.web"/>
+ <import plugin="org.eclipse.jst.j2ee.ejb"/>
+ <import plugin="org.eclipse.jst.server.generic.core"/>
+ <import plugin="org.eclipse.emf.ecore.xmi"/>
+ <import plugin="org.eclipse.wst.common.modulecore"/>
+ <import plugin="org.eclipse.wst.common.frameworks"/>
+ <import plugin="org.eclipse.core.commands"/>
+ <import plugin="org.eclipse.emf.ecore"/>
+ <import plugin="org.eclipse.emf.ecore.edit"/>
+ <import plugin="org.eclipse.emf.common"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.jst.server.generic.ui"/>
+ </requires>
+
+ <plugin
+ id="org.apache.geronimo.devtools.eclipse.core"
+ download-size="0"
+ install-size="0"
+ version="0.5.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.geronimo.deployment.model"
+ download-size="0"
+ install-size="0"
+ version="0.5.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.geronimo.runtime.v1"
+ download-size="0"
+ install-size="0"
+ version="0.5.0"/>
+
+ <plugin
+ id="org.apache.geronimo.ui"
+ download-size="0"
+ install-size="0"
+ version="0.5.0"
+ unpack="false"/>
+
+</feature>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml?rev=353945&r1=353944&r2=353945&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml Sun Dec 4 16:37:31 2005
@@ -49,7 +49,7 @@
<goal name="eclipse" prereqs="init">
<j:set var="goal" value="eclipse" />
- <j:set var="maven.multiproject.includes" value="plugins/org.apache.geronimo.runtime.v1/project.xml" />
+ <j:set var="maven.multiproject.includes" value="plugins/org.apache.geronimo.runtime.v1/project.xml,features/*/project.xml" />
<attainGoal name="multiproject:goal" />
</goal>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.properties?rev=353945&r1=353944&r2=353945&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.properties Sun Dec 4 16:37:31 2005
@@ -16,5 +16,5 @@
adminPassword=Administrator Pa&ssword:
classPath=&Classpath Variable:
-geronimo-facet-label=Apache Geronimo
-geronimo-facet-description=Apache Geronimo
\ No newline at end of file
+geronimo-facet-label=Geronimo Deployment Plans
+geronimo-facet-description=Creates Geronimo specific deployment plan file(s).
\ No newline at end of file