From: jprocter <Jim Procter>
Date: Sat, 1 May 2010 15:40:30 +0000 (+0000)
Subject: relocatable reference to build file and dropped groovy library from classpath
X-Git-Tag: Root_Release_2_5_Branch
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8549afc7ca45e84e3425631475ac703b2f7506a8;hp=2687be3305f09c6620227d6c1f9054c36848c722;p=jalview.git

relocatable reference to build file and dropped groovy library from classpath
---

diff --git a/.classpath b/.classpath
index 290ab52..93d1eaf 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,6 @@
 	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="lib" path="lib/Jmol-11.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/castor-1.1-cycle-xml.jar" sourcepath="C:/Documents and Settings/JimP/workspace-3.3/castor/src/main/java"/>
-	<classpathentry kind="lib" path="lib/groovy-1.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/JGoogleAnalytics-0.2.1-SNAPSHOT.jar" sourcepath="/JGoogleAnalytics/src/main/java"/>
 	<classpathentry kind="lib" path="lib/vamsas-client.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/VamsasClient"/>
diff --git a/.externalToolBuilders/Jalview Release indices [Builder].launch b/.externalToolBuilders/Jalview Release indices [Builder].launch
index 09414c5..dadeceb 100644
--- a/.externalToolBuilders/Jalview Release indices [Builder].launch	
+++ b/.externalToolBuilders/Jalview Release indices [Builder].launch	
@@ -3,22 +3,22 @@
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="buildindices,"/>
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="buildindices,"/>
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Jalview Release/build.xml"/>
+<listEntry value="/jalview 2.5/build.xml"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_17"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Jalview Release"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jalview 2.5"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="buildindices,"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Jalview Release/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:}/build.xml"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>