Merge pull request #117 from javaee/jon_branch

jepatt · web-flow · commit 46e9526538d6 · 2017-09-13T08:51:52.000-04:00
Fixed chapter and table references in parts IV and V.
diff --git a/src/main/jbake/content/bean-validation002.adoc b/src/main/jbake/content/bean-validation002.adoc
@@ -320,7 +320,7 @@ application's web pages.
 
 For more information on using validation constraints, see the following:
 
-* link:bean-validation-advanced.html#GKAHP[Chapter 23, "Bean Validation:
+* link:bean-validation-advanced.html#GKAHP[Chapter 24, "Bean Validation:
 Advanced Topics"]
 * link:jaxrs-advanced002.html#BABCJEDF[Validating Resource Data with Bean
 Validation]
diff --git a/src/main/jbake/content/cdi-adv-examples001.adoc b/src/main/jbake/content/cdi-adv-examples001.adoc
@@ -13,7 +13,7 @@ prev=cdi-adv-examples.html
 Building and Running the CDI Advanced Examples
 ----------------------------------------------
 
-The examples are in the `_tut-install_` `/examples/cdi/` directory. To build
+The examples are in the `_tut-install_/examples/cdi/` directory. To build
 and run the examples, you will do the following.
 
 1.  Use NetBeans IDE or the Maven tool to compile, package, and deploy
diff --git a/src/main/jbake/content/cdi-adv-examples002.adoc b/src/main/jbake/content/cdi-adv-examples002.adoc
@@ -20,7 +20,7 @@ example includes an interface and two implementations of it, a managed
 bean, a Facelets page, and configuration files.
 
 The source files are located in the
-`_tut-install_` `/examples/cdi/encoder/src/main/java/javaeetutorial/encoder/`
+`_tut-install_/examples/cdi/encoder/src/main/java/javaeetutorial/encoder/`
 directory.
 
 The following topics are addressed here:
diff --git a/src/main/jbake/content/cdi-adv-examples004.adoc b/src/main/jbake/content/cdi-adv-examples004.adoc
@@ -25,7 +25,7 @@ It also contains a single entity, a stateful session bean, a Facelets
 page, and a managed bean.
 
 The source files are located in the
-`_tut-install_` `/examples/cdi/producerfields/src/main/java/javaeetutorial/producerfields/`
+`_tut-install_/examples/cdi/producerfields/src/main/java/javaeetutorial/producerfields/`
 directory.
 
 The following topics are addressed here:
diff --git a/src/main/jbake/content/cdi-adv-examples005.adoc b/src/main/jbake/content/cdi-adv-examples005.adoc
@@ -4,8 +4,8 @@ title=The billpayment Example: Using Events and Interceptors
 next=cdi-adv-examples006.html
 prev=cdi-adv-examples004.html
 ~~~~~~
-The billpayment Example: Using Events and Interceptors
-======================================================
+= The billpayment Example: Using Events and Interceptors
+
 
 [[GKHPA]]
 
@@ -16,7 +16,7 @@ The billpayment Example: Using Events and Interceptors
 The `billpayment` example shows how to use both events and interceptors.
 
 The source files are located in the
-tut-install`/examples/cdi/billpayment/src/main/java/javaeetutorial/billpayment/`
+`_tut-install_/examples/cdi/billpayment/src/main/java/javaeetutorial/billpayment/`
 directory.
 
 The following topics are addressed here:
@@ -106,7 +106,7 @@ public class PaymentHandler implements Serializable {
     public void debitPayment(@Observes @Debit PaymentEvent event) {
         logger.log(Level.INFO, "PaymentHandler - Debit Handler: {0}",
                 event.toString());
- 
+
         // call a specific Debit handler class...
     }
 }
@@ -137,7 +137,7 @@ this:
 ----
     <h:body>
         <h3>Bill Payment Options</h3>
-        <p>Enter an amount, select Debit Card or Credit Card, 
+        <p>Enter an amount, select Debit Card or Credit Card,
             then click Pay.</p>
         <h:form>
             <p>
@@ -156,7 +156,7 @@ this:
             </h:selectOneRadio>
             <p><h:commandButton id="submit" value="Pay"
                                 action="#{paymentBean.pay}" /></p>
