|
Line
Link Here
|
| 0 |
-- test/org/apache/catalina/startup/LoggingBaseTest.java |
0 |
++ test/org/apache/catalina/startup/LoggingBaseTest.java |
|
Lines 108-114
Link Here
|
| 108 |
System.setProperty("java.util.logging.manager", |
108 |
System.setProperty("java.util.logging.manager", |
| 109 |
"org.apache.juli.ClassLoaderLogManager"); |
109 |
"org.apache.juli.ClassLoaderLogManager"); |
| 110 |
System.setProperty("java.util.logging.config.file", new File( |
110 |
System.setProperty("java.util.logging.config.file", new File( |
| 111 |
getBuildDirectory(), "conf/logging.properties").toString()); |
111 |
System.getProperty("tomcat.test.basedir"), "conf/logging.properties").toString()); |
| 112 |
|
112 |
|
| 113 |
// Get log instance after logging has been configured |
113 |
// Get log instance after logging has been configured |
| 114 |
log = LogFactory.getLog(getClass()); |
114 |
log = LogFactory.getLog(getClass()); |
| 115 |
-- test/org/apache/catalina/authenticator/TestFormAuthenticator.java |
115 |
++ test/org/apache/catalina/authenticator/TestFormAuthenticator.java |
|
Lines 642-648
Link Here
|
| 642 |
this.clientShouldUseHttp11 = clientShouldUseHttp11; |
642 |
this.clientShouldUseHttp11 = clientShouldUseHttp11; |
| 643 |
|
643 |
|
| 644 |
Tomcat tomcat = getTomcatInstance(); |
644 |
Tomcat tomcat = getTomcatInstance(); |
| 645 |
File appDir = new File(getBuildDirectory(), "webapps/examples"); |
645 |
File appDir = new File(System.getProperty("tomcat.test.basedir"), |
|
|
646 |
"/webapps/examples"); |
| 646 |
Context ctx = tomcat.addWebapp(null, "/examples", |
647 |
Context ctx = tomcat.addWebapp(null, "/examples", |
| 647 |
appDir.getAbsolutePath()); |
648 |
appDir.getAbsolutePath()); |
| 648 |
setUseCookies(clientShouldUseCookies); |
649 |
setUseCookies(clientShouldUseCookies); |
| 649 |
-- build.xml |
650 |
++ build.xml |
|
Lines 59-64
Link Here
|
| 59 |
<property name="tomcat.output" value="${basedir}/output"/> |
59 |
<property name="tomcat.output" value="${basedir}/output"/> |
| 60 |
<property name="tomcat.build" value="${tomcat.output}/build"/> |
60 |
<property name="tomcat.build" value="${tomcat.output}/build"/> |
| 61 |
<property name="tomcat.classes" value="${tomcat.output}/classes"/> |
61 |
<property name="tomcat.classes" value="${tomcat.output}/classes"/> |
|
|
62 |
<property name="tomcat.testrunclasses" value="${tomcat.output}/classes"/> |
| 62 |
<property name="tomcat.deployer" value="${tomcat.output}/deployer"/> |
63 |
<property name="tomcat.deployer" value="${tomcat.output}/deployer"/> |
| 63 |
<property name="tomcat.dist" value="${tomcat.output}/dist"/> |
64 |
<property name="tomcat.dist" value="${tomcat.output}/dist"/> |
| 64 |
<property name="tomcat.embed" value="${tomcat.output}/embed"/> |
65 |
<property name="tomcat.embed" value="${tomcat.output}/embed"/> |
|
Lines 70-75
Link Here
|
| 70 |
<property name="tomcat.src.jars" value="${tomcat.output}/src-jars"/> |
71 |
<property name="tomcat.src.jars" value="${tomcat.output}/src-jars"/> |
| 71 |
<property name="test.classes" value="${tomcat.output}/testclasses"/> |
72 |
<property name="test.classes" value="${tomcat.output}/testclasses"/> |
| 72 |
<property name="test.temp" value="${tomcat.output}/test-tmp"/> |
73 |
<property name="test.temp" value="${tomcat.output}/test-tmp"/> |
|
|
74 |
<property name="test.basedir" value="${tomcat.build}"/> |
| 73 |
<property name="test.reports" value="${tomcat.build}/logs"/> |
75 |
<property name="test.reports" value="${tomcat.build}/logs"/> |
| 74 |
<property name="test.apr.loc" value="${tomcat.build}/bin/native"/> |
76 |
<property name="test.apr.loc" value="${tomcat.build}/bin/native"/> |
| 75 |
<!-- base directory for jdbc-pool --> |
77 |
<!-- base directory for jdbc-pool --> |
|
Lines 203-213
Link Here
|
| 203 |
</path> |
205 |
</path> |
| 204 |
|
206 |
|
| 205 |
<path id="tomcat.classpath"> |
207 |
<path id="tomcat.classpath"> |
| 206 |
<pathelement location="${tomcat.classes}"/> |
208 |
<pathelement path="${tomcat.testrunclasses}"/> |
| 207 |
</path> |
209 |
</path> |
| 208 |
|
210 |
|
| 209 |
<path id="tomcat.test.classpath"> |
211 |
<path id="tomcat.test.classpath"> |
| 210 |
<pathelement location="${tomcat.build}/webapps/examples/WEB-INF/classes"/> |
212 |
<pathelement location="${test.basedir}/webapps/examples/WEB-INF/classes"/> |
| 211 |
<pathelement location="${test.classes}"/> |
213 |
<pathelement location="${test.classes}"/> |
| 212 |
<pathelement location="${junit.jar}"/> |
214 |
<pathelement location="${junit.jar}"/> |
| 213 |
<pathelement location="${hamcrest.jar}"/> |
215 |
<pathelement location="${hamcrest.jar}"/> |
|
Lines 1442-1447
Link Here
|
| 1442 |
<classpath refid="tomcat.test.run.classpath" /> |
1444 |
<classpath refid="tomcat.test.run.classpath" /> |
| 1443 |
|
1445 |
|
| 1444 |
<sysproperty key="tomcat.test.temp" value="${test.temp}" /> |
1446 |
<sysproperty key="tomcat.test.temp" value="${test.temp}" /> |
|
|
1447 |
<sysproperty key="tomcat.test.basedir" value="${test.basedir}" /> |
| 1445 |
<sysproperty key="tomcat.test.tomcatbuild" value="${tomcat.build}" /> |
1448 |
<sysproperty key="tomcat.test.tomcatbuild" value="${tomcat.build}" /> |
| 1446 |
<sysproperty key="tomcat.test.protocol" value="@{protocol}" /> |
1449 |
<sysproperty key="tomcat.test.protocol" value="@{protocol}" /> |
| 1447 |
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" /> |
1450 |
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" /> |