Skip to content

Commit 22508a6

Browse files
author
synapticloop
committed
fixed routemaster-templar.jar
1 parent 19d62b4 commit 22508a6

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

build.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<include name="routemaster.properties" />
5959
</zipfileset>
6060
<zipfileset dir="${src.html.dir}" prefix="routemaster">
61-
<include name="**/*.*" />
61+
<include name="templar/**/*.*" />
6262
</zipfileset>
6363
</zip>
6464
</target>
@@ -70,6 +70,7 @@
7070
<jar destfile="${dist.dir}/${ant.project.name}.jar" manifest="src/main/META-INF/manifest.mf">
7171
<fileset dir="${build.dir}">
7272
<include name="**/*.class" />
73+
<exclude name="**/*TemplarServant.class" />
7374
</fileset>
7475
<fileset dir="${src.dir}">
7576
<include name="**/*.example.properties" />
@@ -85,9 +86,13 @@
8586
<jar destfile="${dist.dir}/${ant.project.name}-templar.jar" manifest="src/main/META-INF/manifest.mf">
8687
<fileset dir="${build.dir}">
8788
<include name="**/*.class" />
89+
<include name="**/routemaster.example.properties" />
8890
</fileset>
8991
<fileset dir="${src.dir}">
90-
<include name="**/mimetype.example.properties" />
92+
<include name="**/mimetypes.example.properties" />
93+
</fileset>
94+
<fileset dir="${src.html.dir}">
95+
<include name="**/mimetypes.example.properties" />
9196
</fileset>
9297
<zipgroupfileset dir="lib/runtime" includes="*.jar" />
9398
</jar>

src/main/java/routemaster.example.templar.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ route./handlers/=synapticloop.nanohttpd.example.servant.HandlerTemplarServant
3535
# rest routes __must__ extend
3636
# synapticloop.nanohttpd.router.RestRoutable
3737

38-
rest./rest/%method%/=synapticloop.nanohttpd.example.servant.RouteMasterTemplarRestServant
38+
rest./rest/%method%/=synapticloop.nanohttpd.example.servant.RouteMasterRestTemplarServant
3939

4040
# This is a simple rest servant that shows the various http methods being called
4141
# with mapped and unmapped parameters. Any parameters that form part of the

src/main/java/synapticloop/nanohttpd/example/servant/RouteMasterRestTemplarServant.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import fi.iki.elonen.NanoHTTPD.IHTTPSession;
2222
import fi.iki.elonen.NanoHTTPD.Response;
2323

24-
public class RouteMasterTemplarRestServant extends RestRoutable {
24+
public class RouteMasterRestTemplarServant extends RestRoutable {
2525

2626
private static final String ROUTER_SNIPPET_TEMPLAR = "src/main/html/templar/router-snippet.templar";
2727
private static final Logger LOGGER = Logger.getLogger(RouteMasterRestServant.class.getName());
2828

29-
public RouteMasterTemplarRestServant(String routeContext, List<String> params) {
29+
public RouteMasterRestTemplarServant(String routeContext, List<String> params) {
3030
super(routeContext, params);
3131
}
3232

0 commit comments

Comments
 (0)