diff --git a/plugins/org.eclipse.tm.terminal.telnet/.classpath b/plugins/org.eclipse.tm.terminal.telnet/.classpath
index 73022aacf0d..37d5094e3a9 100644
--- a/plugins/org.eclipse.tm.terminal.telnet/.classpath
+++ b/plugins/org.eclipse.tm.terminal.telnet/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
index 64e23de578a..58fb6219800 100644
--- a/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,6 @@
-#Fri Apr 11 02:37:35 CEST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
@@ -72,4 +71,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
index 8f0fb3a2e12..44fb88a1e38 100644
--- a/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
@@ -8,6 +8,5 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)"
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true
diff --git a/plugins/org.eclipse.tm.terminal/.classpath b/plugins/org.eclipse.tm.terminal/.classpath
index 73022aacf0d..37d5094e3a9 100644
--- a/plugins/org.eclipse.tm.terminal/.classpath
+++ b/plugins/org.eclipse.tm.terminal/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
index 64e23de578a..58fb6219800 100644
--- a/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,6 @@
-#Fri Apr 11 02:37:35 CEST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
@@ -72,4 +71,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
index a97d4700d2c..115ffe45d51 100644
--- a/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ClassPath: .
 Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclipse.tm.terminal.test",
  org.eclipse.tm.internal.terminal.control;x-friends:="org.eclipse.tm.terminal.view",
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
index d5958d9c3f6..894df7e0cd9 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
@@ -206,7 +206,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend {
 		synchronized (fTerminal) {
 			if(!isCusorInScrollingRegion())
 				return;
-			assert n>0;
+//			assert n>0;
 			int line=toAbsoluteLine(fCursorLine);
 			int nLines=fTerminal.getHeight()-line;
 			fTerminal.scroll(line, nLines, n);
@@ -236,7 +236,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend {
 		synchronized (fTerminal) {
 			if(!isCusorInScrollingRegion())
 				return;
-			assert n>0;
+//			assert n>0;
 			int line=toAbsoluteLine(fCursorLine);
 			int nLines=fTerminal.getHeight()-line;
 			fTerminal.scroll(line, nLines, -n);
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
index 4bebcb66900..babe0c767e4 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
@@ -254,7 +254,7 @@ public class SnapshotChanges implements ISnapshotChanges {
 	 * @param shift must be negative!
 	 */
 	private void scrollChangesLinesWithNegativeShift(int line, int n, int shift) {
-		assert shift <0 || throwRuntimeException();
+//		assert shift <0 || throwRuntimeException();
 		// scroll the region
 		// don't run out of bounds!
 		int m=Math.min(line+n+shift,getChangedLineLength()+shift);
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
index 6038241ca48..b4847dae41e 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
@@ -34,8 +34,8 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 		fMaxHeight=maxHeight;
 		fData=data;
 		fData.setDimensions(maxHeight, fData.getWidth());
-		if(maxHeight>2)
-			assert shiftOffset(-2) || throwRuntimeException();
+//		if(maxHeight>2)
+//			assert shiftOffset(-2) || throwRuntimeException();
 	}
 	public TerminalTextDataFastScroll(int maxHeight) {
 		this(new TerminalTextDataStore(),maxHeight);
@@ -64,7 +64,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 	 * @param delta
 	 */
 	void moveOffset(int delta) {
-		assert Math.abs(delta)<fMaxHeight || throwRuntimeException();
+//		assert Math.abs(delta)<fMaxHeight || throwRuntimeException();
 		fOffset=(fMaxHeight+fOffset+delta)%fMaxHeight;
 		
 	}
@@ -101,19 +101,19 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 	}
 
 	public void copyRange(ITerminalTextData source, int sourceStartLine, int destStartLine, int length) {
-		assert (destStartLine>=0 && destStartLine+length<=fHeight) || throwRuntimeException();
+//		assert (destStartLine>=0 && destStartLine+length<=fHeight) || throwRuntimeException();
 		for (int i = 0; i < length; i++) {
 			fData.copyLine(source, i+sourceStartLine, getPositionOfLine(i+destStartLine));
 		}
 	}
 
 	public char getChar(int line, int column) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		return fData.getChar(getPositionOfLine(line), column);
 	}
 
 	public char[] getChars(int line) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		return fData.getChars(getPositionOfLine(line));
 	}
 
@@ -122,7 +122,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 	}
 
 	public LineSegment[] getLineSegments(int line, int startCol, int numberOfCols) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		return fData.getLineSegments(getPositionOfLine(line), startCol, numberOfCols);
 	}
 
@@ -131,12 +131,12 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 	}
 
 	public Style getStyle(int line, int column) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		return fData.getStyle(getPositionOfLine(line), column);
 	}
 
 	public Style[] getStyles(int line) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		return fData.getStyles(getPositionOfLine(line));
 	}
 
