Skip to content

Commit 15e6106

Browse files
committed
sync to latest API
1 parent 55736e8 commit 15e6106

File tree

4 files changed

+46
-15
lines changed

4 files changed

+46
-15
lines changed

src/main/resources/GroovyExample.groovy

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import com.jetdrone.vertx.yoke.middleware.*
22
import com.jetdrone.vertx.yoke.GYoke
33
import com.jetdrone.vertx.yoke.engine.GroovyTemplateEngine
44
import com.jetdrone.vertx.yoke.util.Utils
5-
import org.vertx.java.core.json.JsonObject
65

7-
import javax.crypto.Mac
86
import static groovy.json.JsonOutput.toJson
97
import static java.util.UUID.randomUUID
108

@@ -52,14 +50,13 @@ def secHandler = { request, next ->
5250
}
5351

5452
def server = vertx.createHttpServer()
55-
def eb = vertx.eventBus
5653

57-
new GYoke(vertx)
54+
new GYoke(vertx, container.logger)
5855
.engine('html', new GroovyTemplateEngine())
5956
.use(new ErrorHandler(true))
6057
.use(new CookieParser(secret))
6158
.use(new Session(secret))
62-
.use(new Logger(container.logger))
59+
.use(new Logger())
6360
.use(new BridgeSecureHandler("auth_address", "session.store" ))
6461
.use(new BodyParser())
6562
.use("/static", new Static("."))

src/main/resources/index.html

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h3>Post some protected data. Note: "user/pass" for username and password.</h3>
5050
<form ng-submit="restrictedAction()">
5151
Enter restricted data:
5252
<input type="text" ng-model="restrictedData">
53-
<input type="submit" value="Submit"></input>
53+
<input type="submit" value="Submit">
5454
</form>
5555
<p ng-repeat="r in restrictedContent">Server says: {{r}}</p>
5656

@@ -67,15 +67,16 @@ <h3>Try to chat after login.</h3>
6767
</form>
6868
</div>
6969

70-
<script src="/static/lib/jquery-1.7.2.js" type="text/javascript"></script>
71-
<script src="/static/lib/angular-1.0.1.js" type="text/javascript"></script>
72-
<script src="/static/lib/angular-mocks-1.0.1.js" type="text/javascript"></script>
73-
<script src="/static/lib/http-auth-interceptor.js" type="text/javascript"></script>
74-
<script src="/static/lib/sockjs-0.3.4.min.js" type="text/javascript"></script>
75-
<script src="/static/lib/vertxbus.js" type="text/javascript"></script>
70+
<script src="/static/lib/jquery-1.7.2.js" type="text/javascript"></script>
71+
<script src="/static/lib/angular-1.0.1.js" type="text/javascript"></script>
72+
<script src="/static/lib/angular-mocks-1.0.1.js" type="text/javascript"></script>
73+
<script src="/static/lib/http-auth-interceptor.js" type="text/javascript"></script>
74+
<script src="/static/lib/sockjs-0.3.4.min.js" type="text/javascript"></script>
75+
<script src="/static/lib/vertxbus.min.js" type="text/javascript"></script>
7676

77-
<script src="/static/app/main.js" type="text/javascript"></script>
78-
<script src="/static/app/login.js" type="text/javascript"></script>
79-
<script src="/static/app/content.js" type="text/javascript"></script>
77+
<script src="/static/app/main.js" type="text/javascript"></script>
78+
<script src="/static/app/login.js" type="text/javascript"></script>
79+
<script src="/static/app/content.js" type="text/javascript"></script>
80+
</div>
8081
</body>
8182
</html>

src/main/resources/static/lib/sockjs-0.3.4.min.js

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

src/main/resources/static/lib/vertxbus.min.js

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

0 commit comments

Comments
 (0)