Merge pull request #21 from cicsdev/aj-6.1-changes

6.1 csd input and readme changes

Author: PhilWakelin

README.md

@@ -1,5 +1,4 @@
 # Sample: cics-java-osgi-jdbc
-[![Build](https://github.com/cicsdev/cics-java-osgi-jdbc/actions/workflows/java.yaml/badge.svg?branch=cicsts/v6.1)](https://github.com/cicsdev/cics-java-osgi-jdbc/actions/workflows/java.yaml)
 
 This sample demonstrates how to code, build, and deploy a CICS Java OSGi application that makes JDBC calls to Db2. It makes use of the employee sample table supplied with Db2 for z/OS, and allows you to display employee information from the table EMP.
 
@@ -127,7 +126,6 @@ DB2CONN=YES
 ...
 //         DD DISP=SHR,DSN=SYS2.DB2.&DB2..SDSNLOAD
 //         DD DISP=SHR,DSN=SYS2.DB2.&DB2..SDSNLOD2
-//         DD DISP=SHR,DSN=DSN&DB2.P2.RUNLIB.LOAD
 ```
 
 ### Configure the JVM Profile
@@ -154,7 +152,7 @@ Ensure a CICS DB2CONN is installed and connected.
 CEDA DEFINE DB2CONN(JODBCONN) GROUP(CDEVJODB)
 ```
 ```
-CEDA INSTALL DB2CONN(CDEVJODB) GROUP(CDEVJODB)
+CEDA INSTALL DB2CONN(JODBCONN) GROUP(CDEVJODB)
 ```
 
 ### Option 2 - Configure the DB2CONN with CICS Explorer
@@ -169,6 +167,9 @@ CEDA INSTALL DB2CONN(CDEVJODB) GROUP(CDEVJODB)
 ---
 
 ## Deploying to CICS
+CICS resource definitions for the bundle, programs, transactions and a JVM server are supplied in a group CDEVJODB as a DFHCSDUP sample input stream supplied in [`DFHCSD.txt`](etc/DFHCSD.txt). Alternatively they can be installed using the bundle parts supplied with the cics-java-osgi-jdbc-bundle project.
+Note that the resource definitions for the CICS program `CDEVJODB` will be auto-installed by the processing of @CICSProgram annotation.
+
 ### Option 1 - Deploying using CICS Explorer SDK and the provided CICS bundle project
 1. Deploy the CICS bundle project 'com.ibm.cics.server.examples.osgi.jdbc.bundle' from CICS Explorer using the **Export Bundle Project to z/OS UNIX File System** wizard. This CICS bundle includes the osgi bundlepart and the JODB transaction to run the sample.
 
@@ -246,7 +247,7 @@ JODB
 The actual contents will be based on the values in the `EMP` table in the database.
 
 ## License
-This project is licensed under [Apache License Version 2.0](LICENSE).
+This project is licensed under [Eclipse Public License - v 2.0](LICENSE).
 
 ## Usage terms
 By downloading, installing, and/or using this sample, you acknowledge that separate license terms may apply to any dependencies that might be required as part of the installation and/or execution and/or automated build of the sample, including the following IBM license terms for relevant IBM components:

etc/DFHCSD.txt

@@ -0,0 +1,15 @@
+DELETE GROUP(CDEVJODB)
+
+DEFINE JVMSERVER(DFHOSGI) GROUP(CDEVJODB)
+        DESCRIPTION(Example JVM server definition)
+        JVMPROFILE(DFHOSGI)
+
+DEFINE DB2CONN(JODBCONN) GROUP(CDEVJODB)
+        DB2ID(DBID)
+
+DEFINE TRANSACTION(JODB) GROUP(CDEVJODB)
+        PROGRAM(CDEVJODB)
+
+DEFINE BUNDLE(CDEVJODB) GROUP(CDEVJODB)
+        DESCRIPTION(CICS OSGi Java JDBC samples)
+        BUNDLEDIR(/u/cics/cics-java-osgi-jdbc-bundle-1.0.0)