From 9f954e193fa14c1710d851d88608128e79cdd56d Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Fri, 12 Apr 2013 20:06:07 +0200
Subject: [PATCH] Updated a lib; Added an information message to the cockpit
editor and the cockpit about the development stage
---
.../lib/{guava-13.0.1.LICENSE => guava-14.0.1.LICENSE} | 0
Kieker.WebGUI/pom.xml | 3 +--
.../main/resources/lang/CockpitEditorPage_de.properties | 5 ++++-
.../main/resources/lang/CockpitEditorPage_en.properties | 5 ++++-
.../src/main/resources/lang/CockpitPage_de.properties | 5 ++++-
.../src/main/resources/lang/CockpitPage_en.properties | 5 ++++-
.../src/main/webapp/pages/CockpitEditorPage.xhtml | 9 +++++++++
Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml | 9 +++++++++
8 files changed, 35 insertions(+), 6 deletions(-)
rename Kieker.WebGUI/lib/{guava-13.0.1.LICENSE => guava-14.0.1.LICENSE} (100%)
diff --git a/Kieker.WebGUI/lib/guava-13.0.1.LICENSE b/Kieker.WebGUI/lib/guava-14.0.1.LICENSE
similarity index 100%
rename from Kieker.WebGUI/lib/guava-13.0.1.LICENSE
rename to Kieker.WebGUI/lib/guava-14.0.1.LICENSE
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index ab36a142..5bfa4b3f 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -29,7 +29,6 @@
<klay.jar>klay_0.2.0.jar</klay.jar>
<spring.version>3.1.2.RELEASE</spring.version>
<slf4j.version>1.7.2</slf4j.version>
- <primefaces.themes.version>1.0.9</primefaces.themes.version>
</properties>
<repositories>
@@ -140,7 +139,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0.1</version>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties
index 870ad76d..2cbc58d6 100644
--- a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties
+++ b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties
@@ -10,4 +10,7 @@ copyView = Ansicht Kopieren
renameView = Ansicht Umbenennen
deleteView = Ansicht Löschen
-name = Name
\ No newline at end of file
+name = Name
+
+msgCockpitEditorWelcomeShort = Entwicklungsphase
+msgCockpitEditorWelcome = Der Cockpit Editor befindet sich zur Zeit noch in der Entwicklungsphase.
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties
index 71f62abf..55dadc86 100644
--- a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties
+++ b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties
@@ -10,4 +10,7 @@ copyView = Copy View
renameView = Rename View
deleteView = Delete View
-name = Name
\ No newline at end of file
+name = Name
+
+msgCockpitEditorWelcomeShort = Development Stage
+msgCockpitEditorWelcome = The cockpit editor is still in the development stage.
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties
index 2e3d90c2..629ae3d3 100644
--- a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties
+++ b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties
@@ -3,4 +3,7 @@
# Diese Datei beinhaltet sämtliche Nachrichten, Buttonbeschriftungen etc.,
# welche innerhalb des Cockpits benutzt werden.
#
-#------------------------------------------------------------------------------
\ No newline at end of file
+#------------------------------------------------------------------------------
+
+msgCockpitWelcomeShort = Entwicklungsphase
+msgCockpitWelcome = Das Cockpit befindet sich zur Zeit noch in der Entwicklungsphase.
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties
index 0836a7cf..868dd2a1 100644
--- a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties
+++ b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties
@@ -3,4 +3,7 @@
# This file contains all messages, button captions etc. which are used within
# the cockpit page.
#
-#------------------------------------------------------------------------------
\ No newline at end of file
+#------------------------------------------------------------------------------
+
+msgCockpitWelcomeShort = Development Stage
+msgCockpitWelcome = The cockpit is still in the development stage.
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
index bd0356c2..1bcca305 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
@@ -36,6 +36,15 @@
<p:remoteCommand autoRun="false" name="nodeSelected" action="#{currentCockpitEditorBean.nodeSelected()}" update=":propertiesForm" />
</h:form>
</ui:define>
+
+ <ui:define name="js">
+ <!-- This javascript code will be executed in the onload-part of the body and shows a localized message via the growl-component. -->
+ <script>
+ bodyLoaded = function() {
+ msgs.renderMessage({summary : '#{localizedCockpitEditorPageMessages.msgCockpitEditorWelcomeShort}', detail : '#{localizedCockpitEditorPageMessages.msgCockpitEditorWelcome}', severity: 'info'});
+ }
+ </script>
+ </ui:define>
<!-- Those are the menu bar entries left from the help-submenu. -->
<ui:define name="furtherMenuBarEntries">
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index 5fa439fc..93e8108b 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
@@ -30,6 +30,15 @@
<ui:define name="cssIncludes">
<link rel="stylesheet" type="text/css" href="#{root}/css/CockpitPage.css" />
</ui:define>
+
+ <ui:define name="js">
+ <!-- This javascript code will be executed in the onload-part of the body and shows a localized message via the growl-component. -->
+ <script>
+ bodyLoaded = function() {
+ msgs.renderMessage({summary : '#{localizedCockpitPageMessages.msgCockpitWelcomeShort}', detail : '#{localizedCockpitPageMessages.msgCockpitWelcome}', severity: 'info'});
+ }
+ </script>
+ </ui:define>
<!-- Those are the menu bar entries left from the help-submenu. -->
<ui:define name="furtherMenuBarEntries">
--
GitLab