Author: koen.aers(a)jboss.com Date: 2011-04-05 14:30:19 -0400 (Tue, 05 Apr 2011) New Revision: 30334 Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-connector-wagon.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/args4j.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-cli.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-codec.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-logging.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-dev-plugins.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-git-tools.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-xml.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-reference-guide.war trunk/forge/plugins/org.jboss.tools.seam.forge/lib/fpak.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/httpclient.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/httpcore.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor-core.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor-spi.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsch.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-embedder.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.console.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.iplog.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.pgm.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.ui.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/seam-solder.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-guice-no_aop.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/snakeyaml.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-file.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-http-lightweight.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-http-shared.jar Removed: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jta.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-guice-noaop.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-extensions.jar Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/.classpath trunk/forge/plugins/org.jboss.tools.seam.forge/lib/activation.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-impl.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-spi.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-util.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/cal10n-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/cdi-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-j2ee-plugins.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-project-model.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-scaffold.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jansi.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/javassist.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jline.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsf-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsr181-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsr250-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-aether-provider.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-artifact.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-compat.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-core.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-model-builder.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-model.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-plugin-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-repository-metadata.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-settings-builder.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-settings.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/metawidget.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/mvel2.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/plexus-classworlds.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/plexus-utils.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/seam-render.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-inject-bean.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-inject-plexus.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-provider-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-core.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-se-core.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-spi.jar trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java Log: update embedded runtime to 1.0.0.alpha3 and get rid of the resulting incompatibilities Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/.classpath =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/.classpath 2011-04-05 18:29:04 UTC (rev 30333) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/.classpath 2011-04-05 18:30:19 UTC (rev 30334) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="lib/jline.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/activation.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-api.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-connector-wagon.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-connector-wagon.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-impl.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-spi.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/aether-util.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/args4j.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/args4j.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/cal10n-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/cdi-api.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-cli.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-cli.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-codec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-codec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/commons-logging.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-dev-plugins.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-dev-plugins.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-git-tools.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-git-tools.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-j2ee-plugins.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-xml.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-xml.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-project-model.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-reference-guide.war =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-reference-guide.war ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-scaffold.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/fpak.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/fpak.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/httpclient.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/httpclient.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/httpcore.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/httpcore.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jansi.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/javassist.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor-core.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor-core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor-spi.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor-spi.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jboss-interceptor.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jline.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsch.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsch.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsf-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsr181-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jsr250-api.jar =================================================================== (Binary files differ) Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/jta.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-aether-provider.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-artifact.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-compat.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-core.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-embedder.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-embedder.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-model-builder.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-model.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-plugin-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-repository-metadata.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-settings-builder.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/maven-settings.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/metawidget.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/mvel2.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.console.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.console.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.iplog.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.iplog.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.pgm.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.pgm.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.ui.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/org.eclipse.jgit.ui.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/plexus-classworlds.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/plexus-utils.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/seam-render.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/seam-solder.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/seam-solder.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-api.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-guice-no_aop.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-guice-no_aop.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-guice-noaop.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-inject-bean.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/sisu-inject-plexus.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/snakeyaml.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/snakeyaml.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-file.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-file.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-http-lightweight.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-http-lightweight.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-http-shared.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-http-shared.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/wagon-provider-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-core.jar =================================================================== (Binary files differ) Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-extensions.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-se-core.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/weld-spi.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java 2011-04-05 18:29:04 UTC (rev 30333) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java 2011-04-05 18:30:19 UTC (rev 30334) @@ -67,25 +67,20 @@ if ("pwd".equals(currentCommand)) { // do nothing } else if ("new-project".equals(currentCommand)) { - int index = beforePrompt.lastIndexOf("Wrote "); + int index = beforePrompt.lastIndexOf("***SUCCESS*** Created project ["); if (index == -1) return; - if (index + 6 > beforePrompt.length()) return; - String str = beforePrompt.substring(index + 6); - index = str.lastIndexOf("/src/main/resources/META-INF/forge.xml\n***SUCCESS*** Created project ["); + if (index + 31 > beforePrompt.length()) return; + String str = beforePrompt.substring(index + 31); + index = str.lastIndexOf("] in new working directory ["); if (index == -1) return; - if (index + 70 > str.length()) return; - String projectPath = str.substring(0, index); - str = str.substring(index + 70); - index = str.indexOf("] in new working directory ["); - if (index == -1) return; if (index + 28 > str.length()) return; str = str.substring(index + 28); index = str.indexOf("]"); if (index == -1) return; - String projectDirName = str.substring(0, index); - index = projectPath.indexOf(projectDirName); - if (index == -1) return; - String projectBaseDirPath = projectPath.substring(0, index - 1); + String projectPath = str.substring(0, index); + index = projectPath.lastIndexOf('/'); + String projectDirName = projectPath.substring(index + 1); + String projectBaseDirPath = projectPath.substring(0, index); new ProjectImporter(projectBaseDirPath, projectDirName).importProject(); } } Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java 2011-04-05 18:29:04 UTC (rev 30333) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java 2011-04-05 18:30:19 UTC (rev 30334) @@ -136,17 +136,55 @@ } } + private int lastLineLength = 0; + private int lastLinePosition = 0; + private StringBuffer escapeSequence = new StringBuffer(); + private boolean escapeSequenceStarted = false; + public void appendString(final String str) { Display.getDefault().asyncExec(new Runnable() { @Override public void run() { try { for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (c == '\r') continue; //ignore + if (c == '[' && escapeSequenceStarted) continue; + if (c == 27) { + escapeSequenceStarted = true; + continue; + } + if (escapeSequenceStarted) { + int type = Character.getType(c); + if (type == Character.LOWERCASE_LETTER || type == Character.UPPERCASE_LETTER) { + if (c == 'G') { + int columnNumber = Integer.valueOf(escapeSequence.toString()); + escapeSequence.setLength(0); + lastLineLength = columnNumber - 1; + escapeSequenceStarted = false; + } + if (c == 'K') { + int doclength = getDocument().getLength(); + int currentPosition = lastLinePosition + lastLineLength; + getDocument().replace(currentPosition, doclength - currentPosition, ""); + escapeSequenceStarted = false; + } + } else { + escapeSequence.append(c); + } + continue; + } if (str.charAt(i) == '\b') { getDocument().replace(getDocument().getLength() - 1, 1, ""); + lastLineLength--; } else { getDocument().replace(getDocument().getLength(), 0, str.substring(i, i + 1)); + lastLineLength++; } + if (c == '\n') { + lastLineLength = 0; + lastLinePosition = getDocument().getLength(); + } } } catch (BadLocationException e) {} }