(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 6fd50af99090280fa9e3ec26752b2161b9d9dade..db9d5d99ffafe14e6fd5ba8427dc7477a8da23fd 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -47,9 +47,6 @@ cdmlibrary/.externalToolBuilders/Ant_Cdm_Builder.launch -text
 cdmlibrary/.settings/org.eclipse.jdt.core.prefs -text
 cdmlibrary/.settings/org.eclipse.jdt.ui.prefs -text
 cdmlibrary/build.xml -text
-cdmlibrary/dist/jar/cdmLibrary.jar -text
-cdmlibrary/dist/jar/cdmLibraryFat.jar -text
-cdmlibrary/dist/zip/cdmLibrary.zip -text
 cdmlibrary/pom.xml -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java -text

diff --git a/.gitignore b/.gitignore
index 0f95528597b0f73fcbc13db8e2a1e4dd67ec267c..c0422be037c8ececd4496c614b7f26ca9256cccb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ cdmlibrary/alt
 cdmlibrary/bin
 cdmlibrary/cdmLibrary.jar
 cdmlibrary/db
-cdmlibrary/dist/zip/cdmLibrary
 cdmlibrary/edit_cdm.rar
 cdmlibrary/manifest.txt
 cdmlibrary/mavenInstall

diff --git a/cdmlibrary/dist/jar/cdmLibrary.jar b/cdmlibrary/dist/jar/cdmLibrary.jar
deleted file mode 100644 (file)
index b07c2a1..0000000
Binary files a/cdmlibrary/dist/jar/cdmLibrary.jar and /dev/null differ

diff --git a/cdmlibrary/dist/jar/cdmLibraryFat.jar b/cdmlibrary/dist/jar/cdmLibraryFat.jar
deleted file mode 100644 (file)
index 8e7baa6..0000000
Binary files a/cdmlibrary/dist/jar/cdmLibraryFat.jar and /dev/null differ

diff --git a/cdmlibrary/dist/zip/cdmLibrary.zip b/cdmlibrary/dist/zip/cdmLibrary.zip
deleted file mode 100644 (file)
index e9a143b..0000000
Binary files a/cdmlibrary/dist/zip/cdmLibrary.zip and /dev/null differ

diff --git a/cdmlibrary/pom.xml b/cdmlibrary/pom.xml
index 0585d92c45a49db259ce12293d9c65a24daf381d..3d71460eb21540ee1452a6b41bac5716365adf55 100644 (file)
--- a/cdmlibrary/pom.xml
+++ b/cdmlibrary/pom.xml
@@ -58,8 +58,11 @@
             <source>1.5</source>
             <target>1.5</target>
           <includes>
+            <include>**/TaxonName.java</include>
             <include>**/PropertyChangeAspect.aj</include>
-          </includes>          
+            <include>**/PropertyChangeTest.java</include>
+<!--            <include>**/**.aj</include>
+-->          </includes>          
         </configuration>
         <executions>
           <execution>

diff --git a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/aspect/PropertyChangeTest.java b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/aspect/PropertyChangeTest.java
index eb008da24ff65a60853ce5df27d402fd60b1d572..e0275247b8a5c6efdcdd7e9e884c3f53d7d11f6c 100644 (file)
--- a/cdmlibrary/src/test/java/eu/etaxonomy/cdm/aspect/PropertyChangeTest.java
+++ b/cdmlibrary/src/test/java/eu/etaxonomy/cdm/aspect/PropertyChangeTest.java
@@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
                private Object lastPropValue;
 
                public void propertyChange(PropertyChangeEvent e){
-               logger.info("Property [" + (String)e.getPropertyName() 
+               logger.debug("Property [" + (String)e.getPropertyName() 
                                + "] changed from " + e.getOldValue() 
                                + " to " + e.getNewValue());
                lastPropValue = e.getNewValue() == null ? null : e.getNewValue();
@@ -29,28 +29,20 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
                        TaxonName b = new TaxonName();
                        b.addPropertyChangeListener(this);
                        b.setGenus("Abies");
-                       if (lastPropValue != null){
                                assertEquals(b.getGenus(), lastPropValue);
-                       }
                        b.setGenus("Picea");
-                       if (lastPropValue != null){
                                assertEquals(b.getGenus(), lastPropValue);
-                       }
                        b.setUninomial("Unipicea");
-                       if (lastPropValue != null){
                                assertEquals(b.getUninomial(), lastPropValue);
-                       }
                        b.setSpecificEpithet("vulgaris");
-                       if (lastPropValue != null){
                                assertEquals(b.getSpecificEpithet(), lastPropValue);
-                       }
                        
                }
 
                
                @Before
                public void updateDebugLevel(){
-                       Logger.getRootLogger().setLevel(Level.DEBUG);
+                       logger.setLevel(Level.DEBUG);
                }
 
        }