Skip to content

Commit 94944e3

Browse files
author
gk_brown
committed
Remove test console app.
git-svn-id: https://svn.java.net/svn/appbundler~svn@18 07572b26-92e5-4d45-f66a-c18421440a21
1 parent 0202b7e commit 94944e3

File tree

3 files changed

+3
-63
lines changed

3 files changed

+3
-63
lines changed

appbundler/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="test"/>
54
<classpathentry kind="lib" path="bin/appbundler-1.0ea.jar"/>
65
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
76
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ant"/>

appbundler/test/Test.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

build.xml

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ questions.
3131
<property file="build.properties"/>
3232

3333
<property name="folder.src" value="src"/>
34-
<property name="folder.test" value="test"/>
3534
<property name="folder.native" value="native"/>
3635
<property name="folder.bin" value="bin"/>
3736
<property name="folder.classes" value="${folder.bin}/classes"/>
@@ -49,7 +48,6 @@ questions.
4948
<src>
5049
<dirset dir="${ant.project.name}">
5150
<include name="${folder.src}"/>
52-
<include name="${folder.test}"/>
5351
</dirset>
5452
</src>
5553
<compilerarg line="-Xlint:all"/>
@@ -63,10 +61,6 @@ questions.
6361
<exclude name="**/*.java"/>
6462
<exclude name="**/package.html"/>
6563
</fileset>
66-
<fileset dir="${ant.project.name}/${folder.test}" erroronmissingdir="false">
67-
<exclude name="**/*.java"/>
68-
<exclude name="**/package.html"/>
69-
</fileset>
7064
</copy>
7165

7266
<!-- TODO Move this to a makefile so we can reference the defines required by JLI_Launch() -->
@@ -104,34 +98,14 @@ questions.
10498
<attribute name="Implementation-Title" value="App Bundler Ant Task"/>
10599
<attribute name="Implementation-Version" value="${version}"/>
106100
</manifest>
107-
<fileset dir="${ant.project.name}/${folder.classes}">
108-
<exclude name="**/${folder.test}/**"/>
109-
</fileset>
101+
<fileset dir="${ant.project.name}/${folder.classes}"/>
110102
<fileset dir="${ant.project.name}/${folder.bin}">
111103
<include name="JavaAppLauncher"/>
112104
</fileset>
113105
</jar>
114106
</target>
115107

116108
<!-- Test targets -->
117-
<target name="test-hello" depends="package">
118-
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"
119-
classpath="${ant.project.name}/${folder.bin}/${ant.project.name}-${version}.jar"/>
120-
121-
<bundleapp outputdirectory="."
122-
name="HelloWorld"
123-
displayname="Hello World Test"
124-
identifier="com.oracle.appbundler.Test"
125-
shortversion="1.0"
126-
mainclassname="Test">
127-
<runtime dir="${env.JAVA_HOME}"/>
128-
<classpath dir="${ant.project.name}/${folder.classes}" includes="Test.class"/>
129-
<option value="-Xms32M"/>
130-
<option value="-Xmx256M"/>
131-
<argument value="foo=bar"/>
132-
</bundleapp>
133-
</target>
134-
135109
<target name="test-swingset" depends="package">
136110
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"
137111
classpath="${ant.project.name}/${folder.bin}/${ant.project.name}-${version}.jar"/>
@@ -148,6 +122,7 @@ questions.
148122
</runtime>
149123
<classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/>
150124
<option value="-Dapple.laf.useScreenMenuBar=true"/>
125+
<argument value="foo=bar"/>
151126
</bundleapp>
152127
</target>
153128

@@ -163,6 +138,7 @@ questions.
163138
mainclassname="SwingSet2">
164139
<classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/>
165140
<option value="-Dapple.laf.useScreenMenuBar=true"/>
141+
<argument value="foo=bar"/>
166142
</bundleapp>
167143
</target>
168144

0 commit comments

Comments
 (0)