From 5d1860a1346ba4ef9c25ad2fddd0c918e79d90d1 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Wed, 31 Aug 2011 13:11:02 +0000 Subject: [PATCH] adding classpath and project file --- .gitattributes | 8 + .gitignore | 9 - eu.etaxonomy.taxeditor.application/.classpath | 8 + eu.etaxonomy.taxeditor.application/.project | 28 +++ .../META-INF/MANIFEST.MF | 1 + eu.etaxonomy.taxeditor.application/plugin.xml | 21 +- eu.etaxonomy.taxeditor.bulkeditor/.classpath | 8 + eu.etaxonomy.taxeditor.bulkeditor/.project | 28 +++ .../input/entitycreator/UserCreator.java | 14 +- eu.etaxonomy.taxeditor.feature/.classpath | 232 ++++++++++++++++++ eu.etaxonomy.taxeditor.feature/.project | 23 ++ eu.etaxonomy.taxeditor.feature/feature.xml | 7 + eu.etaxonomy.taxeditor/.classpath | 12 + eu.etaxonomy.taxeditor/.project | 24 ++ .../eu.etaxonomy.taxeditor.product | 2 +- pom.xml | 1 + 16 files changed, 407 insertions(+), 19 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.application/.classpath create mode 100644 eu.etaxonomy.taxeditor.application/.project create mode 100644 eu.etaxonomy.taxeditor.bulkeditor/.classpath create mode 100644 eu.etaxonomy.taxeditor.bulkeditor/.project create mode 100644 eu.etaxonomy.taxeditor.feature/.classpath create mode 100644 eu.etaxonomy.taxeditor.feature/.project create mode 100644 eu.etaxonomy.taxeditor/.classpath create mode 100644 eu.etaxonomy.taxeditor/.project diff --git a/.gitattributes b/.gitattributes index 5c8b7dd80..c60c95610 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,8 @@ * text=auto !eol /LICENSE.txt -text /README.txt -text +eu.etaxonomy.taxeditor.application/.classpath -text +eu.etaxonomy.taxeditor.application/.project -text eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF -text eu.etaxonomy.taxeditor.application/build.properties -text eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif -text @@ -31,6 +33,8 @@ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspect eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java -text eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java -text eu.etaxonomy.taxeditor.application/src/main/resources/log4j.properties -text +eu.etaxonomy.taxeditor.bulkeditor/.classpath -text +eu.etaxonomy.taxeditor.bulkeditor/.project -text eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF -text eu.etaxonomy.taxeditor.bulkeditor/build.properties -text eu.etaxonomy.taxeditor.bulkeditor/icons/merge_candidate.gif -text @@ -493,6 +497,8 @@ eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/o eu.etaxonomy.taxeditor.feature.platform/build.properties -text eu.etaxonomy.taxeditor.feature.platform/feature.xml -text eu.etaxonomy.taxeditor.feature.platform/pom.xml -text +eu.etaxonomy.taxeditor.feature/.classpath -text +eu.etaxonomy.taxeditor.feature/.project -text eu.etaxonomy.taxeditor.feature/build.properties -text eu.etaxonomy.taxeditor.feature/feature.xml -text eu.etaxonomy.taxeditor.feature/pom.xml -text @@ -1946,6 +1952,8 @@ eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMen eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/LoginTest.java -text eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/NewMenuTest.java -text eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/NewTaxonWizardTest.java -text +eu.etaxonomy.taxeditor/.classpath -text +eu.etaxonomy.taxeditor/.project -text eu.etaxonomy.taxeditor/deploy_nightly.sh -text eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text eu.etaxonomy.taxeditor/plugin_customization.ini -text diff --git a/.gitignore b/.gitignore index eeeb79d4e..0f451481f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,5 @@ -eu.etaxonomy.taxeditor.application/.classpath -eu.etaxonomy.taxeditor.application/.project eu.etaxonomy.taxeditor.application/.settings -eu.etaxonomy.taxeditor.application/bin eu.etaxonomy.taxeditor.application/target -eu.etaxonomy.taxeditor.bulkeditor/.classpath -eu.etaxonomy.taxeditor.bulkeditor/.project eu.etaxonomy.taxeditor.bulkeditor/.settings eu.etaxonomy.taxeditor.bulkeditor/target eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -46,8 +41,6 @@ eu.etaxonomy.taxeditor.feature.platform/.classpath eu.etaxonomy.taxeditor.feature.platform/.project eu.etaxonomy.taxeditor.feature.platform/.settings eu.etaxonomy.taxeditor.feature.platform/target -eu.etaxonomy.taxeditor.feature/.classpath -eu.etaxonomy.taxeditor.feature/.project eu.etaxonomy.taxeditor.feature/.settings eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml eu.etaxonomy.taxeditor.feature/plugin_customization.ini @@ -68,8 +61,6 @@ eu.etaxonomy.taxeditor.store/.settings eu.etaxonomy.taxeditor.store/hibernate.log eu.etaxonomy.taxeditor.store/target eu.etaxonomy.taxeditor.test/screenshots/*.jpeg -eu.etaxonomy.taxeditor/.classpath -eu.etaxonomy.taxeditor/.project eu.etaxonomy.taxeditor/.settings eu.etaxonomy.taxeditor/target /runtime-taxeditor.product diff --git a/eu.etaxonomy.taxeditor.application/.classpath b/eu.etaxonomy.taxeditor.application/.classpath new file mode 100644 index 000000000..3bf936df7 --- /dev/null +++ b/eu.etaxonomy.taxeditor.application/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.application/.project b/eu.etaxonomy.taxeditor.application/.project new file mode 100644 index 000000000..14f5a809c --- /dev/null +++ b/eu.etaxonomy.taxeditor.application/.project @@ -0,0 +1,28 @@ + + + eu.etaxonomy.taxeditor.application + All plugins are combined into this application. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index e2457830b..3c089808e 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -20,6 +20,7 @@ Require-Bundle: org.eclipse.ui, eu.etaxonomy.taxeditor.bulkeditor, eu.etaxonomy.taxeditor.editor, eu.etaxonomy.taxeditor.printpublisher, + eu.etaxonomy.taxeditor.help, org.eclipse.equinox.ds, org.eclipse.equinox.util, org.eclipse.equinox.p2.core, diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml index baead6ca6..61c007078 100644 --- a/eu.etaxonomy.taxeditor.application/plugin.xml +++ b/eu.etaxonomy.taxeditor.application/plugin.xml @@ -201,7 +201,21 @@ locationURI="menu:org.eclipse.ui.main.menu.help"> + + + + + + - - + + + + + + + diff --git a/eu.etaxonomy.taxeditor.bulkeditor/.project b/eu.etaxonomy.taxeditor.bulkeditor/.project new file mode 100644 index 000000000..f9413bbb3 --- /dev/null +++ b/eu.etaxonomy.taxeditor.bulkeditor/.project @@ -0,0 +1,28 @@ + + + eu.etaxonomy.taxeditor.bulkeditor + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java index 1713fe178..2d8750ab3 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java @@ -13,9 +13,12 @@ package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator; import java.util.HashMap; import java.util.Map; +import org.springframework.security.access.AccessDeniedException; + import eu.etaxonomy.cdm.api.service.IUserService; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; +import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -38,9 +41,14 @@ public class UserCreator implements IEntityCreator{ */ @Override public User createEntity(Object key, String text) { - User user = User.NewInstance(text, text); - CdmStore.getService(IUserService.class).createUser(user); - return user; + try{ + User user = User.NewInstance(text, text); + CdmStore.getService(IUserService.class).createUser(user); + return user; + } catch (AccessDeniedException e){ + BulkEditorUtil.errorDialog("Access denied", getClass(), e.getMessage(), e); + return null; + } } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.feature/.classpath b/eu.etaxonomy.taxeditor.feature/.classpath new file mode 100644 index 000000000..38db81553 --- /dev/null +++ b/eu.etaxonomy.taxeditor.feature/.classpath @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.feature/.project b/eu.etaxonomy.taxeditor.feature/.project new file mode 100644 index 000000000..35ce558dc --- /dev/null +++ b/eu.etaxonomy.taxeditor.feature/.project @@ -0,0 +1,23 @@ + + eu.etaxonomy.taxeditor.feature + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + eu.etaxonomy.taxeditor.application + eu.etaxonomy.taxeditor.bulkeditor + eu.etaxonomy.taxeditor.cdmlib + eu.etaxonomy.taxeditor.editor + eu.etaxonomy.taxeditor.feature.platform + eu.etaxonomy.taxeditor.navigation + eu.etaxonomy.taxeditor.printpublisher + eu.etaxonomy.taxeditor.store + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml index 0f73c3dcb..c4caf249c 100644 --- a/eu.etaxonomy.taxeditor.feature/feature.xml +++ b/eu.etaxonomy.taxeditor.feature/feature.xml @@ -119,4 +119,11 @@ Software distributed under the License is distributed on an "AS IS" ba version="0.0.0" unpack="false"/> + + diff --git a/eu.etaxonomy.taxeditor/.classpath b/eu.etaxonomy.taxeditor/.classpath new file mode 100644 index 000000000..7c95b583f --- /dev/null +++ b/eu.etaxonomy.taxeditor/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor/.project b/eu.etaxonomy.taxeditor/.project new file mode 100644 index 000000000..474fbc146 --- /dev/null +++ b/eu.etaxonomy.taxeditor/.project @@ -0,0 +1,24 @@ + + eu.etaxonomy.taxeditor + The EDIT Taxonomic Desktop Editor. + + eu.etaxonomy.taxeditor.application + eu.etaxonomy.taxeditor.bulkeditor + eu.etaxonomy.taxeditor.cdmlib + eu.etaxonomy.taxeditor.editor + eu.etaxonomy.taxeditor.feature + eu.etaxonomy.taxeditor.feature.platform + eu.etaxonomy.taxeditor.navigation + eu.etaxonomy.taxeditor.printpublisher + eu.etaxonomy.taxeditor.store + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product index 367316b17..0a27fa01d 100644 --- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product +++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product @@ -14,7 +14,7 @@ - -data @user.home/.cdmLibrary + -data @user.home/.cdmLibrary -Dserver_port=58080 -Xmx512M -XX:MaxPermSize=256M -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/pom.xml b/pom.xml index cf0dce2fb..c65a5bd4b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ eu.etaxonomy.taxeditor.bulkeditor eu.etaxonomy.taxeditor.printpublisher + eu.etaxonomy.taxeditor.help eu.etaxonomy.taxeditor.application eu.etaxonomy.taxeditor.feature.platform eu.etaxonomy.taxeditor.feature -- 2.34.1