ref #9190: rename webapp to local

diff --git a/eu.etaxonomy.taxeditor.webapp/.gitignore b/eu.etaxonomy.taxeditor.local/.gitignore
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/.gitignore
rename to eu.etaxonomy.taxeditor.local/.gitignore

diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
similarity index 91%
rename from eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
rename to eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
index f82c2e8030bc088c0a3697c53c34cfca024e6acd..fcff1a0f562b2866ae4f517d789f2839b2d9d78d 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Webapp
-Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
+Bundle-Name: Local
+Bundle-SymbolicName: eu.etaxonomy.taxeditor.local;singleton:=true
 Bundle-Version: 5.18.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
@@ -54,10 +54,9 @@ Import-Package: eu.etaxonomy.cdm.api.application,
  eu.etaxonomy.taxeditor.remoting.server,
  eu.etaxonomy.taxeditor.remoting.source,
  eu.etaxonomy.taxeditor.session,
+ org.springframework.security.core,
  org.apache.commons.lang3,
  org.eclipse.jface.resource,
  org.eclipse.ui.plugin,
  org.springframework.core.io,
- org.springframework.security.authentication,
- org.springframework.security.core
-
+ org.springframework.security.authentication

diff --git a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.local/OSGI-INF/l10n/bundle.properties
similarity index 53%
rename from eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties
rename to eu.etaxonomy.taxeditor.local/OSGI-INF/l10n/bundle.properties
index 30b4630cf6d2054b6aad61d94ec6832a51c4594c..fca2dcced0aca46caa6886cf15af9d909eea4134 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.local/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-#Properties file for eu.etaxonomy.taxeditor.webapp
+#Properties file for eu.etaxonomy.taxeditor.local
 command.label.connect = Connect
 command.label.RE_CONNECT = Re-Connect
 command.name.connect = Connect

diff --git a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.local/OSGI-INF/l10n/bundle_de.properties
similarity index 52%
rename from eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties
rename to eu.etaxonomy.taxeditor.local/OSGI-INF/l10n/bundle_de.properties
index 43f9960541db756aba7ad0700d5e11263d52a22c..24c73bb5329676bb2bf06944bd97c0382b39879b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.local/OSGI-INF/l10n/bundle_de.properties
@@ -1,4 +1,4 @@
-#Properties file for eu.etaxonomy.taxeditor.webapp, German
+#Properties file for eu.etaxonomy.taxeditor.local, German
 command.label.connect = Verbinden
 command.label.RE_CONNECT = Aktualisiere Verbindung
 command.name.connect = Verbinden

diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.local/build.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/build.properties
rename to eu.etaxonomy.taxeditor.local/build.properties

diff --git a/eu.etaxonomy.taxeditor.webapp/fragment.e4xmi b/eu.etaxonomy.taxeditor.local/fragment.e4xmi
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/fragment.e4xmi
rename to eu.etaxonomy.taxeditor.local/fragment.e4xmi

