Author: max.andersen(a)jboss.com Date: 2007-01-25 06:41:38 -0500 (Thu, 25 Jan 2007) New Revision: 11101 Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/ConfigurationTask.java Log: HBX-862 - align propertyfile attribute usage to support override Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/ConfigurationTask.java =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/ConfigurationTask.java 2007-01-25 11:36:34 UTC (rev 11100) +++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/ConfigurationTask.java 2007-01-25 11:41:38 UTC (rev 11101) @@ -67,10 +67,6 @@ */ protected void doConfiguration(Configuration configuration) { validateParameters(); - Properties p = getProperties(); - if(p!=null) { - configuration.setProperties(p); - } if (entityResolver != null) { try { @@ -99,6 +95,10 @@ if (configurationFile != null) configuration.configure( configurationFile ); addMappings(getFiles() ); + Properties p = getProperties(); + if(p!=null) { + configuration.setProperties(p); + } } protected Properties getProperties() {