Skip to content

Convert to multi-module structure #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Manvi-55 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Convert to multi-module structure #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions cics-java-liberty-springboot-security-app/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
37 changes: 37 additions & 0 deletions cics-java-liberty-springboot-security-app/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions cics-java-liberty-springboot-security-app/.settings/org.eclipse.buildship.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
9 changes: 9 additions & 0 deletions cics-java-liberty-springboot-security-app/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 7 additions & 0 deletions ...a-liberty-springboot-security-app/.settings/org.eclipse.wst.common.project.facet.core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 build.gradle → ...erty-springboot-security-app/build.gradle
View file
Open in desktop
File renamed without changes.
90 changes: 90 additions & 0 deletions cics-java-liberty-springboot-security-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 ...sdev/springboot/security/Application.java → ...sdev/springboot/security/Application.java
View file
Open in desktop
File renamed without changes.
0 ...ringboot/security/ServletInitializer.java → ...ringboot/security/ServletInitializer.java
View file
Open in desktop
File renamed without changes.
0 ...ingboot/security/WebSecureController.java → ...ingboot/security/WebSecureController.java
View file
Open in desktop
File renamed without changes.
0 src/main/resources/application.properties → ...src/main/resources/application.properties
View file
Open in desktop
File renamed without changes.
0 ...in/resources/static/css/bootstrap.min.css → ...in/resources/static/css/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 src/main/resources/templates/error.html → ...p/src/main/resources/templates/error.html
View file
Open in desktop
File renamed without changes.
0 src/main/resources/templates/home.html → ...pp/src/main/resources/templates/home.html
View file
Open in desktop
File renamed without changes.
0 src/main/resources/templates/login.html → ...p/src/main/resources/templates/login.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/WEB-INF/web.xml → ...urity-app/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
File renamed without changes.
34 changes: 34 additions & 0 deletions cics-java-liberty-springboot-security-cicsbundle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
}
}

55 changes: 55 additions & 0 deletions cics-java-liberty-springboot-security-cicsbundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
80 changes: 20 additions & 60 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -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>
Expand All @@ -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>

10 changes: 9 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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')