From: Laurent E. <let...@us...> - 2004-03-18 21:21:50
|
User: letiemble Date: 04/03/18 13:12:12 Modified: jbosside/org.jboss.ide.eclipse.ui Tag: eclipse-3-0 .classpath build.xml plugin.xml Log: Various fixes to support Eclipse 3.0M7. Original patches by Gabriel Ciuloaica. Revision Changes Path No revision No revision 1.3.2.2 +4 -30 contrib/jbosside/org.jboss.ide.eclipse.ui/.classpath Index: .classpath =================================================================== RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.ui/.classpath,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- .classpath 8 Oct 2003 21:45:55 -0000 1.3.2.1 +++ .classpath 18 Mar 2004 21:12:11 -0000 1.3.2.2 @@ -1,33 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_3.0.0/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_WIN32_WIN32_X86_SRC/org.eclipse.swt.win32_3.0.0/ws/win32/swtsrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_3.0.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_3.0.0/viewssrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_3.0.0/workbenchwin32.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_WIN32_WIN32_X86_SRC/org.eclipse.ui.win32_3.0.0/workbenchwin32src.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_3.0.0/texteditorsrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_3.0.0/editors.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_3.0.0/editorssrc.zip"/> - <classpathentry kind="src" path="/org.jboss.ide.eclipse.core"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_3.0.0/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_3.0.0/bootsrc.zip"/> - <classpathentry kind="var" - path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> 1.6.2.3 +15 -15 contrib/jbosside/org.jboss.ide.eclipse.ui/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.ui/build.xml,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- build.xml 16 Oct 2003 19:53:33 -0000 1.6.2.2 +++ build.xml 18 Mar 2004 21:12:11 -0000 1.6.2.3 @@ -29,16 +29,16 @@ <antcall target="gather.bin.parts"> <param name="destination.temp.folder" value="${temp.folder}/"/> </antcall> - <zip zipfile="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.230.jar" basedir="${temp.folder}/org.jboss.ide.eclipse.ui_1.2.230" filesonly="false"/> + <zip zipfile="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.330.jar" basedir="${temp.folder}/org.jboss.ide.eclipse.ui_1.2.330" filesonly="false" whenempty="skip"/> <delete dir="${temp.folder}"/> </target> <target name="gather.bin.parts" depends="init" if="destination.temp.folder"> - <mkdir dir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"/> - <copy todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"> + <mkdir dir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"/> + <copy todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"> <fileset dir="${build.result.folder}" includes="plugin.xml,plugin.properties,org-jboss-ide-eclipse-ui.jar" /> </copy> - <copy todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"> + <copy todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"> <fileset dir="${basedir}" includes="plugin.xml,plugin.properties,org-jboss-ide-eclipse-ui.jar" /> </copy> </target> @@ -47,7 +47,7 @@ <delete dir="${temp.folder}/org-jboss-ide-eclipse-ui.jar.bin"/> <mkdir dir="${temp.folder}/org-jboss-ide-eclipse-ui.jar.bin"/> <!-- compile the source code --> - <javac destdir="${temp.folder}/org-jboss-ide-eclipse-ui.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="E:/eclipse-3.0.0M4/plugins/org.eclipse.core.boot_3.0.0/boot.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar;E:/eclipse-3.0.0M4/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar;E:/eclipse-3.0.0M4/plugins/org.apache.xerces_4.0.13/xercesImpl.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.core.resources_3.0.0/resources.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui_3.0.0/ui.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.update.core_3.0.0/updatecore.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.update.core.win32_3.0.0/updatecore.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.help_3.0.0/help.jar;E:/eclipse-3.0.0M4/plugins/org.apache.lucene_1.3.0.RC1/parser.jar;E:/eclipse-3.0.0M4/plugins/org.apache.lucene_1.3.0.RC1/lucene-1.3-rc1.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.help.appserver_3.0.0/appserver.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.swt_3.0.0/ws/${basews}/swt.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.swt.win32_3.0.0/ws/${basews}/swt.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.text_3.0.0/text.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.jface_3.0.0/jface.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.views_3.0.0/views.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.win32_3.0.0/workbench.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.win32_3.0.0/workbenchwin32.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.editors_3.0.0/editors.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar;../org.jboss.ide.eclipse.core/org-jboss-ide-eclipse-core.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.externaltools_3.0.0/externaltools.jar;E:/eclipse-3.0.0M4/plugins/org.apache.ant_1.5.4/lib/ant.jar;E:/eclipse-3.0.0M4/plugins/org.apache.ant_1.5.4/lib/optional.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ant.core_3.0.0/antsupport.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.debug.ui_3.0.0/dtui.jar;E:/eclipse-3.0.0M4/plugins/org.eclipse.ui.console_3.0.0/console.jar;../org.apache.xalan/xalan.jar;../org.apache.xalan/xercesImpl.jar;../org.apache.xalan/xml-apis.jar" source="${javacSource}" target="${javacTarget}" > + <javac destdir="${temp.folder}/org-jboss-ide-eclipse-ui.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="D:/eclipse-3.0M7/plugins/org.eclipse.core.boot_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.boot_3.0.0/boot.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.runtime_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/osgi.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/core.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/resolver.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi_3.0.0/console.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi.util_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.osgi.util_3.0.0/util.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.resources_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.resources_3.0.0/resources.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.resources.win32_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.runtime.compatibility_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar;D:/eclipse-3.0M7/plugins/org.eclipse.osgi.services_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.osgi.services_3.0.0/services.jar;D:/eclipse-3.0M7/plugins/org.eclipse.update.configurator_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui_3.0.0/ui.jar;D:/eclipse-3.0M7/plugins/org.eclipse.help_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.help_3.0.0/help.jar;D:/eclipse-3.0M7/plugins/org.eclipse.swt_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.swt_3.0.0/ws/${basews}/swt.jar;D:/eclipse-3.0M7/plugins/org.eclipse.swt.win32_3.0.0/ws/${basews}/swt.jar;D:/eclipse-3.0M7/plugins/org.eclipse.jface_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.jface_3.0.0/jface.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench_3.0.0/compatibility.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar;../org.jboss.ide.eclipse.core/bin;../org.jboss.ide.eclipse.core/org-jboss-ide-eclipse-core.jar;D:/eclipse-3.0M7/plugins/org.eclipse.debug.core_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.variables_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.variables_3.0.0/variables.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.externaltools_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.externaltools_3.0.0/externaltools.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.ide_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.ide_3.0.0/ide.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.win32_3.0.0/ide.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.win32_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.win32_3.0.0/workbenchwin32.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.views_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.views_3.0.0/views.jar;D:/eclipse-3.0M7/plugins/org.eclipse.update.core_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.update.core_3.0.0/updatecore.jar;D:/eclipse-3.0M7/plugins/org.eclipse.update.core.win32_3.0.0/updatecore.jar;D:/eclipse-3.0M7/plugins/org.eclipse.jface.text_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar;D:/eclipse-3.0M7/plugins/org.eclipse.text_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.text_3.0.0/text.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.editors_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.editors_3.0.0/editors.jar;D:/eclipse-3.0M7/plugins/org.eclipse.core.filebuffers_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar;D:/eclipse-3.0M7/plugins/org.eclipse.debug.ui_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.debug.ui_3.0.0/dtui.jar;D:/eclipse-3.0M7/plugins/org.eclipse.ui.console_3.0.0/bin;D:/eclipse-3.0M7/plugins/org.eclipse.ui.console_3.0.0/console.jar;../org.apache.xalan/bin;../org.apache.xalan/xalan.jar;../org.apache.xalan/xercesImpl.jar;../org.apache.xalan/xml-apis.jar" source="${javacSource}" target="${javacTarget}" > <src path="src/" /> </javac> <!-- copy necessary resources --> @@ -61,7 +61,7 @@ <target name="org-jboss-ide-eclipse-uisrc.zip" depends="init" unless="org-jboss-ide-eclipse-uisrc.zip"> <mkdir dir="${build.result.folder}"/> - <zip zipfile="${build.result.folder}/org-jboss-ide-eclipse-uisrc.zip" filesonly="false"> + <zip zipfile="${build.result.folder}/org-jboss-ide-eclipse-uisrc.zip" filesonly="false" whenempty="skip"> <fileset dir="src/" includes="**/*.java" /> </zip> </target> @@ -80,26 +80,26 @@ </target> <target name="gather.sources" depends="init" if="destination.temp.folder"> - <mkdir dir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"/> - <copy file="${build.result.folder}/org-jboss-ide-eclipse-uisrc.zip" todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"/> + <mkdir dir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"/> + <copy file="${build.result.folder}/org-jboss-ide-eclipse-uisrc.zip" todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"/> </target> <target name="gather.logs" depends="init" if="destination.temp.folder"> - <mkdir dir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"/> - <copy file="${temp.folder}/org-jboss-ide-eclipse-ui.jar.bin.log" todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.230"/> + <mkdir dir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"/> + <copy file="${temp.folder}/org-jboss-ide-eclipse-ui.jar.bin.log" todir="${destination.temp.folder}/org.jboss.ide.eclipse.ui_1.2.330"/> </target> <target name="clean" depends="init" description="Clean the plug-in: org.jboss.ide.eclipse.ui of all the zips, jars and logs created."> <delete file="${build.result.folder}/org-jboss-ide-eclipse-ui.jar"/> <delete file="${build.result.folder}/org-jboss-ide-eclipse-uisrc.zip"/> - <delete file="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.230.jar"/> - <delete file="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.230.zip"/> + <delete file="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.330.jar"/> + <delete file="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.330.zip"/> <delete dir="${temp.folder}"/> </target> <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> - <eclipse.convertPath fileSystemPath="F:/JBoss-3.0/contrib/jbosside/org.jboss.ide.eclipse.ui/" property="resourcePath"/> - <eclipse.refreshLocal resource="org.jboss.ide.eclipse.ui" depth="infinite"/> + <eclipse.convertPath fileSystemPath="F:/JBossIDE/3.x/contrib/jbosside/org.jboss.ide.eclipse.ui/" property="resourcePath"/> + <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> </target> <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.jboss.ide.eclipse.ui."> @@ -116,7 +116,7 @@ <delete> <fileset dir="${temp.folder}" includes="**/*.bin.log" /> </delete> - <zip zipfile="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.230.zip" basedir="${temp.folder}" filesonly="true"/> + <zip zipfile="${plugin.destination}/org.jboss.ide.eclipse.ui_1.2.330.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip"/> <delete dir="${temp.folder}"/> </target> 1.5.2.3 +1 -1 contrib/jbosside/org.jboss.ide.eclipse.ui/plugin.xml Index: plugin.xml =================================================================== RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.ui/plugin.xml,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -r1.5.2.2 -r1.5.2.3 --- plugin.xml 16 Oct 2003 19:53:33 -0000 1.5.2.2 +++ plugin.xml 18 Mar 2004 21:12:11 -0000 1.5.2.3 @@ -2,7 +2,7 @@ <plugin id="org.jboss.ide.eclipse.ui" name="%plugin.name" - version="1.2.230" + version="1.2.330" provider-name="%plugin.provider" class="org.jboss.ide.eclipse.ui.UIPlugin"> |