From 06c7d87dfb3df4c1a1675aa4d3264e8e8dddd2d1 Mon Sep 17 00:00:00 2001 From: Luca Piccarreta Date: Sun, 21 Jul 2024 15:48:06 +0200 Subject: [PATCH 1/2] Rebuild eclipse project files without CheckstyleBuilder --- .../.project | 2 +- .../.project | 2 +- mirrors/.project | 17 -------- .../.classpath | 8 +--- .../.classpath | 8 +--- .../.project | 6 --- .../com.gwtplugins.gdt.eclipse.core/.project | 6 --- .../.classpath | 8 +--- .../.classpath | 7 ---- .../.project | 34 ---------------- .../.project | 6 --- .../.classpath | 2 +- .../.classpath | 2 +- .../com.gwtplugins.gdt.eclipse.suite/.project | 6 --- .../.classpath | 7 ---- .../.project | 40 ------------------- .../.classpath | 7 ---- .../.project | 40 ------------------- .../.classpath | 9 +---- .../.project | 6 --- .../.classpath | 10 ++--- .../com.gwtplugins.gwt.eclipse.core/.project | 6 --- .../.classpath | 8 +--- .../.project | 6 --- .../.classpath | 8 +--- .../.classpath | 8 +--- .../.project | 6 --- .../.classpath | 8 +--- .../.project | 6 --- .../.classpath | 8 +--- .../.project | 6 --- .../com.gwtplugins.gwt.eclipse.wtp/.classpath | 10 ++--- .../com.gwtplugins.gwt.eclipse.wtp/.project | 6 --- repo/.project | 2 +- resources/.project | 2 +- 35 files changed, 30 insertions(+), 293 deletions(-) delete mode 100644 mirrors/.project delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.classpath delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.project delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.swtbot/.classpath delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.swtbot/.project delete mode 100644 plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.classpath delete mode 100644 plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.project diff --git a/features/com.gwtplugins.eclipse.sdkbundle.gwt27.feature/.project b/features/com.gwtplugins.eclipse.sdkbundle.gwt27.feature/.project index ec0f6620..25bf1b66 100644 --- a/features/com.gwtplugins.eclipse.sdkbundle.gwt27.feature/.project +++ b/features/com.gwtplugins.eclipse.sdkbundle.gwt27.feature/.project @@ -1,6 +1,6 @@ - com.gwtplugins.eclipse.sdkbundle.e45.feature + com.gwtplugins.eclipse.sdkbundle.gwt27.feature diff --git a/features/com.gwtplugins.eclipse.suite.v3.feature/.project b/features/com.gwtplugins.eclipse.suite.v3.feature/.project index 077b5dc3..6a2cc0f0 100644 --- a/features/com.gwtplugins.eclipse.suite.v3.feature/.project +++ b/features/com.gwtplugins.eclipse.suite.v3.feature/.project @@ -1,6 +1,6 @@ - com.gwtplugins.eclipse.suite.feature + com.gwtplugins.eclipse.suite.v3.feature diff --git a/mirrors/.project b/mirrors/.project deleted file mode 100644 index 40b11df6..00000000 --- a/mirrors/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - mirrors - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/plugins/com.gwtplugins.gcp.eclipse.testing/.classpath b/plugins/com.gwtplugins.gcp.eclipse.testing/.classpath index ce9e006b..4bf90796 100644 --- a/plugins/com.gwtplugins.gcp.eclipse.testing/.classpath +++ b/plugins/com.gwtplugins.gcp.eclipse.testing/.classpath @@ -1,11 +1,7 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath index beecf8f7..52109151 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath +++ b/plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath @@ -1,12 +1,8 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gdt.eclipse.core.test/.project b/plugins/com.gwtplugins.gdt.eclipse.core.test/.project index e437d0c4..f9fee386 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.core.test/.project +++ b/plugins/com.gwtplugins.gdt.eclipse.core.test/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gdt.eclipse.core/.project b/plugins/com.gwtplugins.gdt.eclipse.core/.project index d37e62c1..04a93824 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.core/.project +++ b/plugins/com.gwtplugins.gdt.eclipse.core/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gdt.eclipse.platform/.classpath b/plugins/com.gwtplugins.gdt.eclipse.platform/.classpath index ce9e006b..4bf90796 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.platform/.classpath +++ b/plugins/com.gwtplugins.gdt.eclipse.platform/.classpath @@ -1,11 +1,7 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.classpath deleted file mode 100644 index b9a5b1ec..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.project b/plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.project deleted file mode 100644 index 8cc95792..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.suite.test.swtbot/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - com.gwtplugins.gdt.eclipse.suite.test.swtbot - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite.test/.project b/plugins/com.gwtplugins.gdt.eclipse.suite.test/.project index fe222d5c..126ebb71 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.suite.test/.project +++ b/plugins/com.gwtplugins.gdt.eclipse.suite.test/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite.update/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite.update/.classpath index f656d575..4bf90796 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.suite.update/.classpath +++ b/plugins/com.gwtplugins.gdt.eclipse.suite.update/.classpath @@ -2,6 +2,6 @@ - + diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/.classpath b/plugins/com.gwtplugins.gdt.eclipse.suite/.classpath index f656d575..4bf90796 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.suite/.classpath +++ b/plugins/com.gwtplugins.gdt.eclipse.suite/.classpath @@ -2,6 +2,6 @@ - + diff --git a/plugins/com.gwtplugins.gdt.eclipse.suite/.project b/plugins/com.gwtplugins.gdt.eclipse.suite/.project index 6f8640a0..e5e88f6a 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.suite/.project +++ b/plugins/com.gwtplugins.gdt.eclipse.suite/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gdt.eclipse.swtbot/.classpath b/plugins/com.gwtplugins.gdt.eclipse.swtbot/.classpath deleted file mode 100644 index b9a5b1ec..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.swtbot/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/com.gwtplugins.gdt.eclipse.swtbot/.project b/plugins/com.gwtplugins.gdt.eclipse.swtbot/.project deleted file mode 100644 index e0012fe6..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.swtbot/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - com.gwtplugins.gdt.eclipse.swtbot - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature - - diff --git a/plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.classpath b/plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.classpath deleted file mode 100644 index b9a5b1ec..00000000 --- a/plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.project b/plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.project deleted file mode 100644 index 543ae276..00000000 --- a/plugins/com.gwtplugins.gwt.eclipse.core.test.swtbot/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - com.gwtplugins.gwt.eclipse.core.test.swtbot - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature - - diff --git a/plugins/com.gwtplugins.gwt.eclipse.core.test/.classpath b/plugins/com.gwtplugins.gwt.eclipse.core.test/.classpath index 8b9f97b5..c1d8fca8 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.core.test/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.core.test/.classpath @@ -1,16 +1,11 @@ - - - - - + - + - diff --git a/plugins/com.gwtplugins.gwt.eclipse.core.test/.project b/plugins/com.gwtplugins.gwt.eclipse.core.test/.project index 96cd46f2..a40dce24 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.core.test/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.core.test/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gwt.eclipse.core/.classpath b/plugins/com.gwtplugins.gwt.eclipse.core/.classpath index 57f2c3cc..3e5a2a1f 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.core/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.core/.classpath @@ -1,13 +1,9 @@ - - - - - + - + + - diff --git a/plugins/com.gwtplugins.gwt.eclipse.core/.project b/plugins/com.gwtplugins.gwt.eclipse.core/.project index 323dcea4..5f7e30de 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.core/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.core/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.classpath b/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.classpath index 212867d9..c1d8fca8 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.classpath @@ -1,12 +1,8 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.project b/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.project index c2c401e2..109b6b40 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.oophm.test/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gwt.eclipse.testing/.classpath b/plugins/com.gwtplugins.gwt.eclipse.testing/.classpath index ce9e006b..4bf90796 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.testing/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.testing/.classpath @@ -1,11 +1,7 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.classpath b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.classpath index 212867d9..c1d8fca8 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.classpath @@ -1,12 +1,8 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.project b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.project index e6e85601..aae6fe8f 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven.test/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.classpath b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.classpath index ce9e006b..4bf90796 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.classpath @@ -1,11 +1,7 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.project b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.project index 0fa98074..67cd260f 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp.maven/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.classpath b/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.classpath index 212867d9..c1d8fca8 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.classpath @@ -1,12 +1,8 @@ - - - - - + - + diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.project b/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.project index 0e9d46f9..9dd7de94 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp.test/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp/.classpath b/plugins/com.gwtplugins.gwt.eclipse.wtp/.classpath index 102e67b7..75ed2ff8 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp/.classpath +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp/.classpath @@ -1,12 +1,8 @@ - - - - - + - - + + diff --git a/plugins/com.gwtplugins.gwt.eclipse.wtp/.project b/plugins/com.gwtplugins.gwt.eclipse.wtp/.project index 08187e1a..5ee1ba78 100644 --- a/plugins/com.gwtplugins.gwt.eclipse.wtp/.project +++ b/plugins/com.gwtplugins.gwt.eclipse.wtp/.project @@ -20,11 +20,6 @@ - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -35,6 +30,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature diff --git a/repo/.project b/repo/.project index ef5b4422..e17f25c8 100644 --- a/repo/.project +++ b/repo/.project @@ -1,6 +1,6 @@ - google-plugin-eclipse.repo + repo diff --git a/resources/.project b/resources/.project index 4999c2d5..2297b835 100644 --- a/resources/.project +++ b/resources/.project @@ -1,6 +1,6 @@ - google-plugin-eclipse.resources + resources From 485a521c4c9e88be41cfbc45df86550ea0b3fb9f Mon Sep 17 00:00:00 2001 From: Luca Piccarreta Date: Sun, 21 Jul 2024 15:48:27 +0200 Subject: [PATCH 2/2] Removed obsolete jetty code --- .../META-INF/MANIFEST.MF | 1 - .../eclipse/platform/jetty/IJettyServer.java | 28 --- .../gdt/eclipse/platform/jetty/JSON.java | 26 --- .../platform/jetty/JettyEclipseLogger.java | 165 ------------------ .../eclipse/platform/jetty/JettyServer.java | 94 ---------- 5 files changed, 314 deletions(-) delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/IJettyServer.java delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JSON.java delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyEclipseLogger.java delete mode 100644 plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyServer.java diff --git a/plugins/com.gwtplugins.gdt.eclipse.platform/META-INF/MANIFEST.MF b/plugins/com.gwtplugins.gdt.eclipse.platform/META-INF/MANIFEST.MF index 9d75723b..41fc37b7 100644 --- a/plugins/com.gwtplugins.gdt.eclipse.platform/META-INF/MANIFEST.MF +++ b/plugins/com.gwtplugins.gdt.eclipse.platform/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Export-Package: com.google.gdt.eclipse.platform.debug.ui, com.google.gdt.eclipse.platform.jdt.formatter, com.google.gdt.eclipse.platform.jdt.model, com.google.gdt.eclipse.platform.jdt.text.correction.proposals, - com.google.gdt.eclipse.platform.jetty, com.google.gdt.eclipse.platform.launch, com.google.gdt.eclipse.platform.shared.ui, com.google.gdt.eclipse.platform.ui, diff --git a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/IJettyServer.java b/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/IJettyServer.java deleted file mode 100644 index 4666e5d6..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/IJettyServer.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright 2012 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -package com.google.gdt.eclipse.platform.jetty; - -import javax.servlet.Servlet; - -/** - * A wrapper around the Jetty server built into Eclipse. - */ -public interface IJettyServer { - void addServlet(String path, Servlet servlet); - - int getPort(); - - void setPort(int port); -} diff --git a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JSON.java b/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JSON.java deleted file mode 100644 index b8cfa1e2..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JSON.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright 2012 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -package com.google.gdt.eclipse.platform.jetty; - -import java.util.Map; - -/** - * Delegate to the real JSON implementation. - */ -public class JSON { - public static String toString(Map map) { - return org.mortbay.util.ajax.JSON.toString(map); - } -} diff --git a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyEclipseLogger.java b/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyEclipseLogger.java deleted file mode 100644 index 4c3b6eea..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyEclipseLogger.java +++ /dev/null @@ -1,165 +0,0 @@ -/******************************************************************************* - * Copyright 2012 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -package com.google.gdt.eclipse.platform.jetty; - -import org.eclipse.core.runtime.ILog; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.jetty.util.log.Logger; - -/** - * This class routes the logging output from Jetty to the Eclipse log. - */ -public class JettyEclipseLogger implements Logger { - - private static ILog platformLog; - - private static final String LOGGER_NAME = "org.eclipse.jetty"; - - private static final String PLUGIN_ID = "com.gwtplugins.gdt.eclipse.platform.shared"; - - static { - platformLog = Platform.getLog(Platform.getBundle(PLUGIN_ID)); - } - - private boolean debug; - - private boolean info; - - public JettyEclipseLogger() { - debug = info = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/jetty/debug")); - - if (debug) { - info = true; - } else { - info = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/jetty/info")); - } - } - - private String format(String msg, Object... args) { - msg = String.valueOf(msg); // Avoids NPE - String braces = "{}"; - StringBuilder builder = new StringBuilder(); - int start = 0; - for (Object arg : args) { - int bracesIndex = msg.indexOf(braces, start); - if (bracesIndex < 0) { - builder.append(msg.substring(start)); - builder.append(" "); - builder.append(arg); - start = msg.length(); - } else { - builder.append(msg.substring(start, bracesIndex)); - builder.append(String.valueOf(arg)); - start = bracesIndex + braces.length(); - } - } - builder.append(msg.substring(start)); - return builder.toString(); - } - - @Override - public Logger getLogger(String name) { - return this; - } - - @Override - public String getName() { - return LOGGER_NAME; - } - - @Override - public void ignore(Throwable ignored) {} - - @Override - public void info(String msg, Object... args) { - if (info) { - log(IStatus.INFO, format(msg, args), null); - } - } - - @Override - public void info(String msg, Throwable thrown) { - log(IStatus.WARNING, msg, thrown); - } - - @Override - public void info(Throwable thrown) { - info("", thrown); - } - - @Override - public boolean isDebugEnabled() { - return debug; - } - - private void log(int severity, String message, Throwable exception) { - IStatus status = new Status(severity, PLUGIN_ID, "org.mortbay.jetty: " + message, exception); - - platformLog.log(status); - } - - @Override - public void setDebugEnabled(boolean enabled) { - debug = enabled; - } - - @Override - public void warn(String msg, Object... args) { - log(IStatus.WARNING, format(msg, args), null); - } - - @Override - public void warn(String msg, Throwable th) { - log(IStatus.WARNING, msg, th); - } - - @Override - public void warn(Throwable thrown) { - warn("", thrown); - } - - - // TODO api change don't override - // @Override - public void debug(String msg, Object... args) { - if (debug) { - log(IStatus.OK, format(msg, args), null); - } - } - - // TODO api change don't override - // @Override - public void debug(String msg, Throwable th) { - if (debug) { - log(IStatus.OK, msg, th); - } - } - - // TODO api change don't override - // @Override - public void debug(Throwable thrown) { - debug("", thrown); - } - - - // TODO api change don't override - // @Override - public void debug(String msg, long value) { - log(IStatus.INFO, format(msg, value), null); - } - -} diff --git a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyServer.java b/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyServer.java deleted file mode 100644 index 56874015..00000000 --- a/plugins/com.gwtplugins.gdt.eclipse.platform/src/com/google/gdt/eclipse/platform/jetty/JettyServer.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * Copyright 2012 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -package com.google.gdt.eclipse.platform.jetty; - -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHandler; -import org.eclipse.jetty.servlet.ServletHolder; - -import javax.servlet.Servlet; - -/** - * Helper to set up the server which listens for viewSource HTTP requests. - */ -public class JettyServer implements IJettyServer { - - static { - initLogging(); - } - - private static void initLogging() { - // This plugin is not in the classpath of the plugins that use Jetty, so - // Jetty will not be able to use a Class.forName() to find our Eclipse - // logger. - // System.setProperty("org.mortbay.log.class", - // JettyEclipseLogger.class.getName()); - - org.eclipse.jetty.util.log.Log.setLog(new JettyEclipseLogger()); - } - - private int port; - - private Server server; - - private final ServletHandler servletHandler = new ServletHandler(); - - /** - * Creates a JettyServer instance. - * - * @param classLoader unused - */ - public JettyServer(ClassLoader classLoader) { - // This implementation does not require the class loader - } - - @Override - public void addServlet(String path, Servlet servlet) { - servletHandler.addServletWithMapping(new ServletHolder(servlet), path); - } - - @Override - public int getPort() { - return port; - } - - @Override - public void setPort(int port) { - this.port = port; - } - - public void start() throws Exception { - - if (server != null) { - return; - } - - server = new Server(port); - ServletContextHandler root = new ServletContextHandler(server, "/"); - root.setServletHandler(servletHandler); - server.start(); - } - - public void stop() throws Exception { - if (server == null) { - return; - } - - server.stop(); - server = null; - } - -}