Author: max.andersen(a)jboss.com Date: 2007-12-07 10:19:48 -0500 (Fri, 07 Dec 2007) New Revision: 5224 Added: trunk/core/util/packaging-convert/README.TXT trunk/core/util/packaging-convert/src/META-INF/ trunk/core/util/packaging-convert/src/META-INF/MANIFEST.MF trunk/core/util/packaging-convert/src/org/jboss/tools/archives/JBossIDEtoTools.java Removed: trunk/core/util/packaging-convert/lib/commons-cli-1.0.jar Modified: trunk/core/util/packaging-convert/.classpath trunk/core/util/packaging-convert/build.xml trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy Log: minor fixes to packaging converter - e.g. not dependent on user having ant setup. Modified: trunk/core/util/packaging-convert/.classpath =================================================================== --- trunk/core/util/packaging-convert/.classpath 2007-12-07 14:21:12 UTC (rev 5223) +++ trunk/core/util/packaging-convert/.classpath 2007-12-07 15:19:48 UTC (rev 5224) @@ -4,8 +4,8 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <!--classpathentry exported="true" kind="lib" path="bin-groovy"/--> <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/> - <classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/> <classpathentry kind="lib" path="lib/groovy-all-1.0.jar"/> <classpathentry kind="lib" path="lib/ant-1.6.5.jar"/> + <classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Added: trunk/core/util/packaging-convert/README.TXT =================================================================== --- trunk/core/util/packaging-convert/README.TXT (rev 0) +++ trunk/core/util/packaging-convert/README.TXT 2007-12-07 15:19:48 UTC (rev 5224) @@ -0,0 +1,8 @@ +To convert JBossIDE 1.x packaging to JBoss Tools 2.x packaging run the following command: + +java -jar packaging-converter.jar /path/to/.packaging + +on an existing JBossIDE project. + +After an successful conversion refresh or restart Eclipse with JBoss Tools in it and you should +see the changes. \ No newline at end of file Modified: trunk/core/util/packaging-convert/build.xml =================================================================== --- trunk/core/util/packaging-convert/build.xml 2007-12-07 14:21:12 UTC (rev 5223) +++ trunk/core/util/packaging-convert/build.xml 2007-12-07 15:19:48 UTC (rev 5224) @@ -1,15 +1,39 @@ -<project default="convert"> - - <path id="groovy-classpath"> - <fileset dir="lib" includes="**/*.jar"/> - </path> - - <target name="convert"> - <property name="packaging-path" value="/home/marshall/Workspaces/jbosside/pojp/.packaging"/> - - <java classpathref="groovy-classpath" classname="groovy.lang.GroovyShell"> - <arg line="src/org/jboss/tools/archives/PackagingConverter.groovy"/> - <arg line="${packaging-path}"/> - </java> - </target> -</project> \ No newline at end of file +<?xml version="1.0"?> + +<project default="build" basedir="."> + +<target name="compile"> + <path id="classpath"> + <fileset dir="lib"> + <include name="*.jar"/> + </fileset> + </path> + + <mkdir dir="build/classes"/> + + <copy todir="build/classes"> + <fileset dir="src"> + <include name="**/*.MF" /> + <include name="**/*.png" /> + <include name="**/*.groovy" /> + </fileset> + </copy> + + <javac classpathref="classpath" srcdir="src" destdir="build/classes" debug="true"/> + + <zip destfile="packaging-converter.jar" basedir="build/classes"/> + +</target> + +<target name="build" depends="compile"/> + + <target name="convert" depends="build"> + <property name="packaging-path" value="/home/marshall/Workspaces/jbosside/pojp/.packaging"/> + + <java jar="packaging-converter.jar" fork="true"> + <arg line="${packaging-path}"/> + </java> + </target> + + +</project> Deleted: trunk/core/util/packaging-convert/lib/commons-cli-1.0.jar =================================================================== (Binary files differ) Added: trunk/core/util/packaging-convert/src/META-INF/MANIFEST.MF =================================================================== --- trunk/core/util/packaging-convert/src/META-INF/MANIFEST.MF (rev 0) +++ trunk/core/util/packaging-convert/src/META-INF/MANIFEST.MF 2007-12-07 15:19:48 UTC (rev 5224) @@ -0,0 +1,3 @@ +Main-Class: org.jboss.tools.archives.JBossIDEtoTools +Class-Path: lib/dom4j-1.6.1.jar lib/jaxen-1.1-beta-6.jar lib/groovy-all-1.0.jar lib/ant-1.6.5.jar lib/jaxen-1.1-beta-6.jar + Added: trunk/core/util/packaging-convert/src/org/jboss/tools/archives/JBossIDEtoTools.java =================================================================== --- trunk/core/util/packaging-convert/src/org/jboss/tools/archives/JBossIDEtoTools.java (rev 0) +++ trunk/core/util/packaging-convert/src/org/jboss/tools/archives/JBossIDEtoTools.java 2007-12-07 15:19:48 UTC (rev 5224) @@ -0,0 +1,31 @@ +package org.jboss.tools.archives; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +import groovy.lang.GroovyShell; + +public class JBossIDEtoTools { + + /** + * @param args + * @throws IOException + */ + public static void main(String[] args) throws IOException { + GroovyShell groovyShell = new GroovyShell(); + + JBossIDEtoTools t = new JBossIDEtoTools(); + + InputStream openStream = null; + try { + URL resource = t.getClass().getClassLoader().getResource("org/jboss/tools/archives/PackagingConverter.groovy"); + openStream = resource.openStream(); + groovyShell.run(openStream, "PackaginConverter.groovy", args); + } finally { + if(openStream!=null) openStream.close(); + } + + } + +} Modified: trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy =================================================================== --- trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy 2007-12-07 14:21:12 UTC (rev 5223) +++ trunk/core/util/packaging-convert/src/org/jboss/tools/archives/PackagingConverter.groovy 2007-12-07 15:19:48 UTC (rev 5224) @@ -50,8 +50,9 @@ println "Backing up to .project.bak, and saving to .project in " + projectDir + "..." saveProject() - println "Converting JBossIDE 1.x packages to JBossTools/RHDS archives..." + println "Converting JBossIDE 1.x packages to JBoss Tools archives..." convertPackaging() + println "Done. Restart Eclipse with JBoss Tools to see changes." } def updateBuilder () {