Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Doha2012
Doha2012 committed Jan 29, 2016
1 parent 377c71e commit 89651d7
Show file tree
Hide file tree
Showing 15 changed files with 10 additions and 276 deletions.
1 change: 0 additions & 1 deletion spring-zuul/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

<modules>
<module>spring-zuul-foos-resource</module>
<module>spring-zuul-users-resource</module>
<module>spring-zuul-ui</module>
</modules>

Expand Down
6 changes: 3 additions & 3 deletions spring-zuul/spring-zuul-foos-resource/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Expand Down
8 changes: 4 additions & 4 deletions spring-zuul/spring-zuul-ui/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
6 changes: 3 additions & 3 deletions spring-zuul/spring-zuul-ui/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
Expand Down
4 changes: 0 additions & 4 deletions spring-zuul/spring-zuul-ui/src/main/resources/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ zuul:
foos:
path: /foos/**
url: http://localhost:8081/spring-zuul-foos-resource/foos
users:
path: /users/**
url: http://localhost:8081/spring-zuul-users-resource/users

32 changes: 0 additions & 32 deletions spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,6 @@
$scope.foo = $scope.foos.get({fooId:$scope.foo.id});
}

$scope.user = {id:0 , username:"john", age:11};
$scope.users = $resource("/users/:userId",{userId:'@id'});

$scope.getUser = function(){
$scope.user = $scope.users.get({userId:$scope.user.id});
}





});
/*]]>*/
</script>
Expand All @@ -63,27 +52,6 @@ <h1 class="col-sm-12">Foo Details</h1>
<div class="col-sm-12">
<a class="btn btn-default" href="#" ng-click="getFoo()">New Foo</a>
</div>
<br/><br/>

<h1 class="col-sm-12">User Details</h1>
<div class="col-sm-12">
<label class="col-sm-3">ID</label>
<span>{{user.id}}</span>
</div>

<div class="col-sm-12">
<label class="col-sm-3">Username</label>
<span>{{user.username}}</span>
</div>

<div class="col-sm-12">
<label class="col-sm-3">Age</label>
<span>{{user.age}}</span>
</div>

<div class="col-sm-12">
<a class="btn btn-default" href="#" ng-click="getUser()">New User</a>
</div>

</div>
</body>
Expand Down
6 changes: 0 additions & 6 deletions spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ public void whenSendRequestToFooResource_thenOK() {
assertEquals(200, response.getStatusCode());
}

@Test
public void whenSendRequestToUserResource_thenHeaderAdded() {
final Response response = RestAssured.get("http://localhost:8080/users/1");
assertEquals(200, response.getStatusCode());
}

@Test
public void whenSendRequest_thenHeaderAdded() {
final Response response = RestAssured.get("http://localhost:8080/foos/1");
Expand Down
32 changes: 0 additions & 32 deletions spring-zuul/spring-zuul-users-resource/.classpath
View file

This file was deleted.

48 changes: 0 additions & 48 deletions spring-zuul/spring-zuul-users-resource/.project
View file

This file was deleted.

38 changes: 0 additions & 38 deletions spring-zuul/spring-zuul-users-resource/pom.xml
View file

This file was deleted.

14 changes: 0 additions & 14 deletions ...ring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java
View file

This file was deleted.

13 changes: 0 additions & 13 deletions ...spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java
View file

This file was deleted.

30 changes: 0 additions & 30 deletions .../spring-zuul-users-resource/src/main/java/org/baeldung/web/controller/UserController.java
View file

This file was deleted.

46 changes: 0 additions & 46 deletions spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/dto/User.java
View file

This file was deleted.

2 changes: 0 additions & 2 deletions spring-zuul/spring-zuul-users-resource/src/main/resources/application.properties
View file

This file was deleted.

0 comments on commit 89651d7

Please sign in to comment.