build.xml
changeset 20005 072180e28880
parent 20003 affe31812cc0
child 20007 53e0162a749a
--- a/build.xml	Tue Mar 26 16:12:15 2013 +0530
+++ b/build.xml	Tue Mar 26 16:59:04 2013 +0530
@@ -206,18 +206,6 @@
     </and>
   </condition>
 
-  <condition property="instance.oracle" value="true">
-    <and>
-      <equals arg1="${bbdd.rdbms}" arg2="ORACLE" />
-    </and>
-  </condition>
-
-  <condition property="instance.postgres" value="true" >
-    <and>
-      <equals arg1="${bbdd.rdbms}" arg2="POSTGRE" />
-    </and>
-  </condition>
-
   <condition property="root.user">
     <and>
       <equals arg1="${user.name}" arg2="root" />
@@ -359,24 +347,15 @@
      </sequential>
   </macrodef>
 
-  <macrodef name="createAuditTriggersOracle">
+  <macrodef name="createAuditTriggers">
      <sequential>
        <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="abort" autocommit="true" print="yes">
          <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath>
-         <transaction> CALL ad_create_audit_triggers(null)
+         <transaction> SELECT ad_create_audit_triggers(null);
          </transaction>
        </sql>
      </sequential>
   </macrodef>
-
-  <macrodef name="createAuditTriggersPostgres">
-     <sequential>
-       <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="abort" autocommit="true" print="yes">
-         <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath>
-         <transaction> SELECT ad_create_audit_triggers(null) FROM DUAL; </transaction>
-       </sql>
-     </sequential>
-  </macrodef>
   
   <taskdef resource="axis-tasks.properties" classpathref="project.class.path" />
   
@@ -1224,17 +1203,8 @@
                     propertiesFile="${base.config}/Openbravo.properties"/>
   </target>
 
-  <target name="update.audit.trail.infrastructure.oracle" if="instance.oracle">
-    <createAuditTriggersOracle/>
-  </target>
-
-  <target name="update.audit.trail.infrastructure.postgres" if="instance.postgres">
-    <createAuditTriggersPostgres/>
-  </target>
-
   <target name="update.audit.trail.infrastructure">
-    <antcall target="update.audit.trail.infrastructure.postgres"/>
-    <antcall target="update.audit.trail.infrastructure.oracle"/>
+    <createAuditTriggers/>
   </target>
   
 </project>