Fixed some build stuff so that it is possible to override location of baltrad-db... andersFeatureBranch jenkins-Beast-381
authorAnders Henja <anders@baltrad.eu>
Thu, 27 Sep 2018 20:45:05 +0000 (22:45 +0200)
committerAnders Henja <anders@baltrad.eu>
Thu, 27 Sep 2018 20:45:05 +0000 (22:45 +0200)
build.xml
itest/eu/baltrad/beast/rules/acrr/AcrrRuleManagerITest-context.xml~ [deleted file]

index f9d6d57..57b3a95 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -49,14 +49,18 @@ along with the Beast library library.  If not, see http://www.gnu.org/licenses.
   <!-- override this with -Dbaltraddb.path= -->
   <property name="baltraddb.path" value="/opt/baltrad/db-devel"/>
   <property name="baltraddb.bin.path" value="${baltraddb.path}/bin"/>
+  <property name="baltraddb.java.path" value="${baltraddb.path}/share/baltrad-bdb/java" />
 
   <available file="${baltraddb.path}" type="dir" property="baltraddb.available"/>
-  <available file="${baltraddb.path}/share/baltrad-bdb/java/baltrad-bdb-client.jar" property="baltrad-bdb-client.jar.available"/>
+  <available file="${baltraddb.java.path}/baltrad-bdb-client.jar" property="baltrad-bdb-client.jar.available"/>
   <available file="${baltraddb.bin.path}/baltrad-bdb-server" property="baltrad-bdb-server.available"/>
   <fail unless="baltrad-bdb-client.jar.available" message="Can not find baltrad-bdb-client.jar!" />
   <fail unless="baltrad-bdb-server.available" message="Can not find baltrad-bdb-server executable" />
   <fail unless="blt.db.path" message="No storage root path defined (blt.db.path)!"/>
 
+  <echo>Java Version via Ant: ${ant.java.version}</echo> 
+  <echo>Java Version System Prop: ${java.version}</echo> 
+  <echoproperties/>
   <path id="lib.path">
     <fileset dir="${lib.dir}">
       <include name="**/*.jar"/>
@@ -66,10 +70,10 @@ along with the Beast library library.  If not, see http://www.gnu.org/licenses.
       <exclude name="emma/*.jar"/>
       <exclude name="cglib/*.jar"/>
     </fileset>
-    <fileset dir="${baltraddb.path}/share/baltrad-bdb/java/">
+    <fileset dir="${baltraddb.java.path}/">
       <include name="baltrad-bdb-client.jar"/>
     </fileset>
-    <fileset dir="${baltraddb.path}/share/baltrad-bdb/java/">
+    <fileset dir="${baltraddb.java.path}/">
       <include name="libs/*.jar"/>
     </fileset>
   </path>
diff --git a/itest/eu/baltrad/beast/rules/acrr/AcrrRuleManagerITest-context.xml~ b/itest/eu/baltrad/beast/rules/acrr/AcrrRuleManagerITest-context.xml~
deleted file mode 100644 (file)
index ab1f6f9..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" 
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx = "http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
-                           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                           http://www.springframework.org/schema/tx
-                           http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
-
-  <!-- Property placeholder configurer for expanding ${} into values -->
-  <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="locations">
-      <list>
-        <value>testdb.properties</value>
-      </list>
-    </property>
-  </bean>
-  
-  <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource">
-    <property name="driverClassName" value="${db.driver}"/>
-    <property name="url" value="${db.url}"/>
-    <property name="username" value="${db.user}"/>
-    <property name="password" value="${db.pwd}"/>
-  </bean>
-
-  <bean id="jdbcTemplate" class="org.springframework.jdbc.core.simple.SimpleJdbcTemplate">
-    <constructor-arg ref="dataSource"/>
-  </bean>
-
-  <!-- Enable transaction management -->
-  <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-     <property name="dataSource" ref="dataSource"/>
-  </bean>
-  
-  <!-- we want transactions on classes -->
-  <tx:annotation-driven transaction-manager="txManager" proxy-target-class="true"/>
-  
-  <bean id="dataFactory" class="org.dbunit.ext.postgresql.PostgresqlDataTypeFactory"/>
-
-  <!-- We need to have a timeout manager so that we can initiate timeout requests from anywhere -->
-  <bean id="timeoutfactory" class="eu.baltrad.beast.rules.timer.TimeoutTaskFactory"/>  
-  <bean id="timeoutmanager" class="eu.baltrad.beast.rules.timer.TimeoutManager" autowire="byType"/>
-
-  <bean id="bdb_db" class="eu.baltrad.bdb.db.rest.RestfulDatabase" >
-       <constructor-arg value="${blt.db.uri}" />
-  </bean>
-  
-  <bean id="bdb_storage" class="eu.baltrad.bdb.storage.CacheDirStorage" >
-       <constructor-arg value="${blt.db.path}" />
-  </bean>
-  
-  <bean id="fc" class="eu.baltrad.bdb.BasicFileCatalog" >
-       <constructor-arg ref="bdb_db" />
-       <constructor-arg ref="bdb_storage" />
-  </bean>
-
-  <bean id="catalog" class="eu.baltrad.beast.db.Catalog" autowire="byType"/>
-
-  <bean id="ruleutil" class="eu.baltrad.beast.rules.util.RuleUtilities" autowire="byType"/>
-  
-  <bean id="bltvolumemgr" class="eu.baltrad.beast.rules.volume.VolumeRuleManager" autowire="byType" />
-</beans>