Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2011-05-27 01:10:45 +0000
committerJoakim Erdfelt2011-05-27 01:10:45 +0000
commitec5b98db58dc6414ef1a3ace84388744fadea4ff (patch)
treed662ecb853062d35d9ff437bb5002e4f272f19e2 /jetty-deploy/src/test
parent2526693ba35b5da875ab2014da492151844d3283 (diff)
downloadorg.eclipse.jetty.project-ec5b98db58dc6414ef1a3ace84388744fadea4ff.tar.gz
org.eclipse.jetty.project-ec5b98db58dc6414ef1a3ace84388744fadea4ff.tar.xz
org.eclipse.jetty.project-ec5b98db58dc6414ef1a3ace84388744fadea4ff.zip
Moving xml-configured-jetty.properties file creation into jettyHome for testing on windows reasons
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3294 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-deploy/src/test')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java2
-rw-r--r--jetty-deploy/src/test/resources/binding-test-contexts-1.xml2
-rw-r--r--jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index 62ab9e64da..db047df32e 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -123,7 +123,7 @@ public class XmlConfiguredJetty
properties.setProperty("test.workdir",workishDir.getAbsolutePath());
// Write out configuration for use by ConfigurationManager.
- File testConfig = MavenTestingUtils.getTargetFile("xml-configured-jetty.properties");
+ File testConfig = new File(_jettyHome, "xml-configured-jetty.properties");
FileOutputStream out = new FileOutputStream(testConfig);
properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName());
for (Object key:properties.keySet())
diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
index 059fa0bb9c..39c8da87e5 100644
--- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
+++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
@@ -52,7 +52,7 @@
<Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.FileConfigurationManager">
<Set name="file">
- <Property name="test.targetdir" default="target" />/xml-configured-jetty.properties
+ <SystemProperty name="jetty.home"/>/xml-configured-jetty.properties
</Set>
</New>
</Set>
diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
index f383239947..c542672b85 100644
--- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
+++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
@@ -20,7 +20,7 @@
<Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.FileConfigurationManager">
<Set name="file">
- <Property name="test.targetdir" default="target" />/xml-configured-jetty.properties
+ <SystemProperty name="jetty.home"/>/xml-configured-jetty.properties
</Set>
</New>
</Set>

Back to the top