From: m.doering <m.doering@localhost>
Date: Tue, 23 Oct 2007 08:58:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_1.1.0~820
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/c54ba12a2513e3d031a0378f9fcc2e60203742b7

---

diff --git a/cdmlibrary/build.xml b/cdmlibrary/build.xml
index 4671b2eb25..71778a093a 100644
--- a/cdmlibrary/build.xml
+++ b/cdmlibrary/build.xml
@@ -77,7 +77,9 @@
     <!-- Clean up -->
     <target name="clean" description="Clean the build directory">
         <delete dir="${dir.build}"/>
-        <mkdir dir="${dir.build}"/>
+        <mkdir dir="${dir.build}"/>
+        <delete dir="${dir.build.test}"/>
+        <mkdir dir="${dir.build.test}"/>
     </target>
 	
 
diff --git a/cdmlibrary/pom.xml b/cdmlibrary/pom.xml
index c60414b324..803a3f8579 100644
--- a/cdmlibrary/pom.xml
+++ b/cdmlibrary/pom.xml
@@ -23,9 +23,6 @@
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
-          <excludes>
-            <exclude>**/*XXXsdfefef*.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -34,10 +31,6 @@
           <includes>
             <include>**/*Test.java</include>
           </includes>
-          <excludes>
-            <exclude>**/EventTest.java</exclude>
-            <exclude>**/ListenerTest.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -58,9 +51,30 @@
           </execution>
         </executions>
       </plugin>
+      <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>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.5.2a</version>
+    </dependency>
     <dependency>
       <groupId>com.sun.xml.rpc</groupId>
       <artifactId>jaxrpc-impl</artifactId>
@@ -127,6 +141,9 @@
       <id>ssh-repository</id>
       <url>scpexe://dev.e-taxonomy.eu/svn/trunk/javaLibraries</url>
     </repository>
-  </distributionManagement>
+  </distributionManagement>
+<!--  
+  <aspectSourceDirectory>src/main/java/eu/etaxonomy/cdm/aspect</aspectSourceDirectory>
+-->
 </project>
 
diff --git a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
index a4a980b5ea..98597efcec 100644
--- 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
 	   http://www.springframework.org/schema/aop/spring-aop-2.0.xsd" >
    
-   <bean id="defaultDataSource" 
+   <bean id="mysqlDataSource" 
    			class="org.springframework.jdbc.datasource.DriverManagerDataSource">
         <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
         <property name="url" value="jdbc:mysql://192.168.2.10/cdm_test"/>
@@ -15,7 +15,7 @@
         <property name="password" value="wp5"/>
   </bean>
   
-  <bean id="localHsqldb" 
+ 	<bean id="localDataSource" 
   			class="eu.etaxonomy.cdm.database.LocalHsqldb" 
   			init-method="init"
   			destroy-method="destroy">
@@ -35,7 +35,7 @@
   
   <bean id="sessionFactory" 
   			class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
-        <property name="dataSource" ref="localHsqldb"/>
+  	<property name="dataSource" ref="mysqlDataSource"/>
         <property name="annotatedPackages">
 			<list>
 		    	<value>eu.etaxonomy.cdm.model.common</value>
@@ -54,9 +54,9 @@
 		<property name="hibernateProperties">
             <props>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
-                <!-- prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop-->
-                <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
-                <prop key="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</prop>
+                 <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+<!--                <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
+-->                <prop key="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</prop>
                 <prop key="hibernate.show_sql">false</prop>
                 <prop key="hibernate.format_sql">false</prop>
             </props>