You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/08 07:17:40 UTC
git commit: Fixing test dependency jar location
Updated Branches:
refs/heads/master 208b730b5 -> a6f2fb30a
Fixing test dependency jar location
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a6f2fb30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a6f2fb30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a6f2fb30
Branch: refs/heads/master
Commit: a6f2fb30abd97c46cb7cc9bed1d81b90e45c6cb9
Parents: 208b730
Author: Melan Nimesh <me...@gmail.com>
Authored: Wed Jan 8 11:21:26 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Jan 8 11:47:18 2014 +0530
----------------------------------------------------------------------
products/autoscaler/modules/integration/pom.xml | 2 +-
.../integration/tests/AutoscalerTestServerManager.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6f2fb30/products/autoscaler/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/integration/pom.xml b/products/autoscaler/modules/integration/pom.xml
index 1e02456..4234b8c 100644
--- a/products/autoscaler/modules/integration/pom.xml
+++ b/products/autoscaler/modules/integration/pom.xml
@@ -111,7 +111,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/src/test/resources/artifacts/jar
+ <outputDirectory>${basedir}/target/resources/artifacts/jar
</outputDirectory>
<includeTypes>jar</includeTypes>
<includeArtifactIds>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6f2fb30/products/autoscaler/modules/integration/src/test/java/org/apache/stratos/autoscaler/integration/tests/AutoscalerTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/integration/src/test/java/org/apache/stratos/autoscaler/integration/tests/AutoscalerTestServerManager.java b/products/autoscaler/modules/integration/src/test/java/org/apache/stratos/autoscaler/integration/tests/AutoscalerTestServerManager.java
index 218b2b7..4aa8233 100644
--- a/products/autoscaler/modules/integration/src/test/java/org/apache/stratos/autoscaler/integration/tests/AutoscalerTestServerManager.java
+++ b/products/autoscaler/modules/integration/src/test/java/org/apache/stratos/autoscaler/integration/tests/AutoscalerTestServerManager.java
@@ -82,6 +82,9 @@ public class AutoscalerTestServerManager extends TestServerManager {
Assert.assertNotNull(carbonHome, "carbon home cannot be null");
String resourceLocation = System.getProperty("framework.resource.location",
System.getProperty("basedir") + "src" + File.separator + "test" + File.separator + "resources" + File.separator );
+ String jarArtifactDir =
+ System.getProperty("basedir") + File.separator + "target" + File.separator + "resources" + File.separator + "artifacts"+ File.separator + "jar" ;
+
String libDir = carbonHome + File.separator + "repository"+ File.separator + "components"+ File.separator + "lib";
String confDir = carbonHome + File.separator + "repository"+ File.separator + "conf";
@@ -95,7 +98,7 @@ public class AutoscalerTestServerManager extends TestServerManager {
log.info("Copying jndi.properties file....");
FileUtils.copyFile(new File(resourceLocation,"jndi.properties"),new File(confDir,"jndi.properties"));
log.info("Copying ActiveMQ dependencies....");
- FileUtils.copyDirectory(new File(resourceLocation + File.separator + "artifacts"+ File.separator + "jar"), new File(libDir));
+ FileUtils.copyDirectory(new File(jarArtifactDir), new File(libDir));
log.info("Copying autoscaler.xml....");
FileUtils.copyFile(new File(resourceLocation,"autoscaler.xml"),new File(confDir,"autoscaler.xml"));
}