JBoss Tools SVN: r32690 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-07 05:04:39 -0400 (Thu, 07 Jul 2011)
New Revision: 32690
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
Log:
Some small test changes in preparation of a future test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-07-07 08:31:10 UTC (rev 32689)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-07-07 09:04:39 UTC (rev 32690)
@@ -102,7 +102,7 @@
assertEquals(filesToRemove.length, MockPublishMethod.getRemoved().length);
IPath[] removedFiles = MockPublishMethod.getRemoved();
for(int i = 0; i < removedFiles.length; i++) {
- assertEquals(filesToRemove[i], removedFiles[i].toString());
+ assertEquals(MockPublishMethod.MOCK_ROOT + "/" + filesToRemove[i], removedFiles[i].toString());
}
MockPublishMethod.reset();
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-07-07 08:31:10 UTC (rev 32689)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-07-07 09:04:39 UTC (rev 32690)
@@ -118,14 +118,14 @@
if (isAs7) {
for (String expectedPath : as7) {
- if (contains(expectedPath, artifacts)) {
+ if (contains(MockPublishMethod.MOCK_ROOT + "/" + expectedPath, artifacts)) {
continue;
}
fail(expectedPath + " was not among the changed/removed artifacts");
}
} else {
for (String expectedPath : nonAs7) {
- if (contains(expectedPath, artifacts)) {
+ if (contains(MockPublishMethod.MOCK_ROOT + "/" + expectedPath, artifacts)) {
continue;
}
fail(expectedPath + " was not among the changed/removed artifacts");
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-07-07 08:31:10 UTC (rev 32689)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-07-07 09:04:39 UTC (rev 32690)
@@ -27,6 +27,7 @@
public class MockPublishMethod extends AbstractPublishMethod {
public static final String PUBLISH_METHOD_ID = "mock";
+ public static final String MOCK_ROOT = "mockRoot";
public static ArrayList<IPath> changed = new ArrayList<IPath>();
public static ArrayList<IPath> removed = new ArrayList<IPath>();
@@ -36,7 +37,7 @@
}
public String getPublishDefaultRootFolder(IServer server) {
- return "/";
+ return "/" + MOCK_ROOT;
}
public String getPublishMethodId() {
14 years, 9 months
JBoss Tools SVN: r32689 - in trunk/forge: tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-07-07 04:31:10 -0400 (Thu, 07 Jul 2011)
New Revision: 32689
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java
Log:
add setters for name and location to external forge runtime class
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java 2011-07-07 08:24:00 UTC (rev 32688)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java 2011-07-07 08:31:10 UTC (rev 32689)
@@ -13,12 +13,20 @@
public String getName() {
return name;
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
@Override
public String getLocation() {
return location;
}
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
@Override
public String getType() {
return "external";
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java 2011-07-07 08:24:00 UTC (rev 32688)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java 2011-07-07 08:31:10 UTC (rev 32689)
@@ -2,16 +2,31 @@
import static org.junit.Assert.assertEquals;
+import org.junit.Before;
import org.junit.Test;
public class ForgeExternalRuntimeTest {
+
+ private ForgeExternalRuntime runtime;
+
+ @Before
+ public void setUp() {
+ runtime = new ForgeExternalRuntime("foo", "bar");
+ }
@Test
- public void test() {
- ForgeExternalRuntime runtime = new ForgeExternalRuntime("foo", "bar");
+ public void testGetters() {
assertEquals("foo", runtime.getName());
assertEquals("bar", runtime.getLocation());
assertEquals("external", runtime.getType());
}
+
+ @Test
+ public void testSetters() {
+ runtime.setName("Honolulu");
+ assertEquals("Honolulu", runtime.getName());
+ runtime.setLocation("Hawaii");
+ assertEquals("Hawaii", runtime.getLocation());
+ }
}
14 years, 9 months
JBoss Tools SVN: r32688 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-07 04:24:00 -0400 (Thu, 07 Jul 2011)
New Revision: 32688
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
Log:
JBIDE-8658 - set module publish state to REPUBLISH
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-07-07 08:21:39 UTC (rev 32687)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-07-07 08:24:00 UTC (rev 32688)
@@ -90,7 +90,7 @@
setModulePublishState(module, result);
setModuleState(module, IServer.STATE_STARTED );
} catch(CoreException ce) {
- setModulePublishState(module, IServer.PUBLISH_STATE_UNKNOWN);
+ setModulePublishState(module, IServer.PUBLISH_STATE_FULL);
setModuleState(module, IServer.STATE_UNKNOWN );
throw ce;
}
14 years, 9 months
JBoss Tools SVN: r32687 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-07 04:21:39 -0400 (Thu, 07 Jul 2011)
New Revision: 32687
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
Log:
JBIDE-8658 - added event codes to RSE so that the event has a target, and set module state to unknown
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-07-07 08:10:02 UTC (rev 32686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-07-07 08:21:39 UTC (rev 32687)
@@ -85,9 +85,15 @@
protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException {
if( method == null )
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$
- int result = method.publishModule(this, kind, deltaKind, module, monitor);
- setModulePublishState(module, result);
- setModuleState(module, IServer.STATE_STARTED );
+ try {
+ int result = method.publishModule(this, kind, deltaKind, module, monitor);
+ setModulePublishState(module, result);
+ setModuleState(module, IServer.STATE_STARTED );
+ } catch(CoreException ce) {
+ setModulePublishState(module, IServer.PUBLISH_STATE_UNKNOWN);
+ setModuleState(module, IServer.STATE_UNKNOWN );
+ throw ce;
+ }
}
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-07-07 08:10:02 UTC (rev 32686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-07-07 08:21:39 UTC (rev 32687)
@@ -27,6 +27,7 @@
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.wst.common.project.facet.core.util.internal.ProgressMonitorUtil;
import org.eclipse.wst.server.core.model.IModuleFile;
+import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
@@ -52,7 +53,7 @@
method.getFileService().upload(file, remotePath.removeLastSegments(1).toString(),
remotePath.lastSegment(), true, null, null, monitor);
} catch( SystemMessageException sme ) {
- IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL,
"failed to copy to " + remotePath.toString(), sme);
throw new CoreException(s);
}
@@ -67,7 +68,7 @@
} catch(SystemElementNotFoundException senfe ) {
// ignore, file already does not exist remotely
} catch( SystemMessageException sme ) {
- IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL,
"failed to delete " + remotePath.toString(), sme);
throw new CoreException(s);
}
@@ -88,7 +89,7 @@
toMake.lastSegment(), ProgressMonitorUtil.submon(monitor, 30));
}
} catch( SystemMessageException sme ) {
- IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL,
"failed to create folder " + toMake.toString(), sme);
return new IStatus[]{s};
}
@@ -106,7 +107,7 @@
}
method.getFileServiceSubSystem().setLastModified(rf, new Date().getTime(), null);
} catch(SystemMessageException sme) {
- IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL,
"failed to touch remote resource " + file.toString(), sme);
return new IStatus[]{s};
}
14 years, 9 months
JBoss Tools SVN: r32686 - in trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge: old and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-07-07 04:10:02 -0400 (Thu, 07 Jul 2011)
New Revision: 32686
Removed:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java
Log:
get rid of unnecessary StreamListener and ConsoleOutputStream classes
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java 2011-07-07 07:36:30 UTC (rev 32685)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java 2011-07-07 08:10:02 UTC (rev 32686)
@@ -5,6 +5,7 @@
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IDebugEventSetListener;
+import org.eclipse.debug.core.IStreamListener;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.core.model.IStreamMonitor;
import org.eclipse.debug.core.model.IStreamsProxy;
@@ -20,9 +21,8 @@
private ConsolePartitioner partitioner;
private ConsoleInputStream inputStream;
- private ConsoleOutputStream outputStream;
private IProcess process = null;
- private StreamListener outputStreamListener;
+ private IStreamListener outputStreamListener;
public Console(IProcess process) {
@@ -44,14 +44,16 @@
}
private void initOutputStream() {
- outputStream = new ConsoleOutputStream(this);
- IStreamMonitor streamMonitor = getOutputStreamMonitor();
- if (streamMonitor != null) {
- synchronized(streamMonitor) {
- outputStreamListener = new StreamListener(outputStream);
- streamMonitor.addListener(outputStreamListener);
- }
- }
+ outputStreamListener = new IStreamListener() {
+ @Override
+ public void streamAppended(String text, IStreamMonitor monitor) {
+ appendString(text);
+ }
+ };
+ IStreamMonitor streamMonitor = getOutputStreamMonitor();
+ synchronized(streamMonitor) {
+ streamMonitor.addListener(outputStreamListener);
+ }
}
private IStreamMonitor getOutputStreamMonitor() {
@@ -97,8 +99,6 @@
private synchronized void closeStreams() {
try {
inputStream.close();
- outputStream.close();
-// partitioner.streamsClosed();
} catch (IOException e) {}
}
@@ -112,7 +112,6 @@
}
}
outputStreamListener = null;
- outputStream = null;
inputStream = null;
}
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java 2011-07-07 07:36:30 UTC (rev 32685)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java 2011-07-07 08:10:02 UTC (rev 32686)
@@ -1,59 +0,0 @@
-package org.jboss.tools.forge.console;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class ConsoleOutputStream extends OutputStream {
-
- private boolean closed = false;
- private Console console;
-
- ConsoleOutputStream(Console console) {
- this.console = console;
- }
-
- public synchronized boolean isClosed() {
- return closed;
- }
-
- public synchronized void close() throws IOException {
- if(closed) {
- throw new IOException("Output Stream is closed");
- }
- closed = true;
- console = null;
- }
-
- public void flush() throws IOException {
- if(closed) {
- throw new IOException("Output Stream is closed");
- }
- }
-
- public void write(byte[] b, int off, int len) throws IOException {
- if(closed) {
- throw new IOException("Output Stream is closed");
- }
- notifyPartitioner(new String(b, off, len));
- }
-
- public void write(byte[] b) throws IOException {
- write(b, 0, b.length);
- }
-
- public void write(int b) throws IOException {
- write(new byte[] {(byte)b}, 0, 1);
- }
-
- public synchronized void write(String str) throws IOException {
- if(closed) {
- throw new IOException("Output Stream is closed");
- }
- notifyPartitioner(str);
- }
-
- private void notifyPartitioner(String str) throws IOException {
- console.appendString(str);
- }
-
-}
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java 2011-07-07 07:36:30 UTC (rev 32685)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java 2011-07-07 08:10:02 UTC (rev 32686)
@@ -1,44 +0,0 @@
-package org.jboss.tools.forge.console;
-
-import java.io.IOException;
-
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.jboss.tools.forge.ForgeUIPlugin;
-
-class StreamListener implements IStreamListener {
-
- private ConsoleOutputStream stream;
- private StringBuffer buffer = new StringBuffer();
- private boolean creatingProject = false;
-
- StreamListener(ConsoleOutputStream stream) {
- this.stream = stream;
- }
-
- public void streamAppended(String text, IStreamMonitor streamMonitor) {
- try {
- buffer.append(text);
- if (buffer.indexOf("new-project") != -1) {
- creatingProject = true;
- }
- stream.write(text);
- if (creatingProject
- && (text.indexOf('\n') != -1)
- && (buffer.indexOf("Created project [") != -1)
- && (buffer.indexOf("] in new working directory [") != -1)) {
- postProcessCreatedProject(buffer.toString());
- creatingProject = false;
- buffer = new StringBuffer();
- }
- } catch (IOException e) {
- ForgeUIPlugin.log(e);
- }
- }
-
- private void postProcessCreatedProject(String command) {
- System.out.println("processing created project: \n" + command);
- }
-
-}
-
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java 2011-07-07 07:36:30 UTC (rev 32685)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java 2011-07-07 08:10:02 UTC (rev 32686)
@@ -1,10 +1,11 @@
package org.jboss.tools.forge.old;
+import java.io.OutputStream;
+
import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.ui.console.ConsolePlugin;
import org.jboss.tools.forge.console.ConsoleInputStream;
-import org.jboss.tools.forge.console.ConsoleOutputStream;
public class ConsolePartition implements ITypedRegion {
public static final String OUTPUT_PARTITION_TYPE = ConsolePlugin.getUniqueIdentifier() + ".io_console_output_partition_type"; //$NON-NLS-1$
@@ -25,7 +26,7 @@
/**
* Only one of inputStream or outputStream will be null depending on the partitions type.
*/
- private ConsoleOutputStream outputStream;
+ private OutputStream outputStream;
@SuppressWarnings("unused")
private ConsoleInputStream inputStream;
private int length;
@@ -33,7 +34,7 @@
/**
* Creates a new partition to contain output to console.
*/
- public ConsolePartition(ConsoleOutputStream outputStream, int length) {
+ public ConsolePartition(OutputStream outputStream, int length) {
this.outputStream = outputStream;
this.length = length;
this.type = OUTPUT_PARTITION_TYPE;
@@ -160,7 +161,7 @@
*
* @return the underlying output stream
*/
- ConsoleOutputStream getStream() {
+ OutputStream getStream() {
return outputStream;
}
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java 2011-07-07 07:36:30 UTC (rev 32685)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java 2011-07-07 08:10:02 UTC (rev 32686)
@@ -1,6 +1,7 @@
package org.jboss.tools.forge.old;
import java.io.IOException;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +27,6 @@
import org.eclipse.ui.progress.WorkbenchJob;
import org.jboss.tools.forge.console.Console;
import org.jboss.tools.forge.console.ConsoleInputStream;
-import org.jboss.tools.forge.console.ConsoleOutputStream;
/**
* Partitions an IOConsole's document
@@ -444,7 +444,7 @@
* @param stream The stream that was written to.
* @param s The string that should be appended to the document.
*/
- public void streamAppended(ConsoleOutputStream stream, String s) throws IOException {
+ public void streamAppended(OutputStream stream, String s) throws IOException {
System.out.println("streamAppended : " + s);
if (s.indexOf('\t') != -1) System.out.println("Got a tab!");
if (document == null) {
@@ -485,9 +485,9 @@
*/
private class PendingPartition {
StringBuffer text = new StringBuffer(8192);
- ConsoleOutputStream stream;
+ OutputStream stream;
- PendingPartition(ConsoleOutputStream stream, String text) {
+ PendingPartition(OutputStream stream, String text) {
this.stream = stream;
if (text != null) {
append(text);
14 years, 9 months
JBoss Tools SVN: r32685 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-07 03:36:30 -0400 (Thu, 07 Jul 2011)
New Revision: 32685
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties
Log:
Text error in strings
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties 2011-07-07 00:19:35 UTC (rev 32684)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties 2011-07-07 07:36:30 UTC (rev 32685)
@@ -2,7 +2,7 @@
REMOTE_SERVER_CONFIG=Remote Server Configuration\:
TEST=Test...
REMOTE_SERVER_TEST=Test of Remote System
-REMOTE_SERVER_TEST_SUCCESS=The remote server is properly configured.TEST;
+REMOTE_SERVER_TEST_SUCCESS=The remote server is properly configured.
VALIDATING_REMOTE_CONFIG=Validating Remote Configuration
EMPTY_HOST=Host is empty!
FILE_SUBSYSTEM_NOT_FOUND=No File Sub System found on RSE system {0}
14 years, 9 months
JBoss Tools SVN: r32684 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-06 20:19:35 -0400 (Wed, 06 Jul 2011)
New Revision: 32684
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-07 00:05:12 UTC (rev 32683)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-07 00:19:35 UTC (rev 32684)
@@ -33,6 +33,7 @@
public void setUp() throws Exception {
project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/TwoWebContentFolders");
+ JobUtils.waitForIdle();
project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
JobUtils.waitForIdle();
}
14 years, 9 months
JBoss Tools SVN: r32683 - in workspace/snjeza/org.jboss.tools.remote.debug.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-06 20:05:12 -0400 (Wed, 06 Jul 2011)
New Revision: 32683
Added:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070204.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070204.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070204.jar
Removed:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070150.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070150.jar
Modified:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
Log:
JBIDE-8548 Support auto discovery of remote processes for debugging
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070204.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070204.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070150.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070204.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070204.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070150.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070204.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070204.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-06 23:56:53 UTC (rev 32682)
+++ workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-07 00:05:12 UTC (rev 32683)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107070150">
+ <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107070204.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107070204">
<category name="org.jboss.tools.remote.debug"/>
</feature>
<category-def name="org.jboss.tools.remote.debug" label="JBoss Tools Launching Support"/>
14 years, 9 months
JBoss Tools SVN: r32682 - in trunk: jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-06 19:56:53 -0400 (Wed, 06 Jul 2011)
New Revision: 32682
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9138
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-07-06 23:52:46 UTC (rev 32681)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-07-06 23:56:53 UTC (rev 32682)
@@ -42,6 +42,7 @@
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager;
import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2TemplateManager;
+import org.jboss.tools.jst.web.WebUtils;
/**
*
@@ -260,11 +261,11 @@
}
IVirtualComponent component = ComponentCore.createComponent(project);
if (component != null) {
- IVirtualFolder webRootFolder = component.getRootFolder().getFolder(
- new Path("/")); //$NON-NLS-1$
- IContainer folder = webRootFolder.getUnderlyingFolder();
+ IContainer[] folders = WebUtils.getWebRootFolders(project, false);
+ if(folders == null || folders.length == 0)
+ return null;
IFolder webFolder = ResourcesPlugin.getWorkspace().getRoot()
- .getFolder(folder.getFullPath());
+ .getFolder(folders[0].getFullPath());
IFolder resourcesFolder = webFolder.getFolder("resources"); //$NON-NLS-1$
NullProgressMonitor monitor = new NullProgressMonitor();
if (!resourcesFolder.exists()) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2011-07-06 23:52:46 UTC (rev 32681)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2011-07-06 23:56:53 UTC (rev 32682)
@@ -84,7 +84,7 @@
return (modelNature != null) ? WebProject.getInstance(modelNature.getModel()).getWebRootLocation() : null;
}
- public static IContainer[] getWebRootFolders(IProject project) {
+ public static IContainer[] getWebRootFolders(IProject project, boolean ignoreTarget) {
IFacetedProject facetedProject = null;
try {
facetedProject = ProjectFacetsManager.create(project);
@@ -95,12 +95,25 @@
IVirtualComponent component = ComponentCore.createComponent(project);
if(component!=null) {
IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- return webRootVirtFolder.getUnderlyingFolders();
+ IContainer[] folders = webRootVirtFolder.getUnderlyingFolders();
+ if(folders.length > 1){
+ ArrayList<IContainer> containers = new ArrayList<IContainer>();
+ for(IContainer container : folders){
+ if(container.getFullPath().segmentCount() < 2 || !"target".equals(container.getFullPath().segment(1))) //$NON-NLS-1$
+ containers.add(container);
+ }
+ return containers.toArray(new IContainer[]{});
+ }else
+ return folders;
}
}
return null;
}
+ public static IContainer[] getWebRootFolders(IProject project) {
+ return getWebRootFolders(project, false);
+ }
+
public static String[] getServletLibraries(String natureId, String templateBase, String servletVersion) {
String classPathVarName = findClassPathVarByNatureId(natureId);
14 years, 9 months
JBoss Tools SVN: r32681 - in workspace/snjeza/org.jboss.tools.remote.debug.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-06 19:52:46 -0400 (Wed, 06 Jul 2011)
New Revision: 32681
Added:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070150.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070150.jar
Removed:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070055.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070055.jar
Modified:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
Log:
JBIDE-8548 Support auto discovery of remote processes for debugging
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070055.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070150.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070150.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070055.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070150.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070150.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-06 23:17:43 UTC (rev 32680)
+++ workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-06 23:52:46 UTC (rev 32681)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107070055">
+ <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107070150.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107070150">
<category name="org.jboss.tools.remote.debug"/>
</feature>
<category-def name="org.jboss.tools.remote.debug" label="JBoss Tools Launching Support"/>
14 years, 9 months