Skip to content

Commit ce53346

Browse files
author
Pascal Robert
committed
Default page is now the blob entries listing
1 parent df667d8 commit ce53346

File tree

3 files changed

+43
-1
lines changed

3 files changed

+43
-1
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<wodefinitions>
3+
<wo class="PublicWrapper" wocomponentcontent="false"> <binding name="pageTitle"/>
4+
<validation message="'pageTitle' is a required binding.">
5+
<unbound name="pageTitle"/>
6+
</validation>
7+
</wo>
8+
</wodefinitions>

SimpleBlog/Sources/com/wowodc/app/Application.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
import com.wowodc.model.BlogCategory;
88
import com.wowodc.model.BlogEntry;
99
import com.wowodc.model.Person;
10+
import com.wowodc.rest.controllers.OtherRoutesController;
1011

1112
import er.extensions.appserver.ERXApplication;
1213
import er.extensions.appserver.navigation.ERXNavigationManager;
1314
import er.rest.ERXRestNameRegistry;
15+
import er.rest.routes.ERXRoute;
1416
import er.rest.routes.ERXRouteRequestHandler;
1517

1618
public class Application extends ERXApplication {
@@ -23,7 +25,6 @@ public static void main(String[] argv) {
2325

2426
public Application() {
2527
ERXApplication.log.info("Welcome to " + name() + " !");
26-
setDefaultRequestHandler(requestHandlerForKey(directActionRequestHandlerKey()));
2728
D2W.setFactory(new Factory());
2829

2930
ERXRestNameRegistry.registry().setExternalNameForInternalName("Post", BlogEntry.ENTITY_NAME);
@@ -34,8 +35,12 @@ public Application() {
3435
restRequestHandler.addDefaultRoutes(BlogCategory.ENTITY_NAME);
3536
restRequestHandler.addDefaultRoutes(BlogEntry.ENTITY_NAME);
3637
restRequestHandler.addDefaultRoutes(Person.ENTITY_NAME);
38+
restRequestHandler.insertRoute(new ERXRoute("Other", "", ERXRoute.Method.Get, OtherRoutesController.class, "mainPage"));
39+
restRequestHandler.insertRoute(new ERXRoute("Other", "/admin", ERXRoute.Method.Get, OtherRoutesController.class, "adminPage"));
3740

3841
ERXRouteRequestHandler.register(restRequestHandler);
42+
43+
setDefaultRequestHandler(restRequestHandler);
3944
}
4045

4146
@Override
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.wowodc.rest.controllers;
2+
3+
import com.webobjects.appserver.WOActionResults;
4+
import com.webobjects.appserver.WORequest;
5+
import com.wowodc.ui.components.BlogEntryIndexPage;
6+
import com.wowodc.ui.components.Main;
7+
8+
import er.rest.format.ERXRestFormat;
9+
10+
public class OtherRoutesController extends BaseRestController {
11+
12+
public OtherRoutesController(WORequest request) {
13+
super(request);
14+
}
15+
16+
public WOActionResults mainPageAction() {
17+
return pageWithName(BlogEntryIndexPage.class);
18+
}
19+
20+
public WOActionResults adminPageAction() {
21+
return pageWithName(Main.class);
22+
}
23+
24+
@Override
25+
protected ERXRestFormat defaultFormat() {
26+
return ERXRestFormat.html();
27+
}
28+
29+
}

0 commit comments

Comments
 (0)