Merge pull request #2550 from ironcladlou/bz/965012

Merged by openshift-bot
openshift · May 20, 2013 · aaaa1dd · aaaa1dd
2 parents 83d7d63 + a1ab888
commit aaaa1dd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/cartridges/openshift-origin-cartridge-jbossas/bin/install b/cartridges/openshift-origin-cartridge-jbossas/bin/install
@@ -18,12 +18,15 @@ cp ${OPENSHIFT_JBOSSAS_DIR}/standalone/configuration/standalone.xml ${OPENSHIFT_
 
 sed -i "s/{APP_NAME}/${OPENSHIFT_APP_NAME}/g" ${OPENSHIFT_JBOSSAS_DIR}/template/pom.xml
 
-cp ${OPENSHIFT_JBOSSAS_DIR}/template/deployments/ROOT.war $OPENSHIFT_JBOSSAS_DIR/standalone/deployments
+# Create and install the initial template WAR
+pushd $OPENSHIFT_JBOSSAS_DIR/versions/${version}/template/src/main/webapp 1> /dev/null
+  jar cvf $OPENSHIFT_JBOSSAS_DIR/standalone/deployments/ROOT.war ./*
+popd 1> /dev/null
 
 JBOSS_HOME=/etc/alternatives/jbossas-$version
-pushd $OPENSHIFT_JBOSSAS_DIR > /dev/null
+pushd $OPENSHIFT_JBOSSAS_DIR 1> /dev/null
   ln -s ${JBOSS_HOME}/jboss-modules.jar
   ln -s ${JBOSS_HOME}/modules
-popd > /dev/null
+popd 1> /dev/null
 
 update-configuration java7
diff --git a/cartridges/openshift-origin-cartridge-jbossas/versions/7/template/deployments/ROOT.war b/cartridges/openshift-origin-cartridge-jbossas/versions/7/template/deployments/ROOT.war
diff --git a/cartridges/openshift-origin-cartridge-jbosseap/bin/install b/cartridges/openshift-origin-cartridge-jbosseap/bin/install
@@ -18,12 +18,15 @@ cp ${OPENSHIFT_JBOSSEAP_DIR}/standalone/configuration/standalone.xml ${OPENSHIFT
 
 sed -i "s/{APP_NAME}/${OPENSHIFT_APP_NAME}/g" ${OPENSHIFT_JBOSSEAP_DIR}/template/pom.xml
 
-cp ${OPENSHIFT_JBOSSEAP_DIR}/template/deployments/ROOT.war $OPENSHIFT_JBOSSEAP_DIR/standalone/deployments
+# Create and install the initial template WAR
+pushd $OPENSHIFT_JBOSSEAP_DIR/versions/${version}/template/src/main/webapp 1>/dev/null
+  jar cvf $OPENSHIFT_JBOSSEAP_DIR/standalone/deployments/ROOT.war ./*
+popd 1> /dev/null
 
 JBOSS_HOME=/etc/alternatives/jbosseap-$version
-pushd $OPENSHIFT_JBOSSEAP_DIR > /dev/null
+pushd $OPENSHIFT_JBOSSEAP_DIR 1> /dev/null
   ln -s ${JBOSS_HOME}/jboss-modules.jar
   ln -s ${JBOSS_HOME}/modules
-popd > /dev/null
+popd 1> /dev/null
 
 update-configuration java7
diff --git a/cartridges/openshift-origin-cartridge-jbosseap/versions/6.0/template/deployments/ROOT.war b/cartridges/openshift-origin-cartridge-jbosseap/versions/6.0/template/deployments/ROOT.war
diff --git a/cartridges/openshift-origin-cartridge-jbossews/bin/install b/cartridges/openshift-origin-cartridge-jbossews/bin/install
@@ -14,9 +14,9 @@ echo "$version" > "$OPENSHIFT_JBOSSEWS_DIR/env/OPENSHIFT_JBOSSEWS_VERSION"
 ln -s ${OPENSHIFT_REPO_DIR}/webapps ${OPENSHIFT_JBOSSEWS_DIR}/webapps
 
 # Create and install the initial template WAR
-pushd $OPENSHIFT_JBOSSEWS_DIR/template/src/main/webapp
+pushd $OPENSHIFT_JBOSSEWS_DIR/template/src/main/webapp 1>/dev/null
   jar cvf $OPENSHIFT_JBOSSEWS_DIR/template/webapps/ROOT.war ./*
-popd
+popd 1>/dev/null
 
 # Set up the default path and JAVA_HOME
 export JAVA_HOME=$OPENSHIFT_JBOSSEWS_JDK7