Author: manaRH Date: 2009-04-30 08:06:45 -0400 (Thu, 30 Apr 2009) New Revision: 10732 Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/ftest.properties branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java Log: JBPAPP-1899 Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/ftest.properties =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/ftest.properties 2009-04-30 12:02:38 UTC (rev 10731) +++ branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/ftest.properties 2009-04-30 12:06:45 UTC (rev 10732) @@ -44,6 +44,10 @@ jboss.undeploy.target=undeploy # default wait times jboss.deploy.waittime=300 +# container locations - must be set +# independent from ${seam.dir}/build.properties +jboss.home=/home/mnovotny/apps/jboss-eap-4.3_fp/jboss-as + # default wait urls jboss.example.ready.check.url=seam-${example.name}/ Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-04-30 12:02:38 UTC (rev 10731) +++ branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-04-30 12:06:45 UTC (rev 10732) @@ -141,7 +141,7 @@ WORKSPACE = ftestProperties.getProperty("workspace.home"); // container specific - CONTAINER = ftestProperties.getProperty("container", "jboss5"); + CONTAINER = ftestProperties.getProperty("container", "jboss"); CONTAINER_LOCATION = ftestProperties.getProperty(CONTAINER + ".home"); DEPLOY_TIMEOUT = Integer.parseInt(ftestProperties.getProperty(CONTAINER + ".deploy.waittime")) * 1000; // miliseconds DELETE_PROJECT = Boolean.valueOf(ftestProperties.getProperty("seamgen.delete.project", "false")); @@ -160,14 +160,14 @@ { seamGenProperties = new Properties(); - String[] propertiesToCopy = { "database.type", "database.exists", "database.drop", "driver.jar", "driver.license.jar", "hibernate.connection.username", "hibernate.connection.password", "hibernate.connection.driver_class", "hibernate.connection.dataSource_class", "hibernate.cache.provider_class", "hibernate.default_catalog.null", "hibernate.default_schema.null", "hibernate.dialect", "hibernate.connection.url", "model.package", "action.package", "test.package", "richfaces.skin", "icefaces.home", "jboss.home" }; + String[] propertiesToCopy = { "database.type", "database.exists", "database.drop", "driver.jar", "driver.license.jar", "hibernate.connection.username", "hibernate.connection.password", "hibernate.connection.driver_class", "hibernate.connection.dataSource_class", "hibernate.cache.provider_class", "hibernate.default_catalog.null", "hibernate.default_schema.null", "hibernate.dialect", "hibernate.connection.url", "model.package", "action.package", "test.package", "richfaces.skin", "icefaces.home", "jboss.home", "jboss.domain" }; for (String property : propertiesToCopy) { if (ftestProperties.get(property) != null) { seamGenProperties.put(property, ftestProperties.get(property)); - } + } } // override with ftest.properties