Skip to content

Commit 85b4489

Browse files
committed
IDEA: Interactive Testapp runnable out of IDE.
1 parent decd838 commit 85b4489

10 files changed

Lines changed: 204 additions & 40 deletions

File tree

.idea/artifacts/testapp.xml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Run_Java_Testapp_in_Tomcat.xml

Lines changed: 79 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Run_all_JUnit_Tests.xml

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

echo3-extras.iml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,6 @@
55
<content url="file://$MODULE_DIR$" />
66
<orderEntry type="inheritedJdk" />
77
<orderEntry type="sourceFolder" forTests="false" />
8-
<orderEntry type="module-library">
9-
<library name="echo3-libs">
10-
<CLASSES>
11-
<root url="jar://$MODULE_DIR$/lib/echo3-app-3.0.1-SNAPSHOT.jar!/" />
12-
<root url="jar://$MODULE_DIR$/lib/echo3-webcontainer-3.0.1-SNAPSHOT.jar!/" />
13-
<root url="jar://$MODULE_DIR$/lib/hamcrest-core-1.3.jar!/" />
14-
<root url="jar://$MODULE_DIR$/lib/jetty-6.1.26.jar!/" />
15-
<root url="jar://$MODULE_DIR$/lib/jetty-util-6.1.26.jar!/" />
16-
<root url="jar://$MODULE_DIR$/lib/rhino.jar!/" />
17-
<root url="jar://$MODULE_DIR$/lib/servlet-api-2.5.jar!/" />
18-
</CLASSES>
19-
<JAVADOC />
20-
<SOURCES>
21-
<root url="jar://$MODULE_DIR$/lib/echo3-app-3.0.1-SNAPSHOT-sources.jar!/" />
22-
<root url="jar://$MODULE_DIR$/lib/echo3-webcontainer-3.0.1-SNAPSHOT-sources.jar!/" />
23-
<root url="jar://$MODULE_DIR$/lib/hamcrest-core-1.3-sources.jar!/" />
24-
<root url="jar://$MODULE_DIR$/lib/servlet-api-2.5-sources.jar!/" />
25-
</SOURCES>
26-
</library>
27-
</orderEntry>
28-
<orderEntry type="module-library" scope="TEST">
29-
<library>
30-
<CLASSES>
31-
<root url="jar://$MODULE_DIR$/lib/junit-4.11.jar!/" />
32-
</CLASSES>
33-
<JAVADOC />
34-
<SOURCES>
35-
<root url="jar://$MODULE_DIR$/lib/junit-4.11-sources.jar!/" />
36-
</SOURCES>
37-
</library>
38-
</orderEntry>
398
</component>
409
</module>
4110

src/client/client.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/extras" isTestSource="false" />
6+
<sourceFolder url="file://$MODULE_DIR$/extras" isTestSource="false" packagePrefix="nextapp.echo.extras.webcontainer.resource" />
77
</content>
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />

src/server-java/app-test/app-test.iml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="app" />
11+
<orderEntry type="module-library" scope="TEST">
12+
<library name="junit-4.11">
13+
<CLASSES>
14+
<root url="jar://$MODULE_DIR$/../../../lib/junit-4.11.jar!/" />
15+
</CLASSES>
16+
<JAVADOC />
17+
<SOURCES>
18+
<root url="jar://$MODULE_DIR$/../../../lib/junit-4.11-sources.jar!/" />
19+
</SOURCES>
20+
</library>
21+
</orderEntry>
22+
<orderEntry type="module-library" scope="TEST">
23+
<library>
24+
<CLASSES>
25+
<root url="jar://$MODULE_DIR$/../../../lib/hamcrest-core-1.3.jar!/" />
26+
</CLASSES>
27+
<JAVADOC />
28+
<SOURCES />
29+
</library>
30+
</orderEntry>
1131
</component>
1232
</module>
1333

src/server-java/app/app.iml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@
77
</content>
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
10-
<orderEntry type="module" module-name="client" />
10+
<orderEntry type="module" module-name="client" exported="" />
11+
<orderEntry type="module-library" exported="">
12+
<library name="echo3-app-3.0.0">
13+
<CLASSES>
14+
<root url="jar://$MODULE_DIR$/../../../lib/echo3-app-3.0.0.jar!/" />
15+
</CLASSES>
16+
<JAVADOC />
17+
<SOURCES>
18+
<root url="jar://$MODULE_DIR$/../../../lib/echo3-app-3.0.0-sources.jar!/" />
19+
</SOURCES>
20+
</library>
21+
</orderEntry>
1122
</component>
1223
</module>
1324

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!DOCTYPE html PUBLIC
2+
"-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+
5+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
6+
<head>
7+
<title>Interactive Echo Test Applications</title>
8+
</head>
9+
<body>
10+
<p><a href="http://www.nextapp.com"><img src="images/nextapp_logo.png" width="201" height="67" border="0" alt="NextApp"/></a></p>
11+
<hr/>
12+
<h1>Interactive Echo Extras Test Applications</h1>
13+
<ul>
14+
<li><a href="app">Interactive Test</a></li>
15+
</ul>
16+
</body>
17+
</html>
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="web" name="testapp-webapp">
5+
<configuration>
6+
<descriptors>
7+
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/deploy/web.xml" />
8+
</descriptors>
9+
<webroots>
10+
<root url="file://$MODULE_DIR$/htdocs" relative="/" />
11+
</webroots>
12+
</configuration>
13+
</facet>
14+
</component>
315
<component name="NewModuleRootManager" inherit-compiler-output="true">
416
<exclude-output />
5-
<content url="file://$MODULE_DIR$" />
17+
<content url="file://$MODULE_DIR$">
18+
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
19+
</content>
620
<orderEntry type="inheritedJdk" />
721
<orderEntry type="sourceFolder" forTests="false" />
22+
<orderEntry type="module" module-name="webcontainer" exported="" />
823
</component>
924
</module>
1025

src/server-java/webcontainer/webcontainer.iml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,26 @@
77
</content>
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
10-
<orderEntry type="module" module-name="app" />
11-
<orderEntry type="module-library">
12-
<library>
10+
<orderEntry type="module" module-name="app" exported="" />
11+
<orderEntry type="module-library" exported="" scope="PROVIDED">
12+
<library name="servlet-api-2.4">
1313
<CLASSES>
14-
<root url="jar://$MODULE_DIR$/../../../lib/servlet-api-2.5.jar!/" />
14+
<root url="jar://$MODULE_DIR$/../../../lib/servlet-api-2.4.jar!/" />
1515
</CLASSES>
1616
<JAVADOC />
1717
<SOURCES>
18-
<root url="jar://$MODULE_DIR$/../../../lib/servlet-api-2.5-sources.jar!/" />
18+
<root url="jar://$MODULE_DIR$/../../../lib/servlet-api-2.4-sources.jar!/" />
19+
</SOURCES>
20+
</library>
21+
</orderEntry>
22+
<orderEntry type="module-library" exported="">
23+
<library name="echo3-webcontainer-3.0.0">
24+
<CLASSES>
25+
<root url="jar://$MODULE_DIR$/../../../lib/echo3-webcontainer-3.0.0.jar!/" />
26+
</CLASSES>
27+
<JAVADOC />
28+
<SOURCES>
29+
<root url="jar://$MODULE_DIR$/../../../lib/echo3-webcontainer-3.0.0-sources.jar!/" />
1930
</SOURCES>
2031
</library>
2132
</orderEntry>

0 commit comments

Comments
 (0)