cicsdev · AaronJhaj · May 9, 2025 · Apr 9, 2025 · Apr 10, 2025 · May 7, 2025
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -10,29 +10,17 @@ on:
 
 jobs:
   check-copyright:
-    name: Check Copyright
     runs-on: ubuntu-latest
+    name: Check Copyright
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Check Copyright
-        env:
-          EXTENSIONS: "*.java"
-          COPYRIGHT_STATEMENT: "/**\n * Copyright IBM Corp. 2025\n */"
-        run: |
-          for ext in $EXTENSIONS; do
-            for file in $(find . -type f -name "$ext" ! -path "cics-java-osgi-jdbc-app/*"); do
-              if ! grep -q "Copyright" "$file"; then
-                echo -e "$COPYRIGHT_STATEMENT\n$(cat "$file")" > "$file"
-              fi
-            done
-          done
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+      - uses: actions/checkout@v4
+      - id: copyright-action
+        uses: cicsdev/.github/.github/actions/samples-copyright-checker@139edd8dc23af7f4f7dd9afe4d56a1053fe426a7
         with:
+          directory: './cics-java-osgi-jdbc-app/'
+          file-extensions: '*.java'
+          base-copyright: 'Copyright IBM Corp. 2025'
           token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ github.head_ref }}
 
   build-mvnw:
     name: Build Maven Wrapper

diff --git a/.gitignore b/.gitignore
@@ -13,15 +13,15 @@ buildNumber.properties
 
 # Eclipse m2e generated files
 # Eclipse Core
-.project
+#.project
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
+#.classpath
 
 # Eclipse Gradle plugin generated files
 # Eclipse Core
-.project
+#.project
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
+#.classpath
 
 
 # Java ignores

diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cics-java-osgi-link</name>
+	<name>cics-java-osgi-jdbc</name>
 	<projects>
 	</projects>
 	<buildSpec>

diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=cics-java-osgi-jdbc-app
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/README.md b/README.md
diff --git a/cics-java-osgi-jdbc-app/.classpath b/cics-java-osgi-jdbc-app/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path=".apt_generated">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin/"/>
+</classpath>
diff --git a/cics-java-osgi-jdbc-app/.project b/cics-java-osgi-jdbc-app/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-osgi-jdbc-app</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
@@ -19,10 +20,21 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/cics-java-osgi-jdbc-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
diff --git a/cics-java-osgi-jdbc-app/.settings/org.eclipse.core.resources.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.apt.core.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=false
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests
+org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,15 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...p/src/main/resources/META-INF/MANIFEST.MF → cics-java-osgi-jdbc-app/META-INF/MANIFEST.MF b/...p/src/main/resources/META-INF/MANIFEST.MF → cics-java-osgi-jdbc-app/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: CICS OSGi JDBC application - Application
 Bundle-SymbolicName: com.ibm.cicsdev.java.osgi.jdbc
 Bundle-Version: 1.0.0
 Import-Package: com.ibm.cicsdev.java.osgi.jdbc;version="1.0.0",
- com.ibm.cics.server;version="[1.700.0,2.0.0)"
+ com.ibm.cics.server;version="[1.700.0,2.0.0)",com.ibm.db2.jcc;resolution:=optional
 Export-Package: com.ibm.cicsdev.java.osgi.jdbc;version="1.0.0"
