Skip to content

Commit

Permalink
Merge pull request #1821 from MonobikashDas/1.2.0.1
Browse files Browse the repository at this point in the history 
cherry picked changes for MOSIP-28121
  • Loading branch information
@vishwa-vyom
vishwa-vyom authored Jan 4, 2024
2 parents 46e6d55 + 565d9ab commit 283fcb6
Show file tree
Hide file tree
Showing 22 changed files with 2,111 additions and 1,775 deletions.
1,129 changes: 562 additions & 567 deletions registration-processor/pom.xml
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions registration-processor/post-processor/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B3</version>
</parent>
<version>1.2.0.1-B3</version>
<artifactId>post-processor</artifactId>
<name>post-processor</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>registration-processor-message-sender-stage</module>
<module>registration-processor-printing-stage</module>
<module>registration-processor-registration-transaction-service</module>
</modules>
</project>
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B3</version>
</parent>
<version>1.2.0.1-B3</version>
<artifactId>post-processor</artifactId>
<name>post-processor</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>registration-processor-message-sender-stage</module>
<module>registration-processor-credential-requestor-stage</module>
<module>registration-processor-registration-transaction-service</module>
</modules>
</project>
110 changes: 55 additions & 55 deletions ...cessor-printing-stage/Dockerfile-not-used → ...ntial-requestor-stage/Dockerfile-not-used
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
FROM openjdk:11
#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine
# can be passed during Docker build as build time environment for github branch to pickup configuration from.
ARG spring_config_label
# can be passed during Docker build as build time environment for spring profiles active
ARG active_profile
# can be passed during Docker build as build time environment for config server URL
ARG spring_config_url
# can be passed during Docker build as build time environment for glowroot
ARG is_glowroot
# can be passed during Docker build as build time environment for artifactory URL
ARG artifactory_url
# environment variable to pass active profile such as DEV, QA etc at docker runtime
ENV active_profile_env=${active_profile}
# environment variable to pass github branch to pickup configuration from, at docker runtime
ENV spring_config_label_env=${spring_config_label}
# environment variable to pass github branch to pickup configuration from, at docker runtime
ENV spring_config_label_env=${spring_config_label}
# environment variable to pass glowroot, at docker runtime
ENV is_glowroot_env=${is_glowroot}
# environment variable to pass artifactory url, at docker runtime
ENV artifactory_url_env=${artifactory_url}
# change volume to whichever storage directory you want to use for this container.
VOLUME /home/logs
COPY ./target/registration-processor-printing-stage-*.jar registration-processor-printing-stage.jar
CMD if [ "$is_glowroot_env" = "present" ]; then \
wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \
apt-get update && apt-get install -y unzip ; \
unzip glowroot.zip ; \
rm -rf glowroot.zip ; \
sed -i 's/<service_name>/registration-processor-printing-stage/g' glowroot/glowroot.properties ; \
java -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar -javaagent:glowroot/glowroot.jar registration-processor-printing-stage.jar ; \
else \
java -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar registration-processor-printing-stage.jar ; \
fi
#CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","registration-processor-printing-stage.jar"]
FROM openjdk:11

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

# can be passed during Docker build as build time environment for github branch to pickup configuration from.
ARG spring_config_label

# can be passed during Docker build as build time environment for spring profiles active
ARG active_profile

# can be passed during Docker build as build time environment for config server URL
ARG spring_config_url

# can be passed during Docker build as build time environment for glowroot
ARG is_glowroot

# can be passed during Docker build as build time environment for artifactory URL
ARG artifactory_url

# environment variable to pass active profile such as DEV, QA etc at docker runtime
ENV active_profile_env=${active_profile}

# environment variable to pass github branch to pickup configuration from, at docker runtime
ENV spring_config_label_env=${spring_config_label}

# environment variable to pass github branch to pickup configuration from, at docker runtime
ENV spring_config_label_env=${spring_config_label}

# environment variable to pass glowroot, at docker runtime
ENV is_glowroot_env=${is_glowroot}

# environment variable to pass artifactory url, at docker runtime
ENV artifactory_url_env=${artifactory_url}

# change volume to whichever storage directory you want to use for this container.
VOLUME /home/logs

COPY ./target/registration-processor-credential-requestor-stage-*.jar registration-processor-credential-requestor-stage.jar

CMD if [ "$is_glowroot_env" = "present" ]; then \
wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \
apt-get update && apt-get install -y unzip ; \
unzip glowroot.zip ; \
rm -rf glowroot.zip ; \

sed -i 's/<service_name>/registration-processor-credential-requestor-stage/g' glowroot/glowroot.properties ; \
java -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar -javaagent:glowroot/glowroot.jar registration-processor-credential-requestor-stage.jar ; \
else \
java -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar registration-processor-credential-requestor-stage.jar ; \
fi


#CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","registration-processor-credential-requestor-stage.jar"]

4 changes: 2 additions & 2 deletions ...ration-processor-printing-stage/README.md → ...ssor-credential-requestor-stage/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Priting Stage
# Credential Requestor Stage

## About
Creates Credential Request for printing systems.
Creates Credential Request for internal/external systems.

## Default context, path, port
Refert to [bootstrap properties](src/main/resources/bootstrap.properties)
218 changes: 111 additions & 107 deletions ...stration-processor-printing-stage/pom.xml → ...cessor-credential-requestor-stage/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,107 +1,111 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>post-processor</artifactId>
<version>1.2.0.1-B3</version>
</parent>
<artifactId>registration-processor-printing-stage</artifactId>
<version>1.2.0.1-B3</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>${spring-cloud-config.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-client</artifactId>
<version>${vertx.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-core</artifactId>
<version>${registration.processor.core.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-registration-status-service-impl</artifactId>
<version>${registration.status.service.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-rest-client</artifactId>
<version>${registration.processor.rest.client.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-info-storage-service</artifactId>
<version>${packet.info.storage.service.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
</plugins>
</build>
</project>
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>post-processor</artifactId>
<version>1.2.0.1-B3</version>
</parent>
<artifactId>registration-processor-credential-requestor-stage</artifactId>
<version>1.2.0.1-B3</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>${spring-cloud-config.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-client</artifactId>
<version>${vertx.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-core</artifactId>
<version>${registration.processor.core.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-registration-status-service-impl</artifactId>
<version>${registration.status.service.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-rest-client</artifactId>
<version>${registration.processor.rest.client.version}</version>
</dependency>
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.4.12.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor-info-storage-service</artifactId>
<version>${packet.info.storage.service.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
</plugins>
</build>
</project>
Loading

0 comments on commit 283fcb6

Please sign in to comment.