move string externalization

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index 67fd1a3a4dd5786434c167c91b4fa6c877c27515..69fc4204399f37a026703e6d045aa2db44204e97 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -168,10 +168,6 @@ command.name.15 = Open
 command.name.16 = Serverside Preferences\r
 view.name.SESSIONS = Sessions\r
 command.label.SESSION = Sessions\r
-command.label.CONNECT = Connect\r
-command.label.RE_CONNECT = Re-Connect\r
-command.name.CONNECT = Connect\r
-command.name.RE_CONNECT = Re-Connect\r
 command.name.OPEN_CLASSIFICATION_WIZARD = Open Classification Wizard\r
 command.name.OPEN_TAXONNODE_WIZARD = Open Taxon Node Wizard\r
 \r

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 598feeec72af3fb3cfcdf2e2592265020fc81b20..b6915a84040942d7d269d4dc2c12ffa7ca77a1c7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -168,10 +168,6 @@ command.name.15 = \u00d6ffnen
 command.name.16 = Serverseitige Präferenzen
 view.name.SESSIONS = Sessions
 command.label.SESSION = Sessions
-
-command.label.RE_CONNECT = Aktualisiere Verbindung
-command.name.CONNECT = Verbinden
-command.name.RE_CONNECT = Aktualisiere Verbindung
 command.name.OPEN_CLASSIFICATION_WIZARD = \u00d6ffne Klassifikations-Wizard
 command.name.OPEN_TAXONNODE_WIZARD = \u00d6ffne Taxonknoten-Wizard
 

diff --git a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties
index 6751770e651d69519d343438868e7dff550ac77f..14d1ae282be7e382b2d1e6943c5b8865ee08b554 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties
@@ -2,4 +2,4 @@
 command.label.CONNECT = Connect
 command.label.RE_CONNECT = Re-Connect
 command.name.CONNECT = Connect
-command.name.RE_CONNECT = Re-Connect
\ No newline at end of file
+command.name.RE_CONNECT = Re-Connect

diff --git a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties
index d9e620c1a2e727c094881b70b5ec981d2e0e2312..ed4dc13a9c64d9511fb1dfb9b5158914bdd472a1 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties
@@ -1,3 +1,5 @@
 #Properties file for eu.etaxonomy.taxeditor.webapp, German
 command.label.CONNECT = Verbinden
-command.name.CONNECT = Verbinden
\ No newline at end of file
+command.label.RE_CONNECT = Aktualisiere Verbindung
+command.name.CONNECT = Verbinden
+command.name.RE_CONNECT = Aktualisiere Verbindung
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.webapp/build.properties
index c1998c3a5a4e5ce0928bc9bdbcf162b0c96d8c0f..c6a0fa4c775a1d5e0076cb6ef89d2266a998e4eb 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/build.properties
+++ b/eu.etaxonomy.taxeditor.webapp/build.properties
@@ -16,5 +16,7 @@ bin.includes = META-INF/,\
                lib/jetty-security-9.4.26.v20200117.jar,\
                lib/jetty-server-9.4.26.v20200117.jar,\
                lib/jetty-servlet-9.4.26.v20200117.jar,\
-               lib/jetty-util-9.4.26.v20200117.jar
-output.. = bin/
+               lib/jetty-util-9.4.26.v20200117.jar,\
+               OSGI-INF/,\
+               plugin.xml,\
+               src/main/java/eu/etaxonomy/taxeditor/l10n/

diff --git a/eu.etaxonomy.taxeditor.webapp/fragment.e4xmi b/eu.etaxonomy.taxeditor.webapp/fragment.e4xmi
index 57b7d05c3fa12f6e66c754914dc62c772f798c73..b496fd0fca59ab5e7ada374f192472b0958b5658 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.webapp/fragment.e4xmi
@@ -32,7 +32,7 @@
     </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_hSGlEPv3EeqwiqpCwftRog" featurename="handlers" parentElementId="xpath:/">
-    <elements xsi:type="commands:Handler" xmi:id="_j7DkUPv3EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handler.0" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.handler.ShowRemotingLoginWindowHandlerE4" command="_OlOO0O0HEeqksLQRVeqFGA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_j7DkUPv3EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handler.connect" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.handler.ShowRemotingLoginWindowHandlerE4" command="_OlOO0O0HEeqksLQRVeqFGA"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_udC8YPv3EeqwiqpCwftRog" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.file">
     <elements xsi:type="menu:HandledMenuItem" xmi:id="_z4gfgPv3EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handledmenuitem.commandlabelconnect" label="%command.label.CONNECT" command="_OlOO0O0HEeqksLQRVeqFGA">

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index c9ae9b558bf24b238ba37a5ae5af8511a2c433c4..5e5fd5a4fddc1758dc83190848f286c9b165330b 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -151,11 +151,11 @@
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
     </dependency>
-   <dependency>
+  <!--<dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
         <version>4.0.1</version>
-    </dependency>
+    </dependency>-->
     <dependency>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator</artifactId>