Skip to content

Commit 333763b

Browse files
Merge pull request #34 from cicsdev/IDH-TEST
Update and correct the sample
2 parents de519d2 + 1164dba commit 333763b

File tree

9 files changed

+63
-20
lines changed

9 files changed

+63
-20
lines changed

.classpath

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
4+
</classpath>

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ buildNumber.properties
1313

1414
# Eclipse m2e generated files
1515
# Eclipse Core
16-
.project
16+
#.project
1717
# JDT-specific (Eclipse Java Development Tools)
18-
.classpath
18+
#.classpath
1919

2020

2121
# Gradle ignores
@@ -37,9 +37,9 @@ gradle-app.setting
3737

3838
# Eclipse Gradle plugin generated files
3939
# Eclipse Core
40-
.project
40+
#.project
4141
# JDT-specific (Eclipse Java Development Tools)
42-
.classpath
42+
#.classpath
4343

4444

4545
# Java ignores
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6+
org.eclipse.jdt.core.compiler.compliance=1.8
7+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
12+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
13+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
14+
org.eclipse.jdt.core.compiler.release=disabled
15+
org.eclipse.jdt.core.compiler.source=1.8

MAINTAINERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
- Phil Wakelin [@PhilWakelin](https://github.com/PhilWakelin)
66
- Aaron Jhaj [@AaronJhaj](https://github.com/AaronJhaj)
77

8-
*Last reviewed:* December 2024
8+
*Last reviewed:* April 2025

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ A sample CICS Java application showing use of the `com.ibm.cics.server.invocatio
77
A set of sample components that demonstrate how to annotate a POJO packaged in a WAR (Web application), deploy it to a Liberty JVM server, and then LINK to (or call) that POJO from a CICS program or CICS transaction.
88

99
- [cics-java-liberty-link](./cics-java-liberty-link) - Top-level project.
10-
- [cics-java-liberty-link-app](./cics-java-liberty-link-app) - Web project.
10+
- [cics-java-liberty-link-app](./cics-java-liberty-link-app) - Web application project.
1111
- [cics-java-liberty-link-bundle](./cics-java-liberty-link-bundle) - CICS bundle plug-in based project, contains Web application and WLPH transaction bundle-parts. Use with Gradle and Maven builds.
1212
- [etc/eclipse_projects/com.ibm.cics.server.examples.wlp.link.bundle](./etc/eclipse_projects/com.ibm.cics.server.examples.wlp.link.bundle) - CICS Explorer based CICS bundle project, contains Web application and WLPH transaction bundle-parts. Use with CICS Explorer 'Export to zFS' deployment capability.
1313
- [etc/config/liberty/server.xml](./etc/config/liberty/server.xml) - A template `server.xml` demonstrating the minimum configuration required to run the sample.
1414

1515
## Prerequisites
1616
- CICS TS V5.5 or later
1717
- Java SE 1.8 or later on the workstation
18-
- One of the following:
18+
- One of the following on your workstation:
1919
- Eclipse with the IBM CICS SDK for Java EE, Jakarta EE and Liberty
20-
- An IDE of your choice that supports Gradle or Maven
21-
- A command line version of Gradle or Apache Maven on the workstation
20+
- An IDE of your choice that supports Gradle or Maven (or can run the Wrappers)
21+
- A command line, to run the Wrappers or to invoke a locally installed version of Gradle or Maven
2222

2323
## Downloading
2424

@@ -58,16 +58,18 @@ Maven (POM.xml):
5858
You can build the sample in a variety of ways:
5959
- Using the implicit compile/build of the Eclipse based CICS Explorer SDK
6060
- Using the built-in Gradle or Maven support of your IDE (For example: *buildship* or *m2e* in Eclipse which integrate with the "Run As..." menu.)
61-
- or you can build it from the command line with Gradle or Maven
61+
- Using the supplied Gradle or Maven Wrapper scripts (no requirement for an IDE or Gradle/Maven install)
62+
- or you can build it from the command line if you have Gradle or Maven installed on your workstation
6263

6364

6465
> [!IMPORTANT]
65-
> When you initially import the project to your IDE, you might experience local project compile errors. Resolving these errors depends on how you wish to build and deploying the sample. If you are building and deploying through CICS Explorer SDK and 'Export to zFS' you should edit the link-app's Project properties, select 'Java Build Path', on the Libraries tab select 'Classpath', click 'Add Library', select 'CICS with Enterprise Java and Liberty' Library, and choose the appropriate CICS and Enterprise Java versions.
66-
If you are building and deploying with Gradle or Maven then you don't necessarily need to fix the local errors, but to do so, you can run a tooling refresh on the link-app project. For example, in Eclipse: right-click on "Project", select "Gradle -> Refresh Gradle Project", **or** right-click on "Project", select "Maven -> Update Project...".
66+
> The sample comes pre-configured for use with a JDK 1.8 and CICS TS V5.5 Libraries for Java EE 6/7. 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, you might experience local project compile errors. To resolve issues you should configure the Project's build-path to add/remove your preferred combination of CICS TS, JDK, and Liberty's Enterprise Java libraries (Java EE or Jakarta EE). Resolving errors might also depend on how you wish to build and deploy the sample. If you are building and deploying through CICS Explorer SDK and 'Export to zFS' you should edit the link-app's Project properties. Select 'Java Build Path', on the Libraries tab select 'Classpath', click 'Add Library', select 'CICS with Enterprise Java and Liberty' Library, and choose the appropriate CICS and Enterprise Java versions.
67+
If you are building and deploying with Gradle or Maven then you don't necessarily need to fix the local errors, but to do so, you can do as above, or you can run a tooling refresh on the link-app project. For example, in Eclipse: right-click on "Project", select "Gradle -> Refresh Gradle Project", **or** right-click on "Project", select "Maven -> Update Project...".
6768
6869
> [!TIP]
6970
> In Eclipse, Gradle (buildship) is able to fully refresh and resolve the local classpath even if the project was previously updated by Maven. However, Maven (m2e) does not currently reciprocate that capability. If you previously refreshed the project with Gradle, you'll need to manually remove the 'Project Dependencies' entry on the Java build-path of your Project Properties to avoid duplication errors when performing a Maven Project Update.
7071
72+
7173
### Building with Eclipse
7274

7375
If you are using the Egit client to clone the repo, remember to tick the button to import all projects. Otherwise, you should manually Import the projects into CICS Explorer using File &rarr; Import &rarr; General &rarr; Existing projects into workspace, then follow the error resolution advice above.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.55/JE.7"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
6+
<classpathentry kind="src" path=".apt_generated">
7+
<attributes>
8+
<attribute name="optional" value="true"/>
9+
</attributes>
10+
</classpathentry>
11+
<classpathentry kind="output" path="bin/"/>
12+
</classpath>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2-
<wb-module deploy-name="cics-java-liberty-link-app">
3-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated_tests"/>
4-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
1+
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2+
<wb-module deploy-name="cics-java-liberty-link-app">
3+
<wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated_tests"/>
4+
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
55
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
6-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
7-
<property name="context-root" value="cics-java-liberty-link-app"/>
8-
<property name="java-output-path" value="/cics-java-liberty-link-app/bin/default"/>
9-
</wb-module>
6+
<wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
7+
<property name="context-root" value="cics-java-liberty-link-app"/>
8+
<property name="java-output-path" value="/cics-java-liberty-link-app/bin/default"/>
9+
</wb-module>
1010
</project-modules>

cics-java-liberty-link-app/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ group = 'com.ibm.cicsdev'
99
archivesBaseName='cics-java-liberty-link'
1010
version = '1.0.0'
1111

12+
13+
java
14+
{
15+
sourceCompatibility = JavaVersion.VERSION_1_8
16+
targetCompatibility = JavaVersion.VERSION_1_8
17+
}
18+
1219
// If in Eclipse, add Javadoc to the local project classpath
1320
eclipse
1421
{
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source.. = src/main/java/
2+
bin.includes = META-INF/,.
3+
output.. = bin/

0 commit comments

Comments
 (0)