Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Joakim Erdfelt 2011-05-27 01:10:45 +00:00
parent 2526693ba3
commit ec5b98db58
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
View File

@ -123,7 +123,7 @@ public class XmlConfiguredJetty
properties.setProperty("test.workdir",workishDir.getAbsolutePath()); properties.setProperty("test.workdir",workishDir.getAbsolutePath());
// Write out configuration for use by ConfigurationManager. // 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); FileOutputStream out = new FileOutputStream(testConfig);
properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName()); properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName());
for (Object key:properties.keySet()) for (Object key:properties.keySet())

2
jetty-deploy/src/test/resources/binding-test-contexts-1.xml
View File

@ -52,7 +52,7 @@
<Set name="configurationManager"> <Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.FileConfigurationManager"> <New class="org.eclipse.jetty.deploy.FileConfigurationManager">
<Set name="file"> <Set name="file">
<Property name="test.targetdir" default="target" />/xml-configured-jetty.properties <SystemProperty name="jetty.home"/>/xml-configured-jetty.properties
</Set> </Set>
</New> </New>
</Set> </Set>

2
jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
View File

@ -20,7 +20,7 @@
<Set name="configurationManager"> <Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.FileConfigurationManager"> <New class="org.eclipse.jetty.deploy.FileConfigurationManager">
<Set name="file"> <Set name="file">
<Property name="test.targetdir" default="target" />/xml-configured-jetty.properties <SystemProperty name="jetty.home"/>/xml-configured-jetty.properties
</Set> </Set>
</New> </New>
</Set> </Set>