Skip to content
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.

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

[CLOUD-2542] adding module which links jar files needed for storing txn marker in jdbc #38

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
@@ -1 +1,2 @@
.idea/
.project
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
JBoss, Home of Professional Open Source.
Copyright 2018, Red Hat, Inc., and individual contributors
as indicated by the @author tags. See the copyright.txt file in the
distribution for a full listing of individual contributors.

This is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.

This software is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<module xmlns="urn:jboss:module:1.1" name="io.narayana.openshift-recovery">

<main-class name="io.narayana.openshift.txrecovery.Main"/>

<resources>
<resource-root path="txn-recovery-marker-jdbc-common.jar"/>
<resource-root path="txn-recovery-marker-jdbc-hibernate5.jar"/>
</resources>

<dependencies>
<module name="javax.persistence.api"/>
<module name="org.hibernate"/>
<module name="org.jboss.logging"/>
<module name="org.postgresql" optional="true"/>
<module name="com.mysql" optional="true"/>
</dependencies>
</module>
5 changes: 5 additions & 0 deletions jboss-eap-cd-openshift-modules/configure.sh
Expand Up @@ -3,12 +3,17 @@ set -e

SCRIPT_DIR=$(dirname $0)
ADDED_DIR=${SCRIPT_DIR}/added
SOURCES_DIR="/tmp/artifacts"
VERSION_TXN_MARKER="1.1.2.Final-redhat-00001"

# Add new "openshift" layer
# includes module definitions for OpenShift PING and OAuth
# (also includes overridden JGroups, AS Clustering Common/JGroups, and EE for OpenShift PING)
# Remove any existing destination files first (which might be symlinks)
cp -rp --remove-destination "$ADDED_DIR/modules" "$JBOSS_HOME/"

cp -p "${SOURCES_DIR}/txn-recovery-marker-jdbc-common-${VERSION_TXN_MARKER}.jar" "$JBOSS_HOME/modules/system/layers/openshift/io/narayana/openshift-recovery/main/txn-recovery-marker-jdbc-common.jar"
cp -p "${SOURCES_DIR}/txn-recovery-marker-jdbc-hibernate5-${VERSION_TXN_MARKER}.jar" "$JBOSS_HOME/modules/system/layers/openshift/io/narayana/openshift-recovery/main/txn-recovery-marker-jdbc-hibernate5.jar"

chown -R jboss:root $JBOSS_HOME
chmod -R g+rwX $JBOSS_HOME
6 changes: 6 additions & 0 deletions jboss-eap-cd-openshift-modules/module.yaml
Expand Up @@ -5,3 +5,9 @@ description: jboss.eap.cd.openshift.modules script package.
execute:
- script: configure.sh
user: '185'

artifacts:
- path: txn-recovery-marker-jdbc-common-1.1.2.Final-redhat-00001.jar
md5: 252aa2b4bcded8e5bf8a7087ad7bbbeb
- path: txn-recovery-marker-jdbc-hibernate5-1.1.2.Final-redhat-00001.jar
md5: cd68ad886a759d21f8dd0cb7646601ee