@@ -153,7 +153,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 		}
 	}
 	public void scroll(int startLine, int size, int shift) {
-		assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException();
+//		assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException();
 		if(shift>=fMaxHeight || -shift>=fMaxHeight) {
 			cleanLines(startLine, fMaxHeight-startLine);
 			return;
@@ -187,23 +187,23 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 	}
 
 	public void setChar(int line, int column, char c, Style style) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		fData.setChar(getPositionOfLine(line), column, c, style);
 	}
 
 	public void setChars(int line, int column, char[] chars, int start, int len, Style style) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		fData.setChars(getPositionOfLine(line), column, chars, start, len, style);
 	}
 
 	public void setChars(int line, int column, char[] chars, Style style) {
-		assert (line>=0 && line<fHeight) || throwRuntimeException();
+//		assert (line>=0 && line<fHeight) || throwRuntimeException();
 		fData.setChars(getPositionOfLine(line), column, chars, style);
 	}
 
 	public void setDimensions(int height, int width) {
-		assert height>=0 || throwRuntimeException();
-		assert width>=0 || throwRuntimeException();
+//		assert height>=0 || throwRuntimeException();
+//		assert width>=0 || throwRuntimeException();
 		if(height > fMaxHeight)
 			setMaxHeight(height);
 		fHeight=height;
@@ -212,7 +212,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
 	}
 
 	public void setMaxHeight(int maxHeight) {
-		assert maxHeight>=fHeight || throwRuntimeException();
+//		assert maxHeight>=fHeight || throwRuntimeException();
 		// move everything to offset0
 		int start=getPositionOfLine(0);
 		if(start!=0) {
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
index b24c48b45ad..dac7600ae7b 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
@@ -267,8 +267,8 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot {
 	}
 
 	public void setInterestWindow(int startLine, int size) {
-		assert startLine>=0 || throwRuntimeException();
-		assert size>=0 || throwRuntimeException();
+//		assert startLine>=0 || throwRuntimeException();
+//		assert size>=0 || throwRuntimeException();
 		fInterestWindowStartLine=startLine;
 		fInterestWindowSize=size;
 		fSnapshot.setWindow(startLine, size);
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
index fd85cc35e3d..51535ae4383 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
@@ -62,8 +62,8 @@ public class TerminalTextDataStore implements ITerminalTextData {
 	 * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setDimensions(int, int)
 	 */
 	public void setDimensions(int height, int width) {
-		assert height>=0 || throwRuntimeException();
-		assert width>=0  || throwRuntimeException();
+//		assert height>=0 || throwRuntimeException();
+//		assert width>=0  || throwRuntimeException();
 		// just extend the region
 		if(height>fChars.length) {
 			int h=4*height/3;
@@ -144,7 +144,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
 	 * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int)
 	 */
 	public char getChar(int line, int column) {
-		assert column<fWidth || throwRuntimeException();
+//		assert column<fWidth || throwRuntimeException();
 		if(fChars[line]==null||column>=fChars[line].length)
 			return 0;
 		return fChars[line][column];
@@ -153,7 +153,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
 	 * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getStyle(int, int)
 	 */
 	public Style getStyle(int line, int column) {
-		assert column<fWidth || throwRuntimeException();
+//		assert column<fWidth || throwRuntimeException();
 		if(fStyle[line]==null || column>=fStyle[line].length)
 			return null;
 		return fStyle[line][column];
@@ -202,7 +202,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
 	 * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#scroll(int, int, int)
 	 */
 	public void scroll(int startLine, int size, int shift) {
-		assert startLine+size <= getHeight() || throwRuntimeException();
+//		assert startLine+size <= getHeight() || throwRuntimeException();
 		if(shift<0) {
 			// move the region up
 			// shift is negative!!
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
index 0c4072cc5b1..7410f01331a 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
@@ -128,7 +128,7 @@ public class TerminalTextDataWindow implements ITerminalTextData {
 			fData.copyLine(source, sourceLine, destLine-fWindowStartLine);
 	}
 	public void scroll(int startLine, int size, int shift) {
-		assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException();
+//		assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException();
 		int n=size;
 		int start=startLine-fWindowStartLine;
 		// if start outside our range, cut the length to copy
@@ -157,7 +157,7 @@ public class TerminalTextDataWindow implements ITerminalTextData {
 		fData.setChars(line-fWindowStartLine, column, chars, style);
 	}
 	public void setDimensions(int height, int width) {
-		assert height>=0 || throwRuntimeException();
+//		assert height>=0 || throwRuntimeException();
 		fData.setDimensions(fWindowSize, width);
 		fHeight=height;
 	}
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
index 770db9733bf..15abda3a4a6 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
@@ -231,7 +231,7 @@ abstract public class AbstractTextCanvasModel implements ITextCanvasModel {
 		fCurrentSelection=extractSelectedText();
 	}
 	private void doSetSelection(int startLine, int endLine, int startColumn, int endColumn) {
-		assert(startLine<0 || startLine<=endLine);
+//		assert(startLine<0 || startLine<=endLine);
 		if(startLine>=0) {
 			if(fSelectionSnapshot==null) {
 				fSelectionSnapshot=fSnapshot.getTerminalTextData().makeSnapshot();
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
index f0e11324a2d..1dd93c7461d 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
@@ -97,7 +97,7 @@ public class PipedInputStream extends InputStream {
 			return fBuffer.length - fUsedSlots;
 		}
 		public void write(byte[] b, int off, int len) throws InterruptedException {
-			assert len<=getFreeSlots();
+//			assert len<=getFreeSlots();
 			while (fUsedSlots == fBuffer.length)
 				// wait until not full
 				wait();
@@ -133,7 +133,7 @@ public class PipedInputStream extends InputStream {
 			return b;
 		}
 		public int read(byte[] cbuf, int off, int len) throws InterruptedException {
-			assert len<=available();
+//			assert len<=available();
 			while (fUsedSlots == 0) {
 				if(fClosed)
 					return 0;