diff --git a/.gitignore b/.gitignore index 642e292..688aa00 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ bin/ *.war *.jar +.mvn/wrapper/maven-wrapper.jar # Avoid ignoring Gradle wrapper jar and properties (needed for wrapper to work) !gradle-wrapper.jar diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index eebc3c1..0000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 62ef348..8c9943d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,11 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=17 +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 diff --git a/README.md b/README.md index 72c30c2..2a99975 100644 --- a/README.md +++ b/README.md @@ -37,16 +37,22 @@ This sample provides a Spring Boot application that demonstrates asynchronous op ## Downloading -- Clone the repository using your IDEs support, such as the Eclipse Git plugin -- **or**, download the sample as a [ZIP](https://github.com/cicsdev/cics-java-liberty-springboot-asynchronous/archive/main.zip) and unzip onto the workstation +**If using Eclipse:** the simplest approach is to clone the repository using the Eclipse Git plugin (EGit) perspective. -**Importing into Eclipse:** +**If using the command line:** +```shell +git clone https://github.com/cicsdev/cics-java-liberty-springboot-asynchronous +``` +Alternatively, download the sample as a [ZIP](https://github.com/cicsdev/cics-java-liberty-springboot-asynchronous/archive/main.zip) and unzip onto the workstation. + +**If importing into Eclipse:** 1. In the **Git Repositories** view, right-click the repository → **Import as Project** (imports the root project) + *(if you cloned from the command line, use **File → Import → Existing Projects into Workspace** instead, browse to the cloned directory, select all projects, and skip to step 6)* 2. Switch to the **Java EE** perspective 3. In the **Project Explorer**, right-click the `cics-java-liberty-springboot-asynchronous-app` folder → **Import as Project** 4. Right-click the `cics-java-liberty-springboot-asynchronous-cicsbundle` folder → **Import as Project** 5. Right-click the `cics-java-liberty-springboot-asynchronous-cicsbundle-eclipse` folder → **Import as Project** -6. Right-click the root project → **Gradle → Refresh Gradle Project** or **Maven → Update Project...** to resolve dependencies +6. **Required:** Right-click the root project → **Gradle → Refresh Gradle Project** or **Maven → Update Project...** — this resolves Spring Boot and CICS dependencies into the project classpath. Without this step, the WTP export will produce an incomplete WAR missing `WEB-INF/lib`. ### Check dependencies @@ -135,8 +141,6 @@ A template `server.xml` is provided [here](./etc/config/liberty/server.xml). ### CICS Bundle Plugin Deployment (Gradle/Maven) -This is the **recommended** deployment method as it uses the CICS bundle generated during the build process. - This method uses the cics-bundle-gradle-plugin or cics-bundle-maven-plugin to automatically generate a CICS bundle. **Configure your JVM server name:** @@ -179,7 +183,7 @@ This repository includes a pre-configured Eclipse CICS bundle project `cics-java 1. Right-click the `cics-java-liberty-springboot-asynchronous-cicsbundle-eclipse` project → **Export Bundle Project to z/OS UNIX File System** and follow the wizard -> **Note**: The bundle project is pre-configured so that the Eclipse WTP export automatically packages the application WAR with all dependencies. This relies on the `-app` project being open in the same Eclipse workspace. If you have not yet imported the project, follow step 5 of the [Importing into Eclipse](#downloading) instructions first. +> **Note**: The bundle project is pre-configured so that the Eclipse WTP export automatically packages the application WAR with all dependencies. This relies on the `-app` project being open in the same Eclipse workspace. If you have not yet imported the project, follow steps 3 and 6 of the [Importing into Eclipse](#downloading) instructions first. --- diff --git a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs index 62ef348..8c9943d 100644 --- a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs +++ b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,11 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=17 +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 diff --git a/etc/config/liberty/server.xml b/etc/config/liberty/server.xml index 1e2ed2a..b7ef4eb 100644 --- a/etc/config/liberty/server.xml +++ b/etc/config/liberty/server.xml @@ -1,19 +1,11 @@ - + - - - cicsts:core-1.0 - servlet-6.0 - concurrent-3.0 - + + + servlet-6.0 + + concurrent-3.0 + - - - - - - -