Преглед изворни кода

Delete old README.md to resolve conflict

Beverley Talbott пре 13 година
родитељ
комит
b90b17f541
2 измењених фајлова са 10 додато и 13 уклоњено
  1. 1
    8
      README.ftl.md
  2. 9
    5
      SIDEBAR.md

+ 1
- 8
README.ftl.md Прегледај датотеку

114
 
114
 
115
 ### <@build_an_executable_jar/>
115
 ### <@build_an_executable_jar/>
116
 
116
 
117
-
118
-Run the service
119
----------------
120
-
121
-Run your service with `java -jar` at the command line:
122
-
123
-    java -jar target/gs-rest-service-0.1.0.jar
117
+<@run_the_application module="service"/>
124
 
118
 
125
 Logging output is displayed. The service should be up and running within a few seconds.
119
 Logging output is displayed. The service should be up and running within a few seconds.
126
 
120
 
149
 To see what else you can do with Spring and RESTful web services, see [Related Resources](TODO).
143
 To see what else you can do with Spring and RESTful web services, see [Related Resources](TODO).
150
 
144
 
151
 
145
 
152
-[zip]: https://github.com/springframework-meta/gs-rest-service/archive/master.zip
153
 [u-rest]: /understanding/rest
146
 [u-rest]: /understanding/rest
154
 [u-json]: /understanding/json
147
 [u-json]: /understanding/json
155
 [u-jsp]: /understanding/jsp
148
 [u-jsp]: /understanding/jsp

+ 9
- 5
SIDEBAR.md Прегледај датотеку

4
 
4
 
5
 ### Getting Started Guides
5
 ### Getting Started Guides
6
 
6
 
7
-* Handling POST, PUT, and GET requests in REST services
8
-* Creating self-describing APIs with HATEOAS
9
-* Securing a REST service with OAuth
10
-* [Consuming RESTful web services][gs-consuming-rest]
11
-* Testing RESTful web services
7
+* [Consuming RESTful Web Services][gs-consuming-rest]
8
+* [Building a Hypermedia Driven REST Web Service][gs-rest-hateoas]
9
+* [Consuming RESTful Web Services on Android][gs-consuming-rest-android]
10
+* [Consuming XML From a RESTful Web Service on Android][gs-consuming-rest-xml-android]
11
+* [Building a RESTful Web Service with Bootstrap Actuator][gs-actuator-service]
12
 
12
 
13
 [gs-consuming-rest]: /guides/gs/consuming-rest/content
13
 [gs-consuming-rest]: /guides/gs/consuming-rest/content
14
+[gs-consuming-rest-android]: /guides/gs/consuming-rest-android/content
15
+[gs-rest-hateoas]: /guides/gs/rest-hateoas/content
16
+[gs-consuming-rest-xml-android]: /guides/gs/consuming-rest-xml-android/content
17
+[gs-actuator-service]: /guides/gs/actuator-service/content
14
 
18
 
15
 ### Tutorials
19
 ### Tutorials
16
 
20