-            <p><h:commandButton value="Reset" 
+            <p><h:commandButton value="Reset"
                                 action="#{paymentBean.reset}" /></p>
         </h:form>
         ...
@@ -199,7 +199,7 @@ Facelets page and will pass on to the event:
     public static final int DEBIT = 1;
     public static final int CREDIT = 2;
     private int paymentOption = DEBIT;
-    
+
     @Digits(integer = 10, fraction = 2, message = "Invalid value")
     private BigDecimal value;
 
@@ -466,5 +466,3 @@ INFO: PaymentHandler created.
 INFO: Entering method: debitPayment in class billpayment.listener.PaymentHandler
 INFO: PaymentHandler - Debit Handler: Debit = $1234.56 at Tue Dec 14 14:50:28 EST 2010
 ----
-
-
diff --git a/src/main/jbake/content/cdi-adv-examples006.adoc b/src/main/jbake/content/cdi-adv-examples006.adoc
@@ -18,7 +18,7 @@ The `decorators` example, which is yet another variation on the
 business logic for a bean.
 
 The source files are located in the
-tut-install`/examples/cdi/decorators/src/main/java/javaeetutorial/decorators/`
+`_tut-install_/examples/cdi/decorators/src/main/java/javaeetutorial/decorators/`
 directory.
 
 The following topics are addressed here:
@@ -72,7 +72,7 @@ public abstract class CoderDecorator implements Coder {
     public String codeString(String s, int tval) {
         int len = s.length();
 
-        return "\"" + s + "\" becomes " + "\"" + coder.codeString(s, tval) 
+        return "\"" + s + "\" becomes " + "\"" + coder.codeString(s, tval)
                 + "\", " + len + " characters in length";
     }
 }
@@ -204,5 +204,3 @@ The output from the interceptors appears:
 INFO: Entering method: encodeString in class javaeetutorial.decorators.CoderBean
 INFO: Entering method: codeString in class javaeetutorial.decorators.CoderImpl
 ----
-
-
diff --git a/src/main/jbake/content/cdi-adv003.adoc b/src/main/jbake/content/cdi-adv003.adoc
@@ -91,7 +91,7 @@ Using Producer Fields to Generate Resources
 
 A common use of a producer field is to generate an object such as a JDBC
 `DataSource` or a Java Persistence API `EntityManager` (see
-link:persistence-intro.html#BNBPZ[Chapter 38, "Introduction to the Java
+link:persistence-intro.html#BNBPZ[Chapter 40, "Introduction to the Java
 Persistence API,"] for more information). The object can then be managed
 by the container. For example, you could create a `@UserDatabase`
 qualifier and then declare a producer field for an entity manager as
diff --git a/src/main/jbake/content/cdi-basic001.adoc b/src/main/jbake/content/cdi-basic001.adoc
@@ -107,7 +107,7 @@ link:cdi-basic003.html#GJEBJ[About Beans]. A JAR or WAR file that
 contains a CDI bean is a bean archive. For more information on packaging
 bean archives, see link:cdi-basic013.html#GJBNZ[Configuring a CDI
 Application] in this chapter and link:cdi-adv001.html#CACDCFDE[Packaging
-CDI Applications] in link:cdi-adv.html#GJEHI[Chapter 26, "Contexts and
+CDI Applications] in link:cdi-adv.html#GJEHI[Chapter 27, "Contexts and
 Dependency Injection for Java EE: Advanced Topics"].
 
 In this example, `MessageB` is the only class that implements the
@@ -116,5 +116,5 @@ of an interface, CDI provides mechanisms that you can use to select
 which implementation to inject. For more information, see
 link:cdi-basic006.html#GJBCK[Using Qualifiers] in this chapter and
 link:cdi-adv002.html#GJSDF[Using Alternatives in CDI Applications] in
-link:cdi-adv.html#GJEHI[Chapter 26, "Contexts and Dependency Injection
+link:cdi-adv.html#GJEHI[Chapter 27, "Contexts and Dependency Injection
 for Java EE: Advanced Topics"].
