Author: keith Date: Thu Mar 19 05:09:49 2009 New Revision: 32270 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32270
Log: removing an unnecessary and move Modified: trunk/mashup/java/modules/integration/pom.xml trunk/mashup/java/modules/integration/src/test/java/org/wso2/mashup/integration/IntegrationTestSuite.java Modified: trunk/mashup/java/modules/integration/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/integration/pom.xml?rev=32270&r1=32269&r2=32270&view=diff ============================================================================== --- trunk/mashup/java/modules/integration/pom.xml (original) +++ trunk/mashup/java/modules/integration/pom.xml Thu Mar 19 05:09:49 2009 @@ -63,31 +63,6 @@ <configuration> <tasks> <unzip src="../distribution/target/wso2mashup-${pom.version}.zip" dest="target"/> - <move file="target/wso2mashup-${pom.version}" toFile="target/wso2mashup"/> - <!--copy todir="${dist.dir}/scripts/system"> - <fileset dir="test-resources/scripts"/> - </copy--> - - <!--Copying in the RESTSample as its used to test HTTPBinding properties - <copy todir="target/wso2mashup/repository/scripts/"> - <fileset dir="../samples/RESTSample"/> - </copy>--> -<!-- - <move file="${dist.dir}/conf/log4j.properties" todir="target/test-classes" /> - <move file="${dist.dir}/conf/ui-extensions-config.xml" todir="target/test-classes" /> - <move file="${dist.dir}/conf/wso2wsas.hibernate.cfg.xml" todir="target/test-classes" /> - <move file="${dist.dir}/conf/wso2wsas.hbm.xml" todir="target/test-classes" /> - <move file="${dist.dir}/conf/wso2wsas.properties" todir="target/test-classes" /> - - <filter token="HTTP_PORT" value="${httpPort}"/> - <filter token="HTTPS_PORT" value="${httpsPort}"/> - <filter token="COMMAND_PORT" value="${commandPort}"/> - <filter token="JMX_PORT" value="${jmxPort}"/> - <delete file="${dist.dir}/conf/server.xml"/> - <copy toDir="${dist.dir}/conf" filtering="on"> - <fileset dir="test-resources/conf"/> - </copy> ---> </tasks> </configuration> </execution> @@ -99,9 +74,13 @@ <configuration> <systemProperties> <property> - <name>basedir</name> + <name>maven.basedir</name> <value>${basedir}</value> </property> + <property> + <name>wso2mashup.version</name> + <value>${version}</value> + </property> </systemProperties> <!--forkMode>pertest</forkMode> Modified: trunk/mashup/java/modules/integration/src/test/java/org/wso2/mashup/integration/IntegrationTestSuite.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/integration/src/test/java/org/wso2/mashup/integration/IntegrationTestSuite.java?rev=32270&r1=32269&r2=32270&view=diff ============================================================================== --- trunk/mashup/java/modules/integration/src/test/java/org/wso2/mashup/integration/IntegrationTestSuite.java (original) +++ trunk/mashup/java/modules/integration/src/test/java/org/wso2/mashup/integration/IntegrationTestSuite.java Thu Mar 19 05:09:49 2009 @@ -53,15 +53,16 @@ return new TestSetup(suite) { protected void setUp() throws Exception { - String basedir = System.getProperty("basedir"); + String basedir = System.getProperty("maven.basedir"); + String mashupVersion = System.getProperty("wso2mashup.version"); System.setProperty("wso2.server.standalone", "true"); System.setProperty("carbon.registry.root", "/"); - System.setProperty("carbon.home", basedir + "/target/wso2mashup"); + System.setProperty("carbon.home", basedir + "/target/wso2mashup-" + mashupVersion); System.setProperty("wso2.carbon.xml", - basedir + "/target/wso2mashup/conf/carbon.xml"); + basedir + "/target/wso2mashup-" + mashupVersion + "/conf/carbon.xml"); System.setProperty("wso2.transports.xml", - basedir + "/target/wso2mashup/conf/transports.xml"); - System.setProperty("java.io.tmpdir", basedir + "/target/wso2mashup/tmp"); + basedir + "/target/wso2mashup-" + mashupVersion + "/conf/transports.xml"); + System.setProperty("java.io.tmpdir", basedir + "/target/wso2mashup-" + mashupVersion + "/tmp"); main = new Main(); main.startServer(); testConnect(host + ":" + port + "/" + serviceRoot + "/system/version/getVersion"); _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