-CICS-MainClass: com.ibm.cicsdev.java.osgi.jdbc.JDBCQueryProgram
+CICS-MainClass: com.ibm.cicsdev.java.osgi.jdbc.JDBCQueryProgram
diff --git a/cics-java-osgi-jdbc-app/build.gradle b/cics-java-osgi-jdbc-app/build.gradle
@@ -1,5 +1,22 @@
 plugins {
     id 'java'
+    id 'eclipse'
+}
+
+java
+{
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+
+// If in Eclipse, add Javadoc to the local project classpath
+eclipse 
+{
+    classpath 
+    {
+        downloadJavadoc = true
+    }
 }
 
 dependencies {
@@ -11,6 +28,6 @@ description = 'CICS OSGi JDBC application - OSGi bundle'
 
 jar {
     manifest {
-        from "src/main/resources/META-INF/MANIFEST.MF"
+        from "META-INF/MANIFEST.MF"
     }
 }
diff --git a/cics-java-osgi-jdbc-app/build.properties b/cics-java-osgi-jdbc-app/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+               .
+source.. = src/main/java/
+jre.compilation.profile = JavaSE-1.8
+output.. = bin/
diff --git a/cics-java-osgi-jdbc-app/pom.xml b/cics-java-osgi-jdbc-app/pom.xml
@@ -29,7 +29,7 @@
                 <version>3.3.0</version>
                 <configuration>
                     <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>

diff --git a/cics-java-osgi-jdbc-bundle/.settings/org.eclipse.buildship.core.prefs b/cics-java-osgi-jdbc-bundle/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=../cics-java-osgi-jdbc-app
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
diff --git a/cics-java-osgi-jdbc-bundle/.settings/org.eclipse.ltk.core.refactoring.prefs b/cics-java-osgi-jdbc-bundle/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/cics-java-osgi-jdbc-bundle/src/main/bundleParts/CDEVJODB.program b/cics-java-osgi-jdbc-bundle/src/main/bundleParts/CDEVJODB.program
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <cicsdefinitionprogram name="CDEVJODB" 
-    jvm="yes" jvmserver="DFHOSGI" 
+    jvm="YES" jvmserver="DFHOSGI" 
     jvmclass="com.ibm.cicsdev.java.osgi.jdbc.JDBCQueryProgram" />
diff --git a/cics-java-osgi-jdbc-bundle/src/main/bundleParts/JODB.transaction b/cics-java-osgi-jdbc-bundle/src/main/bundleParts/JODB.transaction
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cicsdefinitiontransaction name="JODB" program="CDEVCPCL"
+<cicsdefinitiontransaction name="JODB" program="CDEVJODB"
     description="Runs OSGi JDBC program." />
diff --git a/etc/eclipse_projects/.project b/etc/eclipse_projects/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.cics.server.examples.osgi.jdbc.bundle</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.cics.bundle.ui.bundlebuilder</name>
+			<arguments>
+				<dictionary>
+					<key>bundleID</key>
+					<value>com.ibm.cics.server.examples.osgi.jdbc.bundle</value>
+				</dictionary>
+				<dictionary>
+					<key>majorVersion</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>microVersion</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>minorVersion</key>
+					<value></value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.ibm.cics.bundle.ui.bundlenature</nature>
+	</natures>
+</projectDescription>
diff --git a/etc/eclipse_projects/.settings/org.eclipse.core.resources.prefs b/etc/eclipse_projects/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//META-INF/cics.xml=UTF-8
+encoding/<project>=UTF-8
+encoding/cics-java-osgi-jdbc-app.osgibundle=UTF-8
diff --git a/etc/eclipse_projects/CDEVJODB.program b/etc/eclipse_projects/CDEVJODB.program
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<cicsdefinitionprogram name="CDEVJODB" 
+    jvm="YES" jvmserver="DFHOSGI" 
+    jvmclass="com.ibm.cicsdev.java.osgi.jdbc.JDBCQueryProgram" />
diff --git a/etc/eclipse_projects/JODB.transaction b/etc/eclipse_projects/JODB.transaction
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cicsdefinitiontransaction name="JODB" program="CDEVJODB"
+    description="Runs OSGi JDBC program." />
diff --git a/etc/eclipse_projects/META-INF/cics.xml b/etc/eclipse_projects/META-INF/cics.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle" id="com.ibm.cics.server.examples.osgi.jdbc.bundle" bundleMajorVer="1" bundleMinorVer="0" bundleMicroVer="0" bundleVersion="1" bundleRelease="0">
+    <meta_directives>
+        <timestamp>2025-05-07T15:46:32.498Z</timestamp>
+    </meta_directives>
+    <define name="cics-java-osgi-jdbc-app-1.0.0" type="http://www.ibm.com/xmlns/prod/cics/bundle/OSGIBUNDLE" path="cics-java-osgi-jdbc-app-1.0.0.osgibundle"/>
+    <define name="CDEVJODB" type="http://www.ibm.com/xmlns/prod/cics/bundle/PROGRAM" path="CDEVJODB.program"/>
+    <define name="JODB" type="http://www.ibm.com/xmlns/prod/cics/bundle/TRANSACTION" path="JODB.transaction"/>
+</manifest>
diff --git a/etc/eclipse_projects/cics-java-osgi-jdbc-app-1.0.0.osgibundle b/etc/eclipse_projects/cics-java-osgi-jdbc-app-1.0.0.osgibundle
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<osgibundle symbolicname="com.ibm.cicsdev.java.osgi.jdbc" version="1.0.0" jvmserver="DFHOSGI"/>
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
     <properties>
         <!-- CICS bundle properties -->
         <cics.jvmserver>DFHOSGI</cics.jvmserver>
-        <java.version>8</java.version>
+        <java.version>1.8</java.version>
 
         <!-- Java project properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = 'cics-java-osgi-link'
+rootProject.name = 'cics-java-osgi-jdbc'
 include(':cics-java-osgi-jdbc-bundle')
 include(':cics-java-osgi-jdbc-app')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
		<osgibundle symbolicname="com.ibm.cicsdev.java.osgi.jdbc" version="1.0.0" jvmserver="DFHOSGI"/>