From 66d60ab6015ffaadce3bf6c906b9463c30649b81 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 14 Aug 2012 15:11:40 +0300 Subject: [PATCH] Moved client compiler sources to own source folder (#9299) --- ...ctConnectorClassBasedFactoryGenerator.java | 0 .../AcceptCriteriaFactoryGenerator.java | 0 .../gwt/widgetsetutils/ClassPathExplorer.java | 0 .../ConnectorStateFactoryGenerator.java | 0 .../ConnectorWidgetFactoryGenerator.java | 0 .../CustomWidgetMapGenerator.java | 0 .../EagerWidgetMapGenerator.java | 0 .../GeneratedRpcMethodProviderGenerator.java | 0 .../LazyWidgetMapGenerator.java | 0 .../RpcProxyCreatorGenerator.java | 0 .../gwt/widgetsetutils/RpcProxyGenerator.java | 0 .../widgetsetutils/SerializerGenerator.java | 0 .../SerializerMapGenerator.java | 0 .../widgetsetutils/WidgetMapGenerator.java | 0 .../gwt/widgetsetutils/WidgetSetBuilder.java | 0 .../com/vaadin/tools/WidgetsetCompiler.java | 188 +++++++++--------- 16 files changed, 94 insertions(+), 94 deletions(-) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java (100%) rename {client => client-compiler}/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java (100%) rename {server => client-compiler}/src/com/vaadin/tools/WidgetsetCompiler.java (97%) mode change 100644 => 100755 diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java diff --git a/client/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java similarity index 100% rename from client/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java rename to client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java diff --git a/server/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java old mode 100644 new mode 100755 similarity index 97% rename from server/src/com/vaadin/tools/WidgetsetCompiler.java rename to client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java index ecc1946e60..476136a584 --- a/server/src/com/vaadin/tools/WidgetsetCompiler.java +++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java @@ -1,94 +1,94 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.tools; - -import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; - -import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder; - -/** - * A wrapper for the GWT 1.6 compiler that runs the compiler in a new thread. - * - * This allows circumventing a J2SE 5.0 bug (6316197) that prevents setting the - * stack size for the main thread. Thus, larger widgetsets can be compiled. - * - * This class takes the same command line arguments as the - * com.google.gwt.dev.GWTCompiler class. The old and deprecated compiler is used - * for compatibility with GWT 1.5. - * - * A typical invocation would use e.g. the following arguments - * - * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet" - * - * In addition, larger memory usage settings for the VM should be used, e.g. - * - * "-Xms256M -Xmx512M -Xss8M" - * - * The source directory containing widgetset and related classes must be - * included in the classpath, as well as the gwt-dev-[platform].jar and other - * relevant JARs. - * - * @deprecated with Java 6, can use com.google.gwt.dev.Compiler directly (also - * in Eclipse plug-in etc.) - */ -@Deprecated -public class WidgetsetCompiler { - - /** - * @param args - * same arguments as for com.google.gwt.dev.Compiler - */ - public static void main(final String[] args) { - try { - // run the compiler in a different thread to enable using the - // user-set stack size - - // on Windows, the default stack size is too small for the main - // thread and cannot be changed in JRE 1.5 (see - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197) - - Runnable runCompiler = new Runnable() { - @Override - public void run() { - try { - // GWTCompiler.main(args); - // avoid warnings - - String wsname = args[args.length - 1]; - - // TODO expecting this is launched via eclipse WTP - // project - System.out - .println("Updating GWT module description file..."); - WidgetSetBuilder.updateWidgetSet(wsname); - System.out.println("Done."); - - System.out.println("Starting GWT compiler"); - System.setProperty("gwt.nowarn.legacy.tools", "true"); - Class compilerClass = Class - .forName("com.google.gwt.dev.GWTCompiler"); - Method method = compilerClass.getDeclaredMethod("main", - String[].class); - method.invoke(null, new Object[] { args }); - } catch (Throwable thr) { - getLogger().log(Level.SEVERE, - "Widgetset compilation failed", thr); - } - } - }; - Thread runThread = new Thread(runCompiler); - runThread.start(); - runThread.join(); - System.out.println("Widgetset compilation finished"); - } catch (Throwable thr) { - getLogger().log(Level.SEVERE, "Widgetset compilation failed", thr); - } - } - - private static final Logger getLogger() { - return Logger.getLogger(WidgetsetCompiler.class.getName()); - } -} +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tools; + +import java.lang.reflect.Method; +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder; + +/** + * A wrapper for the GWT 1.6 compiler that runs the compiler in a new thread. + * + * This allows circumventing a J2SE 5.0 bug (6316197) that prevents setting the + * stack size for the main thread. Thus, larger widgetsets can be compiled. + * + * This class takes the same command line arguments as the + * com.google.gwt.dev.GWTCompiler class. The old and deprecated compiler is used + * for compatibility with GWT 1.5. + * + * A typical invocation would use e.g. the following arguments + * + * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet" + * + * In addition, larger memory usage settings for the VM should be used, e.g. + * + * "-Xms256M -Xmx512M -Xss8M" + * + * The source directory containing widgetset and related classes must be + * included in the classpath, as well as the gwt-dev-[platform].jar and other + * relevant JARs. + * + * @deprecated with Java 6, can use com.google.gwt.dev.Compiler directly (also + * in Eclipse plug-in etc.) + */ +@Deprecated +public class WidgetsetCompiler { + + /** + * @param args + * same arguments as for com.google.gwt.dev.Compiler + */ + public static void main(final String[] args) { + try { + // run the compiler in a different thread to enable using the + // user-set stack size + + // on Windows, the default stack size is too small for the main + // thread and cannot be changed in JRE 1.5 (see + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197) + + Runnable runCompiler = new Runnable() { + @Override + public void run() { + try { + // GWTCompiler.main(args); + // avoid warnings + + String wsname = args[args.length - 1]; + + // TODO expecting this is launched via eclipse WTP + // project + System.out + .println("Updating GWT module description file..."); + WidgetSetBuilder.updateWidgetSet(wsname); + System.out.println("Done."); + + System.out.println("Starting GWT compiler"); + System.setProperty("gwt.nowarn.legacy.tools", "true"); + Class compilerClass = Class + .forName("com.google.gwt.dev.GWTCompiler"); + Method method = compilerClass.getDeclaredMethod("main", + String[].class); + method.invoke(null, new Object[] { args }); + } catch (Throwable thr) { + getLogger().log(Level.SEVERE, + "Widgetset compilation failed", thr); + } + } + }; + Thread runThread = new Thread(runCompiler); + runThread.start(); + runThread.join(); + System.out.println("Widgetset compilation finished"); + } catch (Throwable thr) { + getLogger().log(Level.SEVERE, "Widgetset compilation failed", thr); + } + } + + private static final Logger getLogger() { + return Logger.getLogger(WidgetsetCompiler.class.getName()); + } +} -- 2.39.5