splitted the steps in sub steps

Author: dixyushi

devon4j-http-rest-client/files/server_application.txt

@@ -4,8 +4,8 @@
 # want to touch the WAR file.
 
 server.port=8080
-spring.application.name=httprestserver
 server.servlet.context-path=/httprestserver
+spring.application.name=httprestserver
 
 security.expose.error.details=false
 

devon4j-http-rest-client/files/startServer.md

@@ -0,0 +1,12 @@
+* Once, application builds successfully. Open new terminal by clicking "+" and wait for it to load.
+* Now, Copy and execute below command to navigate into client server.
+  `cd devonfw/workspaces/main/httprestclient/server`{{execute T1}}
+* Now, Copy and execute below command to start the application.
+  `devon mvn spring-boot:run`{{execute T1}}
+To test Synchronous method, follow below steps.
+* Click on "+" next to terminal tab
+* Select "select port to view host"
+* Enter the port number "8081" 
+* In the url, append "/httprestclient/services/rest/devon4jrestclient/response/"
+* Enter username as "admin" and password as "admin"
+* You will be able to see response "Welcome to rest api"

devon4j-http-rest-client/index.asciidoc

@@ -35,25 +35,57 @@ For more details on devon4j Service Client https://devonfw.com/website/pages/doc
 
 ## Create the devon4j REST SERVER
 As explained in REST document, With JAX-RS it is important to make sure that each service method is annotated with the proper HTTP annotation(@GET, @POST, etc).
-Let's create devon4j server. You have to modify BaseWebSecurityConfig file to allow application for basic authentication.
-In below example you will create VisitormanagementRestService and it's implementation i.e. VisitormanagementRestServiceImpl using JAX-RS standard.
+Let's create devon4j server.
 [step]
 == REST
 --
 createDevon4jProject("com.example.application.httprestserver")
+--
+In next step, you will add configuration to allow basic authentication.
+====
+
+
+Now, You have to modify BaseWebSecurityConfig file to allow application for basic authentication.
+[step]
+== Add configuration to allow basic authentication
+--
 changeFile("httprestserver/core/src/main/java/com/example/application/httprestserver/general/service/impl/config/BaseWebSecurityConfig.java", { "file": "files/BaseWebSecurityConfig.txt" })
+--
+
+
+Now, you will create VisitormanagementRestService to provide functionality using JAX-RS standard.
+[step]
+== Create service for REST server
+--
 createFile("httprestserver/api/src/main/java/com/example/application/httprestserver/visitormanagement/service/api/rest/VisitormanagementRestService.java", "files/VisitormanagementRestService.java")
+--
+
+
+====
+Now, you will create VisitormanagementRestServiceImpl, the implementation class of VisitormanagementRestService using JAX-RS standard.
+[step]
+== Create implementation class for Service
+--
 createFile("httprestserver/core/src/main/java/com/example/application/httprestserver/visitormanagement/service/impl/rest/VisitormanagementRestServiceImpl.java", "files/VisitormanagementRestServiceImpl.java")
-changeFile("httprestserver/core/src/main/resources/application.properties", { "file": "files/server_application.txt" })
-changeFile("httprestserver/core/src/main/resources/config/application.properties", { "file": "files/server_config_application.txt" })
 --
 Here , you can see "VisitormanagementRestServiceImpl.java" is annotated with @Named to make it a spring-bean. To get return response to client "returnResponseToClient()" can be accessed via HTTP GET under the URL path "/visitormanagement/v1/clientrequest". It will return its result (String) as JSON (see @Produces in VisitormanagementRestService).
 ====
 
 
+Now, you will configure port in application properties.
+[step]
+== Modify properties files
+--
+changeFile("httprestserver/core/src/main/resources/application.properties", { "file": "files/server_application.txt" })
+changeFile("httprestserver/core/src/main/resources/config/application.properties", { "file": "files/server_config_application.txt" })
+--
+
+
+
 ====
 You have successfully built the REST-server. Now, you have to start the build and then, start the server as mentioned below.
 [step]
+== Build and Start devon4j REST Server
 --
 buildJava("httprestserver", false)
 runServerJava("httprestserver/server", { "startupTime": 1000, "port": 8080, "path": "httprestserver" })
@@ -91,21 +123,36 @@ Since in this tutorial you will build client on Synchronous call so, you have to
 Note: With devon4j we have already added the required dependency in pom.xml
 ====
 
-====
-You have to create a Java interface VisitormanagementRestService to invoke.
-You have to create rest client i.e. Devon4jRestClient.java and it's implementation class i.e. Devon4jRestClientImpl.java.
+
+Now, You will create a Java interface VisitormanagementRestService to invoke inside client.
 [step]
