From d85afd93fa36e70f77bffc49738c310b0ef02cd1 Mon Sep 17 00:00:00 2001
From: Manvi Singh <manvisingh.555@ibm.com>
Date: Tue, 14 Jul 2026 14:55:54 +0530
Subject: [PATCH] Convert to multi-module structure

- Move source code and build files into cics-java-liberty-springboot-security-app module
- Add cics-java-liberty-springboot-security-cicsbundle module for CICS bundle packaging
- Update root pom.xml to parent POM with module declarations
- Update settings.gradle to include both subprojects
- Update .gitignore to exclude build/target directories in all modules
- Both Gradle and Maven builds verified successful
---
 .../.classpath                                | 17 ++++
 .../.project                                  | 37 ++++++++
 .../org.eclipse.buildship.core.prefs          |  2 +
 .../org.eclipse.wst.common.component          |  9 ++
 ....eclipse.wst.common.project.facet.core.xml |  7 ++
 .../build.gradle                              |  0
 .../pom.xml                                   | 90 +++++++++++++++++++
 .../springboot/security/Application.java      |  0
 .../security/ServletInitializer.java          |  0
 .../security/WebSecureController.java         |  0
 .../main/resources/application.properties     |  0
 .../resources/static/css/bootstrap.min.css    |  0
 .../src}/main/resources/templates/error.html  |  0
 .../src}/main/resources/templates/home.html   |  0
 .../src}/main/resources/templates/login.html  |  0
 .../src}/main/webapp/WEB-INF/web.xml          |  0
 .../build.gradle                              | 34 +++++++
 .../pom.xml                                   | 55 ++++++++++++
 pom.xml                                       | 80 +++++------------
 settings.gradle                               | 10 ++-
 20 files changed, 280 insertions(+), 61 deletions(-)
 create mode 100644 cics-java-liberty-springboot-security-app/.classpath
 create mode 100644 cics-java-liberty-springboot-security-app/.project
 create mode 100644 cics-java-liberty-springboot-security-app/.settings/org.eclipse.buildship.core.prefs
 create mode 100644 cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.component
 create mode 100644 cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.project.facet.core.xml
 rename build.gradle => cics-java-liberty-springboot-security-app/build.gradle (100%)
 create mode 100644 cics-java-liberty-springboot-security-app/pom.xml
 rename {src => cics-java-liberty-springboot-security-app/src}/main/java/com/ibm/cicsdev/springboot/security/Application.java (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/java/com/ibm/cicsdev/springboot/security/ServletInitializer.java (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/java/com/ibm/cicsdev/springboot/security/WebSecureController.java (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/resources/application.properties (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/resources/static/css/bootstrap.min.css (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/resources/templates/error.html (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/resources/templates/home.html (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/resources/templates/login.html (100%)
 rename {src => cics-java-liberty-springboot-security-app/src}/main/webapp/WEB-INF/web.xml (100%)
 create mode 100644 cics-java-liberty-springboot-security-cicsbundle/build.gradle
 create mode 100644 cics-java-liberty-springboot-security-cicsbundle/pom.xml

diff --git a/cics-java-liberty-springboot-security-app/.classpath b/cics-java-liberty-springboot-security-app/.classpath
new file mode 100644
index 0000000..97233ed
--- /dev/null
+++ b/cics-java-liberty-springboot-security-app/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src/main/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/cics-java-liberty-springboot-security-app/.project b/cics-java-liberty-springboot-security-app/.project
new file mode 100644
index 0000000..c85f7b5
--- /dev/null
+++ b/cics-java-liberty-springboot-security-app/.project
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.cicsdev.springboot.security</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/cics-java-liberty-springboot-security-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-springboot-security-app/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..e889521
--- /dev/null
+++ b/cics-java-liberty-springboot-security-app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..f68927d
--- /dev/null
+++ b/cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+	<wb-module deploy-name="com.ibm.cicsdev.springboot.security">
+		<property name="context-root" value="cics-java-liberty-springboot-security"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
+	</wb-module>
+</project-modules>
diff --git a/cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.project.facet.core.xml b/cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..cea524a
--- /dev/null
+++ b/cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+	<fixed facet="jst.java"/>
+	<fixed facet="jst.web"/>
+	<installed facet="jst.web" version="2.4"/>
+	<installed facet="jst.java" version="1.8"/>
+</faceted-project>
diff --git a/build.gradle b/cics-java-liberty-springboot-security-app/build.gradle
similarity index 100%
rename from build.gradle
rename to cics-java-liberty-springboot-security-app/build.gradle
diff --git a/cics-java-liberty-springboot-security-app/pom.xml b/cics-java-liberty-springboot-security-app/pom.xml
new file mode 100644
index 0000000..e0b04cb
--- /dev/null
+++ b/cics-java-liberty-springboot-security-app/pom.xml
@@ -0,0 +1,90 @@
+<project
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <!-- Inherit from parent POM -->
+  <parent>
+    <groupId>com.ibm.cicsdev.springboot</groupId>
+    <artifactId>cics-java-liberty-springboot-security</artifactId>
+    <version>0.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  
+  <!-- Application module properties -->
+  <artifactId>cics-java-liberty-springboot-security-app</artifactId>
+  <name>com.ibm.cicsdev.springboot.security.app</name>
+  <description>Spring Boot Web Secure Sample with Jakarta EE pre-authentication - Application</description>
+  <packaging>war</packaging>
+  <properties>
+    <java.version>17</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.release>${java.version}</maven.compiler.release>
+    <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
+  </properties>
+
+  <!-- Dependency Management -->
+  <dependencyManagement>
+    <dependencies>
+      <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
+      <dependency>
+        <groupId>com.ibm.cics</groupId>
+        <artifactId>com.ibm.cics.ts.bom</artifactId>
+        <version>6.1-20250812133513-PH63856</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <!-- Compile against, but don't include JCICS in the final build (version and scope are from BOM) -->
+    <dependency>
+      <groupId>com.ibm.cics</groupId>
+      <artifactId>com.ibm.cics.server</artifactId>
+    </dependency>
+
+    <!-- Spring Boot web support -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <!-- Compile against, but don't include TomCat in the runtime build -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tomcat</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Spring Boot security -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+    </dependency>
+		
+    <!-- Thymeleaf templates (Web framework) -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-thymeleaf</artifactId>
+    </dependency>
+  </dependencies>
+ 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/main/java/com/ibm/cicsdev/springboot/security/Application.java b/cics-java-liberty-springboot-security-app/src/main/java/com/ibm/cicsdev/springboot/security/Application.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/security/Application.java
rename to cics-java-liberty-springboot-security-app/src/main/java/com/ibm/cicsdev/springboot/security/Application.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/security/ServletInitializer.java b/cics-java-liberty-springboot-security-app/src/main/java/com/ibm/cicsdev/springboot/security/ServletInitializer.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/security/ServletInitializer.java
rename to cics-java-liberty-springboot-security-app/src/main/java/com/ibm/cicsdev/springboot/security/ServletInitializer.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/security/WebSecureController.java b/cics-java-liberty-springboot-security-app/src/main/java/com/ibm/cicsdev/springboot/security/WebSecureController.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/security/WebSecureController.java
rename to cics-java-liberty-springboot-security-app/src/main/java/com/ibm/cicsdev/springboot/security/WebSecureController.java
diff --git a/src/main/resources/application.properties b/cics-java-liberty-springboot-security-app/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to cics-java-liberty-springboot-security-app/src/main/resources/application.properties
diff --git a/src/main/resources/static/css/bootstrap.min.css b/cics-java-liberty-springboot-security-app/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from src/main/resources/static/css/bootstrap.min.css
rename to cics-java-liberty-springboot-security-app/src/main/resources/static/css/bootstrap.min.css
diff --git a/src/main/resources/templates/error.html b/cics-java-liberty-springboot-security-app/src/main/resources/templates/error.html
similarity index 100%
rename from src/main/resources/templates/error.html
rename to cics-java-liberty-springboot-security-app/src/main/resources/templates/error.html
diff --git a/src/main/resources/templates/home.html b/cics-java-liberty-springboot-security-app/src/main/resources/templates/home.html
similarity index 100%
rename from src/main/resources/templates/home.html
rename to cics-java-liberty-springboot-security-app/src/main/resources/templates/home.html
diff --git a/src/main/resources/templates/login.html b/cics-java-liberty-springboot-security-app/src/main/resources/templates/login.html
similarity index 100%
rename from src/main/resources/templates/login.html
rename to cics-java-liberty-springboot-security-app/src/main/resources/templates/login.html
diff --git a/src/main/webapp/WEB-INF/web.xml b/cics-java-liberty-springboot-security-app/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to cics-java-liberty-springboot-security-app/src/main/webapp/WEB-INF/web.xml
diff --git a/cics-java-liberty-springboot-security-cicsbundle/build.gradle b/cics-java-liberty-springboot-security-cicsbundle/build.gradle
new file mode 100644
index 0000000..f0116e8
--- /dev/null
+++ b/cics-java-liberty-springboot-security-cicsbundle/build.gradle
@@ -0,0 +1,34 @@
+// ============================================================================
+// Plugins
+// ============================================================================
+plugins
+{
+    id 'com.ibm.cics.bundle' version '1.0.8'
+}
+
+// ============================================================================
+// Project Information
+// ============================================================================
+description = 'CICS Spring Boot Security Application - CICS Bundle'
+version = '0.1.0'
+
+// ============================================================================
+// Dependencies
+// ============================================================================
+dependencies
+{
+    // Application WAR from sibling project
+    cicsBundlePart project(path: ':cics-java-liberty-springboot-security-app', configuration: 'archives')
+}
+
+// ============================================================================
+// CICS Bundle Configuration
+// ============================================================================
+cicsBundle
+{
+    build
+    {
+        defaultJVMServer = project.findProperty('cics.jvmserver') ?: 'DFHWLP'
+    }
+}
+
diff --git a/cics-java-liberty-springboot-security-cicsbundle/pom.xml b/cics-java-liberty-springboot-security-cicsbundle/pom.xml
new file mode 100644
index 0000000..2bd3d0a
--- /dev/null
+++ b/cics-java-liberty-springboot-security-cicsbundle/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- ================================================================ -->
+    <!-- Parent Project                                                   -->
+    <!-- ================================================================ -->
+    <parent>
+        <groupId>com.ibm.cicsdev.springboot</groupId>
+        <artifactId>cics-java-liberty-springboot-security</artifactId>
+        <version>0.1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <!-- ================================================================ -->
+    <!-- Project Coordinates                                              -->
+    <!-- ================================================================ -->
+    <artifactId>cics-java-liberty-springboot-security-cicsbundle</artifactId>
+    <packaging>cics-bundle</packaging>
+    <name>CICS Spring Boot Security - CICS Bundle</name>
+
+    <!-- ================================================================ -->
+    <!-- Dependencies                                                     -->
+    <!-- ================================================================ -->
+    <dependencies>
+        <!-- Application WAR -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cics-java-liberty-springboot-security-app</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <!-- ================================================================ -->
+    <!-- Build Configuration                                              -->
+    <!-- ================================================================ -->
+    <build>
+        <plugins>
+            <!-- CICS Bundle Maven Plugin -->
+            <plugin>
+                <groupId>com.ibm.cics</groupId>
+                <artifactId>cics-bundle-maven-plugin</artifactId>
+                <version>1.0.8</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 29b842c..eb35aa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
@@ -12,19 +11,22 @@
     <relativePath/>
   </parent>
   
-  <!-- Application properties -->
+  <!-- ================================================================ -->
+  <!-- Project Coordinates                                              -->
+  <!-- ================================================================ -->
   <groupId>com.ibm.cicsdev.springboot</groupId>
   <artifactId>cics-java-liberty-springboot-security</artifactId>
   <version>0.1.0</version>
-  <name>cics-java-liberty-springboot-security</name>
-  <description>Spring Boot Web Secure Sample with Jakarta EE pre-authentication</description>
+  <description>Demo project for Spring Boot with CICS Security</description>
+  <packaging>pom</packaging>
+  
   <properties>
     <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.release>${java.version}</maven.compiler.release>
+    <cics.jvmserver>DFHWLP</cics.jvmserver>
   </properties>
-
+  
   <!-- Dependency Management -->
   <dependencyManagement>
     <dependencies>
@@ -38,56 +40,14 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
-  <dependencies>
-    <!-- Compile against, but don't include JCICS in the final build (version and scope are from BOM) -->
-    <dependency>
-      <groupId>com.ibm.cics</groupId>
-      <artifactId>com.ibm.cics.server</artifactId>
-    </dependency>
-
-    <!-- Spring Boot web support -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-
-    <!-- Compile against, but don't include TomCat in the runtime build -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-tomcat</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Spring Boot security -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-    </dependency>
-		
-    <!-- Thymeleaf templates (Web framework) -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
-  </dependencies>
-	
-  <!-- Package as an executable war (default jar) -->
-  <packaging>war</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <release>${java.version}</release>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  
+  <!-- ================================================================ -->
+  <!-- Modules                                                          -->
+  <!-- ================================================================ -->
+  <modules>
+    <module>cics-java-liberty-springboot-security-app</module>
+    <module>cics-java-liberty-springboot-security-cicsbundle</module>
+  </modules>
 
 </project>
+
diff --git a/settings.gradle b/settings.gradle
index 5dba858..4b1e2e4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,16 @@
 // ============================================================================
 // Root Project Configuration
+// ============================================================================
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
+rootProject.name = 'cics-java-liberty-springboot-security'
+
+// ============================================================================
+// Subprojects
 // ============================================================================
-rootProject.name = 'com.ibm.cicsdev.springboot.security'
+include(':cics-java-liberty-springboot-security-app')
+include(':cics-java-liberty-springboot-security-cicsbundle')
+
+