New testing release.

diff --git a/.gitattributes b/.gitattributes
index 7914a16f5c53f5ecea7261de9e5aabf0c0090805..f306b76452102bfae2b63ab4f26feea1774db74e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -932,6 +932,7 @@ taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Perspective
 taxeditor-navigation/src/test/java/log4j.properties -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text
+taxeditor-navigation/src/test/resources/log4j.properties -text
 taxeditor-store/.settings/org.eclipse.jdt.core.prefs -text
 taxeditor-store/META-INF/MANIFEST.MF -text
 taxeditor-store/build.properties -text

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index 089af70420307bc6eb4dc8f149df9a9a770195dd..a2af4d9177483aa8e674ac610d9ad4f8a00b2419 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -32,7 +32,6 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;\r
 import org.eclipse.ui.progress.IProgressService;\r
 \r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineSelection;\r
 import eu.etaxonomy.taxeditor.model.DescriptionHelper;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/CommonNameDetailsPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/CommonNameDetailsPage.java
index bedde05cb6256b88b610c9a4ba6c9799d44ec466..9d6fbbb2f0e6369e62cedd03334ca67684485e95 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/CommonNameDetailsPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/CommonNameDetailsPage.java
@@ -122,10 +122,10 @@ public class CommonNameDetailsPage extends AbstractDescriptionDetailsPage implem
         createLabel("Common name:", client, parent);\r
         \r
                text = new Text(client, SWT.BORDER | SWT.MULTI);\r
-//             GridData gd = new GridData();   \r
-//             gd.horizontalAlignment = SWT.FILL;\r
-//             gd.grabExcessHorizontalSpace = true;\r
-//             text.setLayoutData(gd);\r
+               GridData gd = new GridData();   \r
+               gd.horizontalAlignment = SWT.FILL;\r
+               gd.grabExcessHorizontalSpace = true;\r
+               text.setLayoutData(gd);\r
         languagesCombo.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL\r
                 | GridData.HORIZONTAL_ALIGN_FILL));            \r
                \r

diff --git a/taxeditor-navigation/src/test/resources/log4j.properties b/taxeditor-navigation/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..fea8401
--- /dev/null
+++ b/taxeditor-navigation/src/test/resources/log4j.properties
@@ -0,0 +1,29 @@
+### ************ APPENDER ***********************************###
+
+### direct log messages to stdout ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+### direct messages to file hibernate.log ###
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=taxeditor.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+### ************* LOG LEVELS *********************************###
+
+### set log levels - for more verbose logging change 'info' to 'debug' ###
+### levels: error, warn, debug, info
+log4j.rootLogger=INFO, stdout
+
+### set directory-specific levels below
+
+### basic level for editor directory
+log4j.logger.eu.etaxonomy.taxeditor.editor = INFO, stdout 
+
+log4j.logger.eu.etaxonomy.taxeditor.editor.handler = INFO, stdout
+
+### log level for conversation handler
+#log4j.logger.eu.etaxonomy.cdm.api.application = DEBUG, stdout