+== Create service to invoke
 --
 createFile("httprestclient/api/src/main/java/com/sample/application/httprestclient/general/service/api/rest/VisitormanagementRestService.java", "files/VisitorManagementRestServiceClient.txt")
+--
+
+
+Now, you will create service for client i.e. Devon4jRestClient.java to provide functionality using JAX-RS standard.
+[step]
+== Create service for CXF REST Client
+--
 createFile("httprestclient/api/src/main/java/com/sample/application/httprestclient/general/service/api/rest/Devon4jRestClient.java", "files/Devon4jRestClient.java")
+--
+
+
+====
+Now, you will create Devon4jRestClientImpl, the implementation class of Devon4jRestClient using JAX-RS standard.
+
+[step]
+== Create implementation class for service
+--
 createFile("httprestclient/core/src/main/java/com/sample/application/httprestclient/general/service/impl/rest/Devon4jRestClientImpl.java", "files/Devon4jRestClientImpl.java")
 --
 
 As you can see synchronous invocation of a service is very simple and type-safe. The actual call of showResponse will technically call the remote service(i.e. VisitormanagementRestService) over the wire ( via HTTP) including marshaling the arguments (converting String to JSON) and un-marshalling the result (e.g. converting the received JSON to String).
 Here in Devon4jRestClientImpl, there is a method "callSynchronous" which will call the VisitormanagementRestService and return the object of VisitormanagementRestService to visitormanagementRestService.
 With visitormanagementRestService, it is calling the method "returnResponseToClient(String)" of server.
 The response from server will be stored in "resultFromAPICall" as the return type of result is String.
-
 After getting response, you can handle the response further in your implementation. Here, you can see that response is getting handled in "showResponse" method.
 ====
 
@@ -114,59 +161,45 @@ After getting response, you can handle the response further in your implementati
 An application needs to be configurable in order to allow internal setup but also to allow externalized configuration of a deployed package (e.g. integration into runtime environment). 
 Now, You need to modify the content of existing properties files and add configuration for Server.
 [step]
+== Modify properties for server configuration
 --
 changeFile("httprestclient/core/src/main/resources/application.properties", { "file": "files/client_application.txt" })
 changeFile("httprestclient/core/src/main/resources/config/application.properties", { "file": "files/client_config_application.txt" })
 --
-
 ## Service Discovery
 **service.client.default.url** :- It is used to set the default url of server and it is added for service discovery.
+
 **service.client.app.httprestserver.url** :- This property provide base url of REST in your application. It follows format such as "service.client.app.«application».url". Here, «application» refers to the technical name of the application providing the service.
 
 ## Timeouts
 **service.client.default.timeout.connection** :- It is used to set the default timeout for particular connection.
+
 **service.client.default.timeout.response** :- It is used to set the default timeout for particular response.
 
 ## Headers
 **service.client.app.httprestserver.auth** :- It is used for customization of Service Header. Here it is used for basic authentication.
 
 ## Authentication
-**service.client.app.httprestserver.user.login** :- It is used to set username of server for authentication
+**service.client.app.httprestserver.user.login** :- It is used to set username of server for authentication.
+
 **service.client.app.httprestserver.user.password** :- It is used to set password.
-Now, after configuration you have to build and then start the client application.
 ====
 
-====
-You have successfully built the devon4j rest client.
-Let's build and start the service client application.
+
+Now, Let's build and start the service client application.
 This might take some time for application to start.
 [step]
-== Build and Start devon4j REST Client
+== Build devon4j CXF REST Client
 --
 buildJava("httprestclient", false)
 --
 
-* Once, application builds successfully. Open new terminal by clicking "+" and wait for it to load.
-* Now, Copy and execute below command to navigate into client server.
-`cd devonfw/workspaces/main/httprestclient/server`
-====
-
-====
-Now, Execute below command to start the application.
 
 [step]
 --
-runServerJava("httprestclient/server", { "startupTime": 1000, "port": 8081, "path": "httprestclient" })
+nextKatacodaStep("Start the CXF CLient Server", [{ "file": "files/startServer.md" }])
 --
 
-To test Synchronous method, follow below steps.
-* Click on "+" next to terminal tab
-* Select "select port to view host"
-* Enter the port number "8081" 
-* In the url, append "/httprestclient/services/rest/devon4jrestclient/response/"
-* Enter username as "admin" and password as "admin"
-* You will be able to see response "Welcome to rest api"
-====
 
 ====
 You have successfully created devon4j CXF REST Client.