diff --git a/eu.etaxonomy.taxeditor.local/lib/c3p0-0.9.5.2.jar b/eu.etaxonomy.taxeditor.local/lib/c3p0-0.9.5.2.jar
new file mode 100755 (executable)
index 0000000..579cedd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/c3p0-0.9.5.2.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war b/eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
new file mode 100755 (executable)
index 0000000..d6d7f47
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/h2-1.4.190.jar b/eu.etaxonomy.taxeditor.local/lib/h2-1.4.190.jar
new file mode 100755 (executable)
index 0000000..8b11e2e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/h2-1.4.190.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/javax.servlet-api-4.0.1.jar b/eu.etaxonomy.taxeditor.local/lib/javax.servlet-api-4.0.1.jar
new file mode 100755 (executable)
index 0000000..844ec7f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/javax.servlet-api-4.0.1.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jdbc4-2.0.jar b/eu.etaxonomy.taxeditor.local/lib/jdbc4-2.0.jar
new file mode 100755 (executable)
index 0000000..240872c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jdbc4-2.0.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-http-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-http-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..442eb85
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-http-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-io-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-io-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..2e47706
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-io-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-security-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-security-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..02d61ac
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-security-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-server-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-server-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..d1e7682
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-server-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-servlet-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-servlet-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..50d434d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-servlet-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-util-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-util-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..e112283
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-util-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-webapp-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-webapp-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..472dd89
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-webapp-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jetty-xml-9.4.26.v20200117.jar b/eu.etaxonomy.taxeditor.local/lib/jetty-xml-9.4.26.v20200117.jar
new file mode 100755 (executable)
index 0000000..8ca7d5d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jetty-xml-9.4.26.v20200117.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/jtds-1.3.1.jar b/eu.etaxonomy.taxeditor.local/lib/jtds-1.3.1.jar
new file mode 100755 (executable)
index 0000000..518b425
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/jtds-1.3.1.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/log4j-1.2.17.jar b/eu.etaxonomy.taxeditor.local/lib/log4j-1.2.17.jar
new file mode 100755 (executable)
index 0000000..1d425cf
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/log4j-1.2.17.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/mchange-commons-java-0.2.11.jar b/eu.etaxonomy.taxeditor.local/lib/mchange-commons-java-0.2.11.jar
new file mode 100755 (executable)
index 0000000..88f1d47
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/mchange-commons-java-0.2.11.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/mssql-jdbc-8.4.1.jre8.jar b/eu.etaxonomy.taxeditor.local/lib/mssql-jdbc-8.4.1.jre8.jar
new file mode 100755 (executable)
index 0000000..ad0b4b5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/mssql-jdbc-8.4.1.jre8.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar b/eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar
new file mode 100755 (executable)
index 0000000..51e270c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar b/eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar
new file mode 100755 (executable)
index 0000000..ab06fb0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/postgresql-9.4-1206-jdbc4.jar b/eu.etaxonomy.taxeditor.local/lib/postgresql-9.4-1206-jdbc4.jar
new file mode 100755 (executable)
index 0000000..5bae20e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.local/lib/postgresql-9.4-1206-jdbc4.jar differ

diff --git a/eu.etaxonomy.taxeditor.webapp/plugin.xml b/eu.etaxonomy.taxeditor.local/plugin.xml
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/plugin.xml
rename to eu.etaxonomy.taxeditor.local/plugin.xml

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.local/pom.xml
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/pom.xml
rename to eu.etaxonomy.taxeditor.local/pom.xml

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/CdmEmbeddedServerException.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/CdmEmbeddedServerException.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/CdmEmbeddedServerException.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/CdmEmbeddedServerException.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/CdmServer.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/CdmServer.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/CdmServer.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/CdmServer.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/TaxeditorWebappPlugin.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/TaxeditorWebappPlugin.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/TaxeditorWebappPlugin.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/TaxeditorWebappPlugin.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/common/CdmDataSourceRepository.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/common/CdmDataSourceRepository.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/common/CdmDataSourceRepository.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/common/CdmDataSourceRepository.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceCredentialsWizardPage.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceCredentialsWizardPage.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceCredentialsWizardPage.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceCredentialsWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceH2WizardPage.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceH2WizardPage.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceH2WizardPage.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceH2WizardPage.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceMySQLWizardPage.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceMySQLWizardPage.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceMySQLWizardPage.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceMySQLWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourcePostgreSQLServerWizardPage.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourcePostgreSQLServerWizardPage.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourcePostgreSQLServerWizardPage.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourcePostgreSQLServerWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceSQLServerWizardPage.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceSQLServerWizardPage.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceSQLServerWizardPage.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceSQLServerWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceWizard.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceWizard.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceWizard.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceWizard.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/handler/ReconnectHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/handler/ReconnectHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/handler/ReconnectHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/handler/ReconnectHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/handler/ShowRemotingLoginWindowHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/handler/ShowRemotingLoginWindowHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/handler/ShowRemotingLoginWindowHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/handler/ShowRemotingLoginWindowHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/handler/SwitchUserHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/handler/SwitchUserHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/handler/SwitchUserHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/handler/SwitchUserHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/l10n/Messages.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/l10n/Messages.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/l10n/Messages.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/l10n/Messages.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages.properties b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages.properties
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages.properties

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages_de.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages_de.properties
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/l10n/messages_de.properties

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreConnectorLocal.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreConnectorLocal.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreConnectorLocal.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreConnectorLocal.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreLocal.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreLocal.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreLocal.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreLocal.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
index 86ac28bc02437c2347b932f455249db237c121c2..c82539ebc6e5961c19314d1e54a4f6ddc38fdfd9 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
+++ b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
@@ -80,14 +80,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.LoginManager;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.ui.dialog.RemotingLoginDialog;
-<<<<<<< HEAD:eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/server/RemotingLoginDialogLocal.java
-import eu.etaxonomy.taxeditor.webapp.CdmEmbeddedServerException;
-import eu.etaxonomy.taxeditor.webapp.CdmServer;
 import eu.etaxonomy.taxeditor.workbench.datasource.ICdmServerError;
