(no commit message)

diff --git a/cdmlibrary/build.xml b/cdmlibrary/build.xml
index 4671b2eb25349d13bd77e993057f6c5b1592b97a..71778a093a60c64aa3c015075d3773767dc2c43f 100644 (file)
--- a/cdmlibrary/build.xml
+++ b/cdmlibrary/build.xml
@@ -77,7 +77,9 @@
     <!-- Clean up -->\r
     <target name="clean" description="Clean the build directory">\r
         <delete dir="${dir.build}"/>\r
-        <mkdir dir="${dir.build}"/>\r
+        <mkdir dir="${dir.build}"/>
+        <delete dir="${dir.build.test}"/>
+        <mkdir dir="${dir.build.test}"/>\r
     </target>\r
        \r
 \r

diff --git a/cdmlibrary/pom.xml b/cdmlibrary/pom.xml
index c60414b3242307a93d707460da6a98496f6af7e3..803a3f85790f82d844ed2e9cb28410c60ee30842 100644 (file)
--- a/cdmlibrary/pom.xml
+++ b/cdmlibrary/pom.xml
@@ -23,9 +23,6 @@
         <configuration>\r
           <source>1.5</source>\r
           <target>1.5</target>\r
-          <excludes>\r
-            <exclude>**/*XXXsdfefef*.java</exclude>\r
-          </excludes>\r
         </configuration>\r
       </plugin>\r
       <plugin>\r
@@ -34,10 +31,6 @@
           <includes>\r
             <include>**/*Test.java</include>\r
           </includes>\r
-          <excludes>\r
-            <exclude>**/EventTest.java</exclude>\r
-            <exclude>**/ListenerTest.java</exclude>\r
-          </excludes>\r
         </configuration>\r
       </plugin>\r
       <plugin>\r
@@ -58,9 +51,30 @@
           </execution>\r
         </executions>\r
       </plugin>\r
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>aspectj-maven-plugin</artifactId>
+        <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>       <!-- use this goal to weave all your main classes -->
+              <goal>test-compile</goal>  <!-- use this goal to weave all your test classes -->
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>\r
   </build>\r
   <dependencies>\r
+    <dependency>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.5.2a</version>
+    </dependency>
     <dependency>\r
       <groupId>com.sun.xml.rpc</groupId>\r
       <artifactId>jaxrpc-impl</artifactId>\r
@@ -127,6 +141,9 @@
       <id>ssh-repository</id>\r
       <url>scpexe://dev.e-taxonomy.eu/svn/trunk/javaLibraries</url>\r
     </repository>\r
-  </distributionManagement>\r
+  </distributionManagement>
+<!--  
+  <aspectSourceDirectory>src/main/java/eu/etaxonomy/cdm/aspect</aspectSourceDirectory>
+-->
 </project>\r
 \r

diff --git a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
index a4a980b5eae65a14895d6992284b796d93e3722e..98597efcecb523f94c5d2cf7ec17a954bb795343 100644 (file)
--- a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
+++ b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
@@ -7,7 +7,7 @@
           http://www.springframework.org/schema/aop\r
           http://www.springframework.org/schema/aop/spring-aop-2.0.xsd" >\r
    \r
-   <bean id="defaultDataSource" \r
+   <bean id="mysqlDataSource" \r
                        class="org.springframework.jdbc.datasource.DriverManagerDataSource">\r
         <property name="driverClassName" value="com.mysql.jdbc.Driver"/>\r
         <property name="url" value="jdbc:mysql://192.168.2.10/cdm_test"/>\r
@@ -15,7 +15,7 @@
         <property name="password" value="wp5"/>\r
   </bean>\r
   \r
-  <bean id="localHsqldb" \r
+       <bean id="localDataSource" \r
                        class="eu.etaxonomy.cdm.database.LocalHsqldb" \r
                        init-method="init"\r
                        destroy-method="destroy">\r
@@ -35,7 +35,7 @@
   \r
   <bean id="sessionFactory" \r
                        class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">\r
-        <property name="dataSource" ref="localHsqldb"/>\r
+       <property name="dataSource" ref="mysqlDataSource"/>\r
         <property name="annotatedPackages">\r
                        <list>\r
                        <value>eu.etaxonomy.cdm.model.common</value>\r
@@ -54,9 +54,9 @@
                <property name="hibernateProperties">\r
             <props>\r
                 <prop key="hibernate.hbm2ddl.auto">update</prop>\r
-                <!-- prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop-->\r
-                <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>\r
-                <prop key="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</prop>\r
+                 <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>\r
+<!--                <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>\r
+-->                <prop key="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</prop>\r
                 <prop key="hibernate.show_sql">false</prop>\r
                 <prop key="hibernate.format_sql">false</prop>\r
             </props>\r