geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r290713 - in /geronimo/devtools/trunk/modules/eclipse-plugin: etc/ features/org.apache.geronimo.feature/ plugins/org.apache.geronimo.deployment.model/ plugins/org.apache.geronimo.ui/
Date Wed, 21 Sep 2005 14:32:19 GMT
Author: sppatel
Date: Wed Sep 21 07:32:15 2005
New Revision: 290713

URL: http://svn.apache.org/viewcvs?rev=290713&view=rev
Log:
fix eclipse goals

Added:
    geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.properties
Removed:
    geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/.project
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/.project
Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties?rev=290713&r1=290712&r2=290713&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Wed Sep 21 07:32:15
2005
@@ -1,11 +1,14 @@
 eclipse.home=C:/eclipse/
 eclipse.home.plugins=${eclipse.home}/plugins
+maven.eclipse.buildcommands=org.eclipse.pde.ManifestBuilder,org.eclipse.pde.SchemaBuilder
+maven.eclipse.projectnatures=org.eclipse.pde.PluginNature
 
 maven.jar.override=on
 
 devtools_currentversion=1.0.0
 
-geronimo_runtime_version=1.0-M4
+geronimo.version=1.0-M4
+geronimo_runtime_version=${geronimo.version}
 geronimo_spec_version=1.1-rc4
 mx4j_version=3.0.1
 commons_logging_version=1.0.4

Added: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/maven.xml?rev=290713&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/maven.xml
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/maven.xml
Wed Sep 21 07:32:15 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
+  
+  <goal name="eclipse:generate-classpath">
+  <!-- do nothing -->
+  </goal>
+  
+  <postGoal name="eclipse:generate-project">
+  <!-- TODO remove javabuilder/javanature -->
+  </postGoal>
+  
+</project>

Added: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.properties?rev=290713&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.properties
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.properties
Wed Sep 21 07:32:15 2005
@@ -0,0 +1,2 @@
+maven.eclipse.buildcommands=org.eclipse.pde.FeatureBuilder
+maven.eclipse.projectnatures=org.eclipse.pde.FeatureNature
\ No newline at end of file

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml?rev=290713&r1=290712&r2=290713&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
Wed Sep 21 07:32:15 2005
@@ -31,8 +31,9 @@
 			</settings>
 		</multipleXSDs2Java>
 		
-		<replace file=".classpath" token="bin" value="target/classes"/>
-
+		<replace file=".classpath" token='path="bin"/>' value='path="target/classes"'/>
	
+		<delete dir="bin"/>
+		
 		<multipleXSDs2Java genModelName="geronimo-web">
 			<settings>
 				<model file="${target.directory}/schema/geronimo-web.xsd"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml?rev=290713&r1=290712&r2=290713&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
Wed Sep 21 07:32:15 2005
@@ -18,6 +18,10 @@
     <attainGoal name="build"/>
   </goal>
   
+  <goal name="eclipse:generate-classpath">
+  <!-- do nothing -->
+  </goal>
+  
   <goal name="importschemas">
     <j:forEach var="artifact" items="${pom.artifacts}"> 
     <j:set var="group" value="${artifact.dependency.groupId}"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml?rev=290713&r1=290712&r2=290713&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
Wed Sep 21 07:32:15 2005
@@ -18,6 +18,12 @@
           <include>LICENSE.txt</include>
         </includes>
       </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.properties</include>
+        </includes>
+     </resource>
     </resources>
   </build>
   <dependencies>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml?rev=290713&r1=290712&r2=290713&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
Wed Sep 21 07:32:15 2005
@@ -33,6 +33,12 @@
         </includes>
       </resource>
     </resources>
+    <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.properties</include>
+        </includes>
+     </resource>
   </build>
   <dependencies>
     <!-- geronimo plugin dependencies -->



Mime
View raw message