Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #666 from bdecoste/master

Merged by openshift-bot
  • Loading branch information...
commit a7a0b8343e3d1c31c01ee096dfa2088af6816e62 2 parents 0fb4615 + 6556a7b
OpenShift Bot authored
View
2  cartridges/openshift-origin-cartridge-jbossews-1.0/info/bin/app_ctl_impl.sh
@@ -91,7 +91,7 @@ function start_app() {
export CATALINA_HOME=$APP_JBOSS
export CATALINA_BASE=$APP_JBOSS
${CART_DIR}/jbossews-1.0/bin/tomcat6 start
- PROCESS_ID=`ps -ef | grep tomcat | grep ${OPENSHIFT_GEAR_UUID} | awk '{print $2}'`
+ PROCESS_ID=`ps -ef | grep tomcat | grep ${OPENSHIFT_GEAR_UUID} | grep java | grep jbossews-1.0 | awk '{print $2}'`
echo $PROCESS_ID > $JBOSS_PID_FILE
if ! ishttpup; then
echo "Timed out waiting for http listening port"
View
22 cartridges/openshift-origin-cartridge-jbossews-1.0/info/hooks/conceal-port
@@ -6,7 +6,7 @@ function print_help {
echo "Usage: $0 app-name namespace uuid"
echo "Start a running application"
- echo "$0 $@" | logger -p local0.notice -t openshift_httpd_start
+ echo "$0 $@" | logger -p local0.notice -t openshift_origin_httpd_start
exit 1
}
@@ -27,10 +27,6 @@ source "/etc/openshift/node.conf"
source ${CARTRIDGE_BASE_PATH}/abstract/info/lib/util
CART_NS=$(get_cartridge_namespace_from_path)
-OPENSHIFT_JBOSS_REMOTING_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_REMOTING_PORT")
-OPENSHIFT_JBOSS_CLUSTER_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_CLUSTER_PORT")
-OPENSHIFT_JBOSS_MESSAGING_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_MESSAGING_PORT")
-OPENSHIFT_JBOSS_MESSAGING_THROUGHPUT_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_MESSAGING_THROUGHPUT_PORT")
setup_configure "$1" $2 $3
@@ -41,24 +37,8 @@ rm -f $APP_HOME/.env/OPENSHIFT_${CART_NS}_PROXY_PORT $APP_HOME/.env/OPENSHIFT_${
proxy_port=$(remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_INTERNAL_PORT")
ret=$?
-cluster_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_CLUSTER_PORT")
-ret=$(( $ret | $? ))
-
-remoting_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_REMOTING_PORT")
-ret=$(( $ret | $? ))
-
-messaging_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_MESSAGING_PORT")
-ret=$(( $ret | $? ))
-
-messaging_throughput_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_MESSAGING_THROUGHPUT_PORT")
-ret=$(( $ret | $? ))
-
if [ $ret -ne 0 ]; then
client_error "$proxy_port"
- client_error "$cluster_port"
- client_error "$remoting_port"
- client_error "$messaging_port"
- client_error "$messaging_throughput_port"
exit $ret
fi
exit 0
View
52 cartridges/openshift-origin-cartridge-jbossews-1.0/info/hooks/expose-port
@@ -6,7 +6,7 @@ function print_help {
echo "Usage: $0 app-name namespace uuid"
echo "Start a running application"
- echo "$0 $@" | logger -p local0.notice -t openshift_export_port
+ echo "$0 $@" | logger -p local0.notice -t openshift_origin_export_port
exit 1
}
@@ -32,8 +32,6 @@ setup_configure "$1" $2 $3
import_env_vars
-OPENSHIFT_JBOSS_CLUSTER_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_CLUSTER_PORT")
-
proxy_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_INTERNAL_PORT")
ret=$?
if [ $ret -ne 0 ]; then
@@ -41,38 +39,6 @@ if [ $ret -ne 0 ]; then
exit $ret
fi
-cluster_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_CLUSTER_PORT")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_INTERNAL_PORT" &>/dev/null || :
- client_error "$cluster_port"
- exit $ret
-fi
-
-messaging_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5445")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5445" &>/dev/null || :
- client_error "$messaging_port"
- exit $ret
-fi
-
-messaging_throughput_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5455")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5455" &>/dev/null || :
- client_error "$messaging_throughput_port"
- exit $ret
-fi
-
-remoting_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:4447")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:4447" &>/dev/null || :
- client_error "$remoting_port"
- exit $ret
-fi
-
echo "export OPENSHIFT_${CART_NS}_PROXY_PORT=$proxy_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_PROXY_PORT
cart_data "PROXY_HOST=$OPENSHIFT_GEAR_DNS"
cart_data "PROXY_PORT=$proxy_port"
@@ -80,20 +46,4 @@ cart_data "HOST=$OPENSHIFT_INTERNAL_IP"
cart_data "PORT=$OPENSHIFT_INTERNAL_PORT"
-echo "export OPENSHIFT_${CART_NS}_CLUSTER_PROXY_PORT=$cluster_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_CLUSTER_PROXY_PORT
-cart_data "${CART_NS}_CLUSTER_PROXY_HOST=$OPENSHIFT_GEAR_DNS"
-cart_data "${CART_NS}_CLUSTER_PROXY_PORT=$cluster_port"
-cart_data "${CART_NS}_CLUSTER_HOST=$OPENSHIFT_INTERNAL_IP"
-cart_data "${CART_NS}_CLUSTER_PORT=$OPENSHIFT_JBOSS_CLUSTER_PORT"
-
-echo "export OPENSHIFT_${CART_NS}_MESSAGING_PORT=$messaging_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_MESSAGING_PORT
-cart_data "${CART_NS}_MESSAGING_PORT=$messaging_port"
-
-echo "export OPENSHIFT_${CART_NS}_MESSAGING_THROUGHPUT_PORT=$messaging_throughput_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_MESSAGING_THROUGHPUT_PORT
-cart_data "${CART_NS}_MESSAGING_THROUGHPUT_PORT=$messaging_throughput_port"
-
-echo "export OPENSHIFT_${CART_NS}_REMOTING_PORT=$remoting_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_REMOTING_PORT
-cart_data "${CART_NS}_REMOTING_PORT=$remoting_port"
-
-
exit 0
View
15 cartridges/openshift-origin-cartridge-jbossews-1.0/info/hooks/show-port
@@ -6,7 +6,7 @@ function print_help {
echo "Usage: $0 app-name namespace uuid"
echo "Start a running application"
- echo "$0 $@" | logger -p local0.notice -t openshift_httpd_start
+ echo "$0 $@" | logger -p local0.notice -t openshift_origin_httpd_start
exit 1
}
@@ -27,7 +27,6 @@ source "/etc/openshift/node.conf"
source ${CARTRIDGE_BASE_PATH}/abstract/info/lib/util
CART_NS=$(get_cartridge_namespace_from_path)
-OPENSHIFT_JBOSS_CLUSTER_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_CLUSTER_PORT")
setup_configure "$1" $2 $3
@@ -40,13 +39,6 @@ if [ $ret -ne 0 ]; then
exit 0
fi
-cluster_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_CLUSTER_PORT")
-ret=$?
-if [ $ret -ne 0 ]; then
- client_result "No proxy ports defined"
- exit 0
-fi
-
cart_data "PROXY_HOST=$OPENSHIFT_GEAR_DNS"
cart_data "PROXY_PORT=$proxy_port"
cart_data "HOST=$OPENSHIFT_INTERNAL_IP"
@@ -55,11 +47,6 @@ cart_data "PORT=$OPENSHIFT_INTERNAL_PORT"
cart_data "${CART_NS}_CLUSTER_PROXY_HOST=$OPENSHIFT_GEAR_DNS"
cart_data "${CART_NS}_CLUSTER_PROXY_PORT=$cluster_port"
cart_data "${CART_NS}_CLUSTER_HOST=$OPENSHIFT_INTERNAL_IP"
-cart_data "${CART_NS}_CLUSTER_PORT=$OPENSHIFT_JBOSS_CLUSTER_PORT"
-
-cart_data "${CART_NS}_MESSAGING_PORT=$messaging_port"
-cart_data "${CART_NS}_MESSAGING_THROUGHPUT_PORT=$messaging_throughput_port"
-cart_data "${CART_NS}_REMOTING_PORT=$remoting_port"
exit 0
View
1  cartridges/openshift-origin-cartridge-jbossews-1.0/info/manifest.yml
@@ -89,4 +89,3 @@ Profiles:
Scaling:
Min: 1
Max: -1
-Default-Profile: standalone
View
2  cartridges/openshift-origin-cartridge-jbossews-2.0/info/bin/app_ctl_impl.sh
@@ -93,7 +93,7 @@ function start_app() {
export CATALINA_BASE=$APP_JBOSS
echo "!!!!!!!!!!! tomcat7 $CATALINA_HOME $OPENSHIFT_GEAR_UUID" 1>&2
${CART_DIR}/jbossews-2.0/bin/tomcat7 start
- PROCESS_ID=`ps -ef | grep tomcat | grep ${OPENSHIFT_GEAR_UUID} | awk '{print $2}'`
+ PROCESS_ID=`ps -ef | grep tomcat | grep ${OPENSHIFT_GEAR_UUID} | grep java | grep jbossews-1.0 | awk '{print $2}'`
echo "!!!!!!!!!!! PROCESS_ID $PROCESS_ID $JBOSS_PID_FILE" 1>&2
echo $PROCESS_ID > $JBOSS_PID_FILE
if ! ishttpup; then
View
22 cartridges/openshift-origin-cartridge-jbossews-2.0/info/hooks/conceal-port
@@ -6,7 +6,7 @@ function print_help {
echo "Usage: $0 app-name namespace uuid"
echo "Start a running application"
- echo "$0 $@" | logger -p local0.notice -t openshift_httpd_start
+ echo "$0 $@" | logger -p local0.notice -t openshift_origin_httpd_start
exit 1
}
@@ -27,10 +27,6 @@ source "/etc/openshift/node.conf"
source ${CARTRIDGE_BASE_PATH}/abstract/info/lib/util
CART_NS=$(get_cartridge_namespace_from_path)
-OPENSHIFT_JBOSS_REMOTING_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_REMOTING_PORT")
-OPENSHIFT_JBOSS_CLUSTER_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_CLUSTER_PORT")
-OPENSHIFT_JBOSS_MESSAGING_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_MESSAGING_PORT")
-OPENSHIFT_JBOSS_MESSAGING_THROUGHPUT_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_MESSAGING_THROUGHPUT_PORT")
setup_configure "$1" $2 $3
@@ -41,24 +37,8 @@ rm -f $APP_HOME/.env/OPENSHIFT_${CART_NS}_PROXY_PORT $APP_HOME/.env/OPENSHIFT_${
proxy_port=$(remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_INTERNAL_PORT")
ret=$?
-cluster_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_CLUSTER_PORT")
-ret=$(( $ret | $? ))
-
-remoting_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_REMOTING_PORT")
-ret=$(( $ret | $? ))
-
-messaging_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_MESSAGING_PORT")
-ret=$(( $ret | $? ))
-
-messaging_throughput_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_MESSAGING_THROUGHPUT_PORT")
-ret=$(( $ret | $? ))
-
if [ $ret -ne 0 ]; then
client_error "$proxy_port"
- client_error "$cluster_port"
- client_error "$remoting_port"
- client_error "$messaging_port"
- client_error "$messaging_throughput_port"
exit $ret
fi
exit 0
View
52 cartridges/openshift-origin-cartridge-jbossews-2.0/info/hooks/expose-port
@@ -6,7 +6,7 @@ function print_help {
echo "Usage: $0 app-name namespace uuid"
echo "Start a running application"
- echo "$0 $@" | logger -p local0.notice -t openshift_export_port
+ echo "$0 $@" | logger -p local0.notice -t openshift_origin_export_port
exit 1
}
@@ -32,8 +32,6 @@ setup_configure "$1" $2 $3
import_env_vars
-OPENSHIFT_JBOSS_CLUSTER_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_CLUSTER_PORT")
-
proxy_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_INTERNAL_PORT")
ret=$?
if [ $ret -ne 0 ]; then
@@ -41,38 +39,6 @@ if [ $ret -ne 0 ]; then
exit $ret
fi
-cluster_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_CLUSTER_PORT")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_INTERNAL_PORT" &>/dev/null || :
- client_error "$cluster_port"
- exit $ret
-fi
-
-messaging_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5445")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5445" &>/dev/null || :
- client_error "$messaging_port"
- exit $ret
-fi
-
-messaging_throughput_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5455")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:5455" &>/dev/null || :
- client_error "$messaging_throughput_port"
- exit $ret
-fi
-
-remoting_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:4447")
-ret=$?
-if [ $ret -ne 0 ]; then
- remove_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:4447" &>/dev/null || :
- client_error "$remoting_port"
- exit $ret
-fi
-
echo "export OPENSHIFT_${CART_NS}_PROXY_PORT=$proxy_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_PROXY_PORT
cart_data "PROXY_HOST=$OPENSHIFT_GEAR_DNS"
cart_data "PROXY_PORT=$proxy_port"
@@ -80,20 +46,4 @@ cart_data "HOST=$OPENSHIFT_INTERNAL_IP"
cart_data "PORT=$OPENSHIFT_INTERNAL_PORT"
-echo "export OPENSHIFT_${CART_NS}_CLUSTER_PROXY_PORT=$cluster_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_CLUSTER_PROXY_PORT
-cart_data "${CART_NS}_CLUSTER_PROXY_HOST=$OPENSHIFT_GEAR_DNS"
-cart_data "${CART_NS}_CLUSTER_PROXY_PORT=$cluster_port"
-cart_data "${CART_NS}_CLUSTER_HOST=$OPENSHIFT_INTERNAL_IP"
-cart_data "${CART_NS}_CLUSTER_PORT=$OPENSHIFT_JBOSS_CLUSTER_PORT"
-
-echo "export OPENSHIFT_${CART_NS}_MESSAGING_PORT=$messaging_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_MESSAGING_PORT
-cart_data "${CART_NS}_MESSAGING_PORT=$messaging_port"
-
-echo "export OPENSHIFT_${CART_NS}_MESSAGING_THROUGHPUT_PORT=$messaging_throughput_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_MESSAGING_THROUGHPUT_PORT
-cart_data "${CART_NS}_MESSAGING_THROUGHPUT_PORT=$messaging_throughput_port"
-
-echo "export OPENSHIFT_${CART_NS}_REMOTING_PORT=$remoting_port" > $APP_HOME/.env/OPENSHIFT_${CART_NS}_REMOTING_PORT
-cart_data "${CART_NS}_REMOTING_PORT=$remoting_port"
-
-
exit 0
View
15 cartridges/openshift-origin-cartridge-jbossews-2.0/info/hooks/show-port
@@ -6,7 +6,7 @@ function print_help {
echo "Usage: $0 app-name namespace uuid"
echo "Start a running application"
- echo "$0 $@" | logger -p local0.notice -t openshift_httpd_start
+ echo "$0 $@" | logger -p local0.notice -t openshift_origin_httpd_start
exit 1
}
@@ -27,7 +27,6 @@ source "/etc/openshift/node.conf"
source ${CARTRIDGE_BASE_PATH}/abstract/info/lib/util
CART_NS=$(get_cartridge_namespace_from_path)
-OPENSHIFT_JBOSS_CLUSTER_PORT=$(get_env_var_dynamic "OPENSHIFT_${CART_NS}_CLUSTER_PORT")
setup_configure "$1" $2 $3
@@ -40,13 +39,6 @@ if [ $ret -ne 0 ]; then
exit 0
fi
-cluster_port=$(find_next_proxy_port $uuid "$OPENSHIFT_INTERNAL_IP:$OPENSHIFT_JBOSS_CLUSTER_PORT")
-ret=$?
-if [ $ret -ne 0 ]; then
- client_result "No proxy ports defined"
- exit 0
-fi
-
cart_data "PROXY_HOST=$OPENSHIFT_GEAR_DNS"
cart_data "PROXY_PORT=$proxy_port"
cart_data "HOST=$OPENSHIFT_INTERNAL_IP"
@@ -55,11 +47,6 @@ cart_data "PORT=$OPENSHIFT_INTERNAL_PORT"
cart_data "${CART_NS}_CLUSTER_PROXY_HOST=$OPENSHIFT_GEAR_DNS"
cart_data "${CART_NS}_CLUSTER_PROXY_PORT=$cluster_port"
cart_data "${CART_NS}_CLUSTER_HOST=$OPENSHIFT_INTERNAL_IP"
-cart_data "${CART_NS}_CLUSTER_PORT=$OPENSHIFT_JBOSS_CLUSTER_PORT"
-
-cart_data "${CART_NS}_MESSAGING_PORT=$messaging_port"
-cart_data "${CART_NS}_MESSAGING_THROUGHPUT_PORT=$messaging_throughput_port"
-cart_data "${CART_NS}_REMOTING_PORT=$remoting_port"
exit 0
Please sign in to comment.
Something went wrong with that request. Please try again.