geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r344167 - in /geronimo/devtools/trunk/modules/eclipse-plugin: etc/project.properties maven.xml plugins/org.apache.geronimo.deployment.model/maven.xml plugins/org.apache.geronimo.deployment.model/project.properties
Date Mon, 14 Nov 2005 17:43:25 GMT
Author: sppatel
Date: Mon Nov 14 09:43:18 2005
New Revision: 344167

URL: http://svn.apache.org/viewcvs?rev=344167&view=rev
Log:
move to new wtp

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/maven.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.properties

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=344167&r1=344166&r2=344167&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Mon Nov 14 09:43:18
2005
@@ -11,7 +11,7 @@
 
 maven.remote.group=apcvs
 
-eclipse.home=./target/eclipse
+eclipse.home=${basedir}/../../target/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

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml?rev=344167&r1=344166&r2=344167&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml Mon Nov 14 09:43:18 2005
@@ -91,20 +91,19 @@
 			<j:set var="extension" value="${platform}.zip" />
 		</j:if>
 		
-		<j:set var="wtp.build.path" value="eclipse/webtools/downloads/drops"/>
-		<j:set var="wtp.build.folder" value="I-I20051105-200511051946"/>
+		<j:set var="wtp.build.folder" value="I-I200511111814-200511111814"/>
 		
 		<j:set var="eclipse.build.filename" value="eclipse-SDK-3.1.1-${extension}"/>
 		<j:set var="emf.build.filename" value="emf-sdo-xsd-SDK-2.1.1.zip"/>
 		<j:set var="gef.build.filename" value="GEF-SDK-3.1.1.zip"/>
 		<j:set var="jem.build.filename" value="JEM-SDK-1.1.0.1.zip"/>
-		<j:set var="wtp.build.filename" value="wtp-sdk-I20051105.zip"/>
+		<j:set var="wtp.build.filename" value="wtp-I200511111814.zip"/>
 
 		<j:set var="eclipse.download" value="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/${eclipse.build.filename}"/>
 		<j:set var="emf.download" value="http://download.eclipse.org/tools/emf/downloads/drops/2.1.1/R200509281310/${emf.build.filename}"/>
 		<j:set var="gef.download" value="http://download.eclipse.org/tools/gef/downloads/drops/R-3.1.1-200509301327/${gef.build.filename}"/>
 		<j:set var="jem.download" value="http://download.eclipse.org/tools/ve/downloads/drops/R-1.1.0.1-200509071822/${jem.build.filename}"/>
-		<j:set var="wtp.download" value="http://mirrors.ibiblio.org/pub/mirrors/${wtp.build.path}/${wtp.build.folder}/${wtp.build.filename}"/>
+		<j:set var="wtp.download" value="http://download.eclipse.org/webtools/downloads/drops/${wtp.build.folder}/${wtp.build.filename}"/>
 			
 		<j:set var="wtp.dist" value="${maven.repo.local}/eclipse/wtp/distributions/${wtp.build.filename}"/>
 		<j:set var="eclipse.dist" value="${maven.repo.local}/eclipse/eclipse/distributions/${eclipse.build.filename}"/>

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=344167&r1=344166&r2=344167&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
Mon Nov 14 09:43:18 2005
@@ -58,9 +58,9 @@
     </ant:move>
   	
   	<!-- hack for maven 1.1-beta 2 and 1154 -->
-  	<ant:copy todir="${maven.build.dir}/schema">
- 		<ant:fileset dir=".">
-  	    		<ant:include name="geronimo-connector-1.0.xsd"/>
+  	<ant:copy todir="${maven.build.dir}/schema" overwrite="true">
+ 		<ant:fileset dir="${basedir}">
+  	        <ant:include name="geronimo-connector-1.0.xsd"/>
  			<ant:include name="geronimo-security-1.1.xsd"/>
   	  	</ant:fileset>
   	</ant:copy>
@@ -86,7 +86,7 @@
   
   <goal name="codegen" prereqs="importschemas">
     <echo>Starting Workbench...</echo>
-    <ant:java fork="true" jar="${eclipse.startup.jar}/startup.jar" failonerror="true">
+    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
       <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
       <ant:arg value="-data"/>
       <ant:arg value="../temp"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties?rev=344167&r1=344166&r2=344167&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties
Mon Nov 14 09:43:18 2005
@@ -1,4 +1,3 @@
-eclipse.startup.jar=../../target/eclipse
 maven.jar.manifest=META-INF/MANIFEST.MF
 patch=<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
 patch2=<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>



Mime
View raw message