From 5e2294b76790647b9c6698194e677d1274915370 Mon Sep 17 00:00:00 2001 From: Mihai Soloi Date: Tue, 18 Nov 2014 14:11:02 +0200 Subject: [PATCH 1/2] added ui:composition element to the doc, this is generated fine with Netbeans but it's missing with other IDEs --- docs/chapters/websocket.adoc | 56 +++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/docs/chapters/websocket.adoc b/docs/chapters/websocket.adoc index 9ad70fd..12f1b02 100644 --- a/docs/chapters/websocket.adoc +++ b/docs/chapters/websocket.adoc @@ -105,33 +105,35 @@ In this file, remove sections where name attribute value is Replace `` section with `content' name such that it looks like: + [source,xml] - -
- - - - - - - - -
- Chat Log
- - 		- Users
- -
- - -

- -

-
-
- - + + +
+ + + + + + + + +
+ Chat Log
+ + 		+ Users
+ +
+ + +

+ +

+
+
+ + + + The code builds an HTML form that has two textareas – one to display the chat log and the other to display the list of users currently logged. A From f6f039f9b31f997de888fe1376c836682d024f83 Mon Sep 17 00:00:00 2001 From: Mihai Soloi Date: Wed, 19 Nov 2014 11:18:48 +0200 Subject: [PATCH 2/2] updated the other adoc files to include the composition tag pointing to the template.xhtml file --- docs/chapters/batch.adoc | 54 +++++++++-------- docs/chapters/jaxrs.adoc | 22 +++---- docs/chapters/jms.adoc | 38 ++++++------ docs/chapters/jsf.adoc | 126 +++++++++++++++++++++------------------ docs/chapters/json.adoc | 48 ++++++++------- 5 files changed, 152 insertions(+), 136 deletions(-) diff --git a/docs/chapters/batch.adoc b/docs/chapters/batch.adoc index 17a4215..baa7a2d 100644 --- a/docs/chapters/batch.adoc +++ b/docs/chapters/batch.adoc @@ -346,32 +346,34 @@ Replace `` section with `content' name such that it looks like: + [source, xml] ---- - -

Movie Sales

- - - - - - - #{s.id} - - - - - - #{s.amount} - - - - - - + + +

Movie Sales

+ + + + + + + #{s.id} + + + + + + #{s.amount} + + + + + + + ---- + This code displays the show identifier and sales from that show in a diff --git a/docs/chapters/jaxrs.adoc b/docs/chapters/jaxrs.adoc index d1d30c5..d4e41f2 100644 --- a/docs/chapters/jaxrs.adoc +++ b/docs/chapters/jaxrs.adoc @@ -118,16 +118,18 @@ Replace `` section with `content' name such that it looks like: + [source, xml] ---- - - - - - - - - - - + + + + + + + + + + + + ---- + This code fragment invokes `getMovies` method from `MovieClientBean`, diff --git a/docs/chapters/jms.adoc b/docs/chapters/jms.adoc index 48adb6b..cf6bf89 100644 --- a/docs/chapters/jms.adoc +++ b/docs/chapters/jms.adoc @@ -222,24 +222,26 @@ Replace the `` section with `content' name such that it looks like: + [source, xml] ---- - -

Points

- - Queue size: -

- - - - - - - + + +

Points

+ + Queue size: +

+ + + + + + + + ---- + Click on the yellow bulb to resolve namespace prefix/URI mapping for `h:` diff --git a/docs/chapters/jsf.adoc b/docs/chapters/jsf.adoc index 47ef3bb..6fea6c4 100644 --- a/docs/chapters/jsf.adoc +++ b/docs/chapters/jsf.adoc @@ -51,22 +51,24 @@ Replace `` section with `content' name such that it looks like: + [source, xml] ---- - -

Pick a movie

- - - - - - - + + +

Pick a movie

+ + + + + + + + ---- + The code builds an HTML form that displays the list of movies as radio @@ -139,18 +141,20 @@ Replace `` section with `content' name such that it looks like: + [source, xml] ---- - -

Show Timings for #{booking.movieName}

- - - - - - - - - - + + +

Show Timings for #{booking.movieName}

+ + + + + + + + + + + ---- + This code builds an HTML form that displays the chosen movie name and @@ -246,28 +250,30 @@ Replace `' section with `content' name such that it looks like: + [source, xml] ---- - - - -

No theater found, choose a different time

- - Movie name: #{booking.movieName}

- Starts at: #{booking.startTime}

- - - - -

Confirm ?

- - Movie name: #{booking.movieName}

- Starts at: #{booking.startTime}

- Theater: #{booking.theater}

- - - - - - + + + + +

No theater found, choose a different time

+ + Movie name: #{booking.movieName}

+ Starts at: #{booking.startTime}

+ + + + +

Confirm ?

+ + Movie name: #{booking.movieName}

+ Starts at: #{booking.startTime}

+ Theater: #{booking.theater}

+ + + + + + + ---- + The code displays the selected movie, show timing, and theater if @@ -292,15 +298,17 @@ Replace `` section with `content' name such that it looks like: + [source, xml] ---- - -

Reservation Confirmed

- - Movie name: #{booking.movieName}

- Starts at: #{booking.startTime}

- Theater: #{booking.theater}

-

- - + + +

Reservation Confirmed

+ + Movie name: #{booking.movieName}

+ Starts at: #{booking.startTime}

+ Theater: #{booking.theater}

+

+ + + ---- + This code displays the movie name, show timings, and the selected diff --git a/docs/chapters/json.adoc b/docs/chapters/json.adoc index 349b5f8..4140903 100644 --- a/docs/chapters/json.adoc +++ b/docs/chapters/json.adoc @@ -199,29 +199,31 @@ Replace `` section with `content' name such that it looks like: + [source, xml] ---- - -

Add a New Movie

- - - - - - - - - - - - - - -
Movie Id:
Movie Name:
Movie Actors:
- - - + + +

Add a New Movie

+ + + + + + + + + + + + + + +
Movie Id:
Movie Name:
Movie Actors:
+ + + + ---- + This code creates a form to accept input of `id`, `name`, and `actors` of a