Skip to content

Commit

Permalink
Merged from upstream
Browse files Browse the repository at this point in the history
Signed-off-by: Sowmya Ujjappa Banakar <[email protected]>
  • Loading branch information
Sowmya Ujjappa Banakar committed Jan 5, 2024
2 parents 3892c5a + 283fcb6 commit f736307
Show file tree
Hide file tree
Showing 22 changed files with 1,551 additions and 1,215 deletions.
9 changes: 2 additions & 7 deletions registration-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,8 @@
**/registration/processor/core/queue/impl/*.java,
**/registration/processor/core/tracing/*.java,
**/registration/processor/message/sender/config/MsgNotificationBeanCofig.java,
**/registration/processor/print/exception/QueueConnectionNotFound.java,
**/registration/processor/abis/exception/QueueConnectionNotFound.java,
**/registration/processor/stages/demodedupe/StatusMessage.java,
**/registration/processor/print/service/utility/UINCardConstant.java,
**/registration/processor/stages/demodedupe/BiometricValidation.java,
**/registration/processor/camel/bridge/MosipBridgeFactory.java,
**/registration/processor/manual/verification/stage/ManualVerificationStage.java,
Expand All @@ -265,17 +264,13 @@
**/registration/processor/packet/storage/dao/PacketInfoDao.java,
**/registration/processor/packet/uploader/constants/*.java,
**/registration/processor/packet/manager/constant/*.java,
**/registration/processor/print/exception/PrintGlobalExceptionHandler.java,
**/registration/processor/packet/receiver/constants/*.java,
**/registration/processor/print/service/exception/*.java,
**/registration/processor/print/exception/*.java,
**/registration/processor/credentialrequestor/stage/exception/*.java,
**/registration/processor/packet/uploader/constants/*.java,
**/registration/processor/packet/uploader/decryptor/*.java,
**/registration/processor/core/abstractverticle/MosipRouter.java,
**/registration/processor/packet/uploader/decryptor/*.java,

**/registration/processor/print/service/impl/PrintPostServiceImpl.java,

**/registration/processor/message/sender/constants/*.java,
**/registration/processor/core/abstractverticle/BaseHealthCheckModel.java,
**/registration/processor/core/**/TokenValidator.java,
Expand Down
44 changes: 22 additions & 22 deletions registration-processor/post-processor/pom.xml
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-SNAPSHOT</version>
</parent>
<version>1.2.0.1-SNAPSHOT</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-SNAPSHOT</version>
</parent>
<version>1.2.0.1-SNAPSHOT</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>
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"]

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)
Loading

0 comments on commit f736307

Please sign in to comment.