-=======
-import eu.etaxonomy.taxeditor.workbench.datasource.ICDMServerError;
->>>>>>> ref #9190: rename webapp to local:eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
-
 
 
 

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceContentProvider.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceContentProvider.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceContentProvider.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceContentProvider.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceLabelProvider.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceLabelProvider.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceLabelProvider.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceLabelProvider.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceViewerComparator.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceViewerComparator.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceViewerComparator.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmDataSourceViewerComparator.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmMetaDataAwareDataSourceContainer.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmMetaDataAwareDataSourceContainer.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmMetaDataAwareDataSourceContainer.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmMetaDataAwareDataSourceContainer.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/CdmDataSourceViewPartE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/CdmDataSourceViewPartE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/CdmDataSourceViewPartE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/CdmDataSourceViewPartE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/AbstractDataSourceHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/AbstractDataSourceHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/AbstractDataSourceHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/AbstractDataSourceHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CloneDataSourceHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CloneDataSourceHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CloneDataSourceHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CloneDataSourceHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CreateDataSourceHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CreateDataSourceHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CreateDataSourceHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/CreateDataSourceHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/DeleteDataSourceHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/DeleteDataSourceHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/DeleteDataSourceHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/DeleteDataSourceHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/EditDataSourceHandlerE4.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/EditDataSourceHandlerE4.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/EditDataSourceHandlerE4.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/e4/handler/EditDataSourceHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/handler/DataSourceMenuPropertyTester.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/handler/DataSourceMenuPropertyTester.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/handler/DataSourceMenuPropertyTester.java
rename to eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/handler/DataSourceMenuPropertyTester.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/resources/etc/jetty/.svnignore b/eu.etaxonomy.taxeditor.local/src/main/resources/etc/jetty/.svnignore
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/resources/etc/jetty/.svnignore
rename to eu.etaxonomy.taxeditor.local/src/main/resources/etc/jetty/.svnignore

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/resources/eu/etaxonomy/cdm/config.properties b/eu.etaxonomy.taxeditor.local/src/main/resources/eu/etaxonomy/cdm/config.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/resources/eu/etaxonomy/cdm/config.properties
rename to eu.etaxonomy.taxeditor.local/src/main/resources/eu/etaxonomy/cdm/config.properties

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml b/eu.etaxonomy.taxeditor.local/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
similarity index 100%
rename from eu.etaxonomy.taxeditor.webapp/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
rename to eu.etaxonomy.taxeditor.local/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 4e0071fae3b54b42fb2bcfb5bc442408046327ba..8b3cda609eef47d987f67c58c91b93a1c4d1de0a 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -20,8 +20,7 @@ Require-Bundle: org.eclipse.ui,
  org.apache.log4j,
  org.eclipse.swtbot.eclipse.core,
  org.eclipse.swtbot.eclipse.finder,
- eu.etaxonomy.taxeditor.workbench,
- eu.etaxonomy.taxeditor.local
+ eu.etaxonomy.taxeditor.workbench
 Eclipse-RegisterBuddy: org.apache.log4j, org.eclipse.swtbot.swt.finder
 Bundle-ClassPath: .,
  lib/byte-buddy-0.5.1.jar,
@@ -40,3 +39,4 @@ Bundle-ClassPath: .,
 Import-Package: eu.etaxonomy.taxeditor.local
 
 
+

diff --git a/pom.xml b/pom.xml
index d5f25a2977eadfc69549ee0744f9dc33e7d485ad..ad2a799c7bff683fa1d5385f08c5699ac311a387 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <module>eu.etaxonomy.taxeditor.help</module>
     <module>eu.etaxonomy.taxeditor.molecular</module>
     <module>eu.etaxonomy.taxeditor.molecular.lib</module>
-    <module>eu.etaxonomy.taxeditor.webapp</module>
+    <module>eu.etaxonomy.taxeditor.local</module>
     <module>eu.etaxonomy.taxeditor.application</module>
     <module>eu.etaxonomy.taxeditor.feature.platform</module>
     <module>eu.etaxonomy.taxeditor.feature</module>