Merge pull request #13 from cicsdev/branch2

Readme paths and other minor changes

Author: SoftlySplinter

README.md

@@ -6,23 +6,23 @@ Sample RESTful web application for deployment to a Liberty JVM server in CICS. T
 1. `InfoResource` - This queries the JVM server environment using system properties and uses JAXB beans to return a JSON response detailing the CICS environment.
 1. `ReverseResource` - This is similar to `InfoResource`, but uses the JCICS API to link to the COBOL program `EDUCHAN` using channels and containers. An input string is passed to `EDUCHAN`, which is then reversed and returned, along with the time from CICS. 
 
-The following Java source components are supplied in the [`src/Java`](src/Java) directory in this repository.
+The following Java source components are supplied in the [`src/main/java`](src/main/java) directory in this repository.
 
 ## Java package com.ibm.cicsdev.restapp
-* [`CICSApplication`](src/Java/com/ibm/cicsdev/restapp/CICSApplication.java) - Sets the `ApplicationPath` for resources in this application
-* [`InfoResource`](src/Java/com/ibm/cicsdev/restapp/InfoResource.java) - Returns JSON structure using `CICSInformation` bean
-* [`ReverseResource`](src/Java/com/ibm/cicsdev/restapp/ReverseResource.java) - Returns JSON structure using `ReverseResult` bean
+* [`CICSApplication`](src/main/java/com/ibm/cicsdev/restapp/CICSApplication.java) - Sets the `ApplicationPath` for resources in this application
+* [`InfoResource`](src/main/java/com/ibm/cicsdev/restapp/InfoResource.java) - Returns JSON structure using `CICSInformation` bean
+* [`ReverseResource`](src/main/java/com/ibm/cicsdev/restapp/ReverseResource.java) - Returns JSON structure using `ReverseResult` bean
 
 
 ## Java package com.ibm.cicsdev.restapp.bean
-* [`CICSEnvironment`](src/Java/com/ibm/cicsdev/restapp/bean/CICSEnvironment.java) - JAXB bean returning JSON structure containing information about CICS product and version
-* [`CICSInformation`](src/Java/com/ibm/cicsdev/restapp/bean/CICSInformation.java) - JAXB bean returning JSON structure containing CICS applid, time and JVM server name and instance of `CICSEnvironment`
-* [`ReverseResult`](src/Java/com/ibm/cicsdev/restapp/bean/ReverseResult.java) - JAXB bean returning JSON structure containg input and output containers sent to `EDUCHAN` COBOL program
+* [`CICSEnvironment`](src/main/java/com/ibm/cicsdev/restapp/bean/CICSEnvironment.java) - JAXB bean returning JSON structure containing information about CICS product and version
+* [`CICSInformation`](src/main/java/com/ibm/cicsdev/restapp/bean/CICSInformation.java) - JAXB bean returning JSON structure containing CICS applid, time and JVM server name and instance of `CICSEnvironment`
+* [`ReverseResult`](src/main/java/com/ibm/cicsdev/restapp/bean/ReverseResult.java) - JAXB bean returning JSON structure containg input and output containers sent to `EDUCHAN` COBOL program
 
 
 ## Supporting files
 * [`DFHCSD.txt`](etc/DFHCSD.txt) - Output from a DFHCSDUP EXTRACT for the CICS BUNDLE resource definition.
-* [`EDUCHAN.cbl`](src/Cobol/EDUCHAN.cbl) - A sample CICS COBOL that returns the date and time and reversed input using channels and containers
+* [`EDUCHAN.cbl`](src/cobol/EDUCHAN.cbl) - A sample CICS COBOL that returns the date and time and reversed input using channels and containers
 * [`build.gradle`](build.gradle) - A sample Gradle build file to enable an automated build of the deployable WAR
 * [`pom.xml`](pom.xml) - A sample Maven build file to enable an automated build of the deployable WAR
 

build.gradle

@@ -12,14 +12,6 @@ archivesBaseName='cics-java-liberty-restapp'
 version = '0.1.0'
 sourceCompatibility = '1.8'
 
-apply plugin: 'war'
-
-
-war {    
-    //set archive name for consistency 
-    archiveFileName='cics-java-liberty-restapp.war'
-}
-
 // If in Eclipse, add Javadoc to the local project classpath
 eclipse 
 {
@@ -52,13 +44,13 @@ dependencies
     cicsBundlePart files(war)
 
     //JAXB required if compiling with Java 11 or later
-    //compileOnly ("javax.xml.bind:jaxb-api:2.3.1")
+    compileOnly ("javax.xml.bind:jaxb-api:2.3.1")
 }
 
 
 // CICS bundle build, CICS bundle build, specify defaultJVMServer value to match CICS JVMSERVER name
 cicsBundle {
     build {
-        defaultJVMServer = jvmserver
+         defaultJVMServer = project.findProperty("jvmserver") ?: "DFHWLP"
     }
 }

gradle.properties

@@ -17,14 +17,13 @@
 
 	<build>
 		<plugins>
-			<!-- WAR plugin build, set war archive name for consistency -->
+			<!-- WAR plugin build-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<version>3.4.0</version>
 				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>					
-					<warName>cics-java-liberty-restapp</warName>
+					<failOnMissingWebXml>false</failOnMissingWebXml>										
 				</configuration>
 			</plugin>
 
@@ -85,13 +84,13 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!--JAXB required if compiling with Java 11 or later 	
+		<!--JAXB required if compiling with Java 11 or later -->
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
 			<version>2.3.1</version>
 			<scope>provided</scope> 	    
-		</dependency> -->
+		</dependency> 
 
 
 	</dependencies>

pom.xml

@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-ext_1_0.xsd"
 	version="1.0">
 
-	<context-root uri="cics-java-liberty-restapp" />
+	<context-root uri="com.ibm.cicsdev.restapp" />
 	<enable-directory-browsing value="false"/>
 	<enable-serving-servlets-by-class-name value="false" />