wrapper, workflow, readme, csd, code changes

Author: AaronJhaj

.github/workflows/java.yaml

@@ -0,0 +1,60 @@
+name: Build
+
+on:
+  push:
+    branches: ["cicsts/v6.1"]
+  pull_request:
+    branches: ["cicsts/v6.1"]
+
+jobs:
+  check-copyright:
+    runs-on: ubuntu-latest
+    name: Check Copyright
+    steps:
+      - uses: actions/checkout@v4
+      - id: copyright-action
+        uses: cicsdev/.github/.github/actions/samples-copyright-checker@139edd8dc23af7f4f7dd9afe4d56a1053fe426a7
+        with:
+          directory: './cics-java-osgi-hello-app/'
+          file-extensions: '*.java'
+          base-copyright: 'Copyright IBM Corp. 2025'
+          token: ${{ secrets.GITHUB_TOKEN }}      
+
+  build-mvnw:
+    name: Build Maven Wrapper
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        jdk: [17, 21]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: "semeru"
+          cache: maven
+      - name: Build with Maven
+        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify      
+
+
+  build-gradlew:
+    name: Build Gradle Wrapper
+    
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        jdk: [17, 21]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK ${{ matrix.jdk }}
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ matrix.jdk }}
+        distribution: 'semeru'
+    - uses: gradle/actions/setup-gradle@v3
+      with: 
+        gradle-version: 8.6
+    - name: Build with Gradle
+      run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}    

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

README.md

@@ -35,7 +35,7 @@ Choose from the following approach:
 
 ### Option 1 - Building with Eclipse
 
-The sample comes pre-configured for use with a standard JDK 1.8 and the CICS TS V5.5 Java EE 7 Target Platform. When you initially import the project to your IDE, if your IDE is not configured for a JDK 1.8, or does not have CICS Explorer SDK installed with the correct 'target platform' set, you might experience local project compile errors. 
+The sample comes pre-configured for use with a standard JDK 17 and the CICS TS V6.1 Java EE 9 Target Platform. When you initially import the project to your IDE, if your IDE is not configured for a JDK 17, or does not have CICS Explorer SDK installed with the correct 'target platform' set, you might experience local project compile errors. 
 
 To resolve issues:
 * ensure you have the CICS Explorer SDK plug-in installed
@@ -112,7 +112,7 @@ A JAR file is created inside the `cics-java-osgi-hello-app/target` directory and
 ## Deploying to CICS
 1. Configure an OSGi JVMSERVER. 
 
-2. CICS resource definitions for the bundle, programs, transactions and a JVM server are supplied in a group CDEVCJOH 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-hello-bundle project.
+2. CICS resource definitions for the bundle, programs, transactions and a JVM server are supplied in a group CDEVCJOH 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-hello-bundle project. Note that the resource definition for the CICS program CDEVCJOH are not supplied as it will be auto-installed by the processing of @CICSProgram annotation.
 
 
 ### Option 1 - Deploying using CICS Explorer SDK and the provided CICS bundle project
@@ -167,7 +167,7 @@ A JAR file is created inside the `cics-java-osgi-hello-app/target` directory and
 
 
 ## Running
-Run the `CJOH` transaction. This runs the `CDEVCJOH` program.
+Run the `CJOH` transaction. This runs the auto-installed `CDEVCJOH` program.
 
 ## License
 This project is licensed under [Eclipse Public License - v 2.0](LICENSE).

cics-java-osgi-hello-app/src/main/java/com/ibm/cicsdev/java/osgi/hello/HelloCICSWorld.java

@@ -20,7 +20,7 @@ public class HelloCICSWorld
 	static final String PROGRAM_NAME = "CDEVCJOH";
 
 	@CICSProgram(PROGRAM_NAME)
-    public static void main(CommAreaHolder CAH)
+    public void run()
     {
         Task t = Task.getTask();
         if ( t == null )

etc/DFHCSD.txt

@@ -2,13 +2,7 @@ DELETE GROUP(CDEVCJOH)
 
 DEFINE JVMSERVER(DFHOSGI) GROUP(CDEVCJOH)
         DESCRIPTION(Example JVM server definition)
-        JVMPROFILE(DFHOSGI)
-        
-DEFINE PROGRAM(CDEVCJOH) GROUP(CDEVCJOH)
-        JVM(YES) JVMCLASS(com.ibm.cicsdev.java.osgi.hello.HelloCICSWorld)
-        JVMSERVER(DFHOSGI)
-        CONCURRENCY(REQUIRED)
-        EXECKEY(CICS)        
+        JVMPROFILE(DFHOSGI)        
 
 DEFINE TRANSACTION(CJOH) GROUP(CDEVCJOH)
         PROGRAM(CDEVCJOH) 

etc/eclipse_projects/com.ibm.cics.server.examples.osgi.hello.bundle/CDEVCJOH.program

@@ -5,5 +5,4 @@
     </meta_directives>
     <define name="cics-java-osgi-hello-app" type="http://www.ibm.com/xmlns/prod/cics/bundle/OSGIBUNDLE" path="cics-java-osgi-hello-app.osgibundle"/>
     <define name="CJOH" type="http://www.ibm.com/xmlns/prod/cics/bundle/TRANSACTION" path="CJOH.transaction"/>
-    <define name="CDEVCJOH" type="http://www.ibm.com/xmlns/prod/cics/bundle/PROGRAM" path="CDEVCJOH.program"/>
 </manifest>