From 46a94bddf28a08c69f1af100aaaf73f633bcfa4f Mon Sep 17 00:00:00 2001 From: jensp Date: Sun, 23 Apr 2017 17:30:53 +0000 Subject: [PATCH] CCM NG/ccm-core: Some more testing with Vaadin git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4685 8810af33-2d31-482b-a856-94f89814c4df --- ccm-bundle-devel-wildfly-web/pom.xml | 8 + ccm-core/pom.xml | 22 +- .../org/libreccm/admin/ui/AdminUIVaadin.java | 10 + .../java/org/libreccm/admin/ui/AdminView.java | 101 +- .../org/libreccm/admin/ui/JpqlConsole.java | 228 + .../admin/ui/JpqlConsoleController.java | 49 + .../java/org/libreccm/admin/ui/LoginView.java | 65 +- .../VAADIN/themes/ccm-core/addons.scss | 7 + .../VAADIN/themes/ccm-core/ccm-core.scss | 17 + .../VAADIN/themes/ccm-core/styles.css | 12511 ++++++++++++++++ .../VAADIN/themes/ccm-core/styles.scss | 5 + .../ui/admin/AdminResources.properties | 2 + .../ui/admin/AdminResources_de.properties | 2 + .../ui/admin/AdminResources_en.properties | 2 + .../ui/admin/AdminResources_fr.properties | 2 + pom.xml | 26 +- 16 files changed, 13037 insertions(+), 20 deletions(-) create mode 100644 ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java create mode 100644 ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsoleController.java create mode 100644 ccm-core/src/main/resources/VAADIN/themes/ccm-core/addons.scss create mode 100644 ccm-core/src/main/resources/VAADIN/themes/ccm-core/ccm-core.scss create mode 100644 ccm-core/src/main/resources/VAADIN/themes/ccm-core/styles.css create mode 100644 ccm-core/src/main/resources/VAADIN/themes/ccm-core/styles.scss diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml index f0388540a..41d2ede7a 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly-web/pom.xml @@ -95,6 +95,14 @@ ccm-theme-foundry jar + + org.libreccm + ccm-core + jar + + VAADIN/ + + org.librecms ccm-cms diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 7badfda41..f4288a4e9 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -206,17 +206,17 @@ com.vaadin vaadin-themes - 8.0.4 + com.vaadin vaadin-client-compiled - 8.0.4 + com.vaadin vaadin-compatibility-client-compiled - 8.0.4 + com.vaadin @@ -376,6 +376,22 @@ + + com.vaadin + vaadin-maven-plugin + + + + clean + resources + update-theme + update-widgetset + compile-theme + compile + + + + + + com.vaadin + vaadin-compatibility-client-compiled + 8.0.5 + com.vaadin vaadin-compatibility-server - 8.0.4 + 8.0.5 com.vaadin vaadin-compatibility-shared - 8.0.4 + 8.0.5 com.vaadin vaadin-compatibility-themes - 8.0.4 + 8.0.5 com.vaadin vaadin-cdi 2.0.0 + + com.vaadin + vaadin-client-compiled + 8.0.5 + + + com.vaadin + vaadin-themes + 8.0.5 +