Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

'Root_R3_2_maintenance'.
  • Loading branch information...
2 parents 0bb11ad + 14bf7de commit 7c5be5b6fec802bea4040afc9649cbe84f2b7ed5 nitind committed Sep 6, 2011
Showing with 3,076 additions and 1,962 deletions.
  1. +13 −4 bundles/org.eclipse.wst.jsdt.debug.crossfire/META-INF/MANIFEST.MF
  2. +12 −0 bundles/org.eclipse.wst.jsdt.debug.crossfire/OSGI-INF/l10n/bundle.properties
  3. +13 −1 bundles/org.eclipse.wst.jsdt.debug.crossfire/build.properties
  4. +17 −4 ...e.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/CrossFirePlugin.java
  5. +5 −2 ...g.eclipse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/Tracing.java
  6. +89 −0 ...dt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/ConsoleArgument.java
  7. +117 −56 ...ssfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/CrossfireAttachingConnector.java
  8. +7 −6 ...ssfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/CrossfireListeningConnector.java
  9. +89 −0 ...t.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/DOMArgument.java
  10. +3 −3 ....jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/HostArgument.java
  11. +89 −0 ....debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/InspectorArgument.java
  12. +12 −2 ....wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/Messages.java
  13. +89 −0 ...t.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/NetArgument.java
  14. +89 −0 ...jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/TraceArgument.java
  15. +12 −2 ...sdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/connect/messages.properties
  16. +1 −1 ...pse.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/event/CFEvent.java
  17. +168 −49 ...st.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/event/CFEventQueue.java
  18. +3 −3 ....wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/event/CFEventSet.java
  19. +36 −0 ...t.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/event/CFResumeEvent.java
  20. +21 −11 ...debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFEventRequestManager.java
  21. +19 −1 ...t.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFFunctionReference.java
  22. +41 −3 ...st.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFNumberValue.java
  23. +75 −10 ...sdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFObjectReference.java
  24. +15 −6 ...e.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFProperty.java
  25. +40 −39 ...sdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFScriptReference.java
  26. +166 −76 ...wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFStackFrame.java
  27. +131 −42 ...sdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFThreadReference.java
  28. +44 −8 ...e.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVariable.java
  29. +449 −79 ...jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/CFVirtualMachine.java
  30. +276 −0 ...jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/RemoteBreakpoint.java
  31. +1 −1 ...t.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/jsdi/messages.properties
  32. +65 −1 ...ebug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFBreakpointRequest.java
  33. +1 −2 ...sdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFEventRequest.java
  34. +33 −0 ...dt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFResumeRequest.java
  35. +8 −0 ...jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/request/CFStepRequest.java
  36. +132 −16 ....jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/Attributes.java
  37. +40 −16 ...ire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/{Event.java → CFEventPacket.java}
  38. +9 −36 ...ossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/{Packet.java → CFPacket.java}
  39. +33 −24 ...src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/{Request.java → CFRequestPacket.java}
  40. +251 −0 ...debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFResponsePacket.java
  41. +202 −0 ...bug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFSocketConnection.java
  42. +85 −0 ...bug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/CFTransportService.java
  43. +33 −13 ...st.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/Commands.java
  44. +0 −53 ....jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/Connection.java
  45. +0 −167 ...sdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/DebugSession.java
  46. +0 −34 ....crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/DisconnectedException.java
  47. +25 −19 ...c/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/{HandShake.java → HandShakePacket.java}
  48. +17 −15 ...se.wst.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/JSON.java
  49. +0 −112 ...dt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/PacketManager.java
  50. +0 −279 ...g.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/PacketReceiveManager.java
  51. +0 −108 ...ebug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/PacketSendManager.java
  52. +0 −205 ...st.jsdt.debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/Response.java
  53. +0 −208 ...debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/SocketConnection.java
  54. +0 −140 ...crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/SocketTransportService.java
  55. +0 −29 ...debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/TimeoutException.java
  56. +0 −76 ...debug.crossfire/src/org/eclipse/wst/jsdt/debug/internal/crossfire/transport/TransportService.java
@@ -1,11 +1,20 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: JSDT Crossfire Debug Support
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.crossfire;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.wst.jsdt.debug.internal.crossfire.CrossFirePlugin
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.jsdt.debug.core;bundle-version="1.0.0"
+ org.eclipse.wst.jsdt.debug.core;bundle-version="1.0.0",
+ org.eclipse.wst.jsdt.debug.transport;bundle-version="1.0.0",
+ org.eclipse.wst.jsdt.core;bundle-version="1.0.0",
+ org.eclipse.debug.core
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.wst.jsdt.debug.internal.crossfire;x-internal:=true,
+ org.eclipse.wst.jsdt.debug.internal.crossfire.connect;x-internal:=true,
+ org.eclipse.wst.jsdt.debug.internal.crossfire.event;x-internal:=true,
+ org.eclipse.wst.jsdt.debug.internal.crossfire.jsdi;x-internal:=true,
+ org.eclipse.wst.jsdt.debug.internal.crossfire.request;x-internal:=true,
+ org.eclipse.wst.jsdt.debug.internal.crossfire.transport;x-internal:=true
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+Bundle-Vendor = Eclipse Web Tools Platform
+Bundle-Name = Crossfire JavaScript Debug
@@ -1,5 +1,17 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ OSGI-INF/l10n/bundle.properties,\
+ OSGI-INF/
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.crossfire;
import java.net.URI;
@@ -11,7 +21,7 @@
import org.eclipse.wst.jsdt.debug.internal.crossfire.event.CFEventQueue;
import org.eclipse.wst.jsdt.debug.internal.crossfire.jsdi.CFMirror;
import org.eclipse.wst.jsdt.debug.internal.crossfire.transport.JSON;
-import org.eclipse.wst.jsdt.debug.internal.crossfire.transport.Packet;
+import org.eclipse.wst.jsdt.debug.internal.crossfire.transport.CFPacket;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -27,11 +37,11 @@
*/
public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.debug.crossfire"; //$NON-NLS-1$
/**
- * Packet tracing option name
+ * CFPacket tracing option name
*/
public static final String TRC_PACKETS = PLUGIN_ID + "/packets"; //$NON-NLS-1$
/**
- * Event queue tracing option name
+ * CFEventPacket queue tracing option name
*/
public static final String TRC_EVENTQUEUE = PLUGIN_ID + "/eventqueue"; //$NON-NLS-1$
/**
@@ -72,6 +82,9 @@ public void stop(BundleContext bundleContext) throws Exception {
}
}
+ /**
+ * @return the singleton instance
+ */
public static CrossFirePlugin getDefault() {
return plugin;
}
@@ -122,7 +135,7 @@ public void configureTracing() {
if(CrossFirePlugin.getDefault().isDebugging()) {
String option = Platform.getDebugOption(TRC_PACKETS);
if(option != null) {
- Packet.setTracing(Boolean.valueOf(option).booleanValue());
+ CFPacket.setTracing(Boolean.valueOf(option).booleanValue());
}
option = Platform.getDebugOption(TRC_EVENTQUEUE);
if(option != null) {
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,7 +27,10 @@
* @param string
*/
public static void writeString(String string) {
- System.out.println(string.replaceAll(JSON.LINE_FEED, PRINTABLE_LINE_FEED));
+ String s = string.replaceAll(JSON.LINE_FEED, PRINTABLE_LINE_FEED);
+ s = s.replaceAll("\r", "\\\\r"); //$NON-NLS-1$//$NON-NLS-2$
+ s = s.replaceAll("\n", "\\\\n"); //$NON-NLS-1$//$NON-NLS-2$
+ System.out.println("[CROSSFIRE]" + s); //$NON-NLS-1$
}
}
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.jsdt.debug.internal.crossfire.connect;
+
+import org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument;
+import org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.BooleanArgument;
+
+/**
+ * An {@link Argument} to enable the <code>console</code> tool
+ *
+ * @since 1.0
+ */
+public class ConsoleArgument implements BooleanArgument {
+
+ public static final String CONSOLE = "console"; //$NON-NLS-1$
+
+ private boolean fValue = true;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument#description()
+ */
+ public String description() {
+ return Messages.console_arg_description;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument#label()
+ */
+ public String label() {
+ return Messages.console_arg_label;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument#mustSpecify()
+ */
+ public boolean mustSpecify() {
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument#name()
+ */
+ public String name() {
+ return CONSOLE;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument#setValue(java.lang.String)
+ */
+ public void setValue(String value) {
+ fValue = Boolean.valueOf(value).booleanValue();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.Argument#value()
+ */
+ public String value() {
+ return Boolean.toString(fValue);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.BooleanArgument#booleanValue()
+ */
+ public boolean booleanValue() {
+ return fValue;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.BooleanArgument#isValid(java.lang.String)
+ */
+ public boolean isValid(String value) {
+ return value != null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector.BooleanArgument#setValue(boolean)
+ */
+ public void setValue(boolean booleanValue) {
+ fValue = booleanValue;
+ }
+}
Oops, something went wrong.

0 comments on commit 7c5be5b

Please sign in to comment.