Merge pull request #665 from bdecoste/master

Merged by openshift-bot
openshift · Oct 12, 2012 · 0fb4615 · 0fb4615
2 parents 009aa28 + 0c2407c
commit 0fb4615
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/cartridges/openshift-origin-cartridge-jbossews-1.0/info/bin/app_ctl_impl.sh b/cartridges/openshift-origin-cartridge-jbossews-1.0/info/bin/app_ctl_impl.sh
@@ -124,8 +124,7 @@ function threaddump() {
         exit 1
     elif [ -f "$JBOSS_PID_FILE" ]; then
         pid=$(cat $JBOSS_PID_FILE);
-        java_pid=`ps h --ppid $pid -o '%p'`
-        kill -3 $java_pid
+        kill -3 $pid
     else 
         echo "Failed to locate JBOSS PID File"
     fi

diff --git a/cartridges/openshift-origin-cartridge-jbossews-1.0/info/hooks/threaddump b/cartridges/openshift-origin-cartridge-jbossews-1.0/info/hooks/threaddump
@@ -51,4 +51,4 @@ run_as_user "${CARTRIDGE_BASE_PATH}/${cartridge_type}/info/bin/app_ctl.sh thread
 
 client_result "Success"
 client_result ""
-client_result "The thread dump file will be available via: rhc app tail -a $1 -f $cartridge_type/$cartridge_type/standalone/tmp/$cartridge_type.log -o '-n 250'"
+client_result "The thread dump file will be available via: rhc app tail -a $1 -f $cartridge_type/$cartridge_type/logs/catalina.out -o '-n 250'"
diff --git a/cartridges/openshift-origin-cartridge-jbossews-1.0/template/src/main/webapp/index.html b/cartridges/openshift-origin-cartridge-jbossews-1.0/template/src/main/webapp/index.html
@@ -148,16 +148,15 @@ <h1>
 <h2>Sample Applications</h2>
 <p>To get started you can either modify the default war or try one of these samples:
   <ul>
-    <li><a href="https://github.com/openshift/kitchensink-example">https://github.com/openshift/kitchensink-example</a> this quickstart showcases some of the exciting Java EE6 features available on JBoss AS 7.1.</li>
-    <li><a href="https://github.com/openshift/kitchensink-html5-mobile-example">https://github.com/openshift/kitchensink-html5-mobile-example</a> based on kitchensink (above), but with an HTML5 client that displays great on a PC or mobile device.</li>
-    <li><a href="https://github.com/openshift/tweetstream-example">https://github.com/openshift/tweetstream-example</a> a TweetStream example</li>
+    <li><a href="https://github.com/openshift/tomcat6-example">https://github.com/openshift/tomcat6-example</a> this quickstart showcases some of the basic Tomcat6 features available on JBoss EWS 1.0.</li>
   </ul>
 
   <h4>Example usage:</h4>
   <pre>
-  cd kitchensink
-  git remote add upstream -m master git://github.com/openshift/kitchensink-example.git
+  cd tomcat
+  git remote add upstream -m master git://github.com/openshift/tomcat6-example.git
   git pull -s recursive -X theirs upstream master
+  git push
   </pre>
 </p>
 

diff --git a/cartridges/openshift-origin-cartridge-jbossews-2.0/info/bin/app_ctl_impl.sh b/cartridges/openshift-origin-cartridge-jbossews-2.0/info/bin/app_ctl_impl.sh
@@ -127,8 +127,7 @@ function threaddump() {
         exit 1
     elif [ -f "$JBOSS_PID_FILE" ]; then
         pid=$(cat $JBOSS_PID_FILE);
-        java_pid=`ps h --ppid $pid -o '%p'`
-        kill -3 $java_pid
+        kill -3 $pid
     else 
         echo "Failed to locate JBOSS PID File"
     fi

diff --git a/cartridges/openshift-origin-cartridge-jbossews-2.0/info/hooks/threaddump b/cartridges/openshift-origin-cartridge-jbossews-2.0/info/hooks/threaddump
@@ -51,4 +51,4 @@ run_as_user "${CARTRIDGE_BASE_PATH}/${cartridge_type}/info/bin/app_ctl.sh thread
 
 client_result "Success"
 client_result ""
-client_result "The thread dump file will be available via: rhc app tail -a $1 -f $cartridge_type/$cartridge_type/standalone/tmp/$cartridge_type.log -o '-n 250'"
+client_result "The thread dump file will be available via: rhc app tail -a $1 -f $cartridge_type/$cartridge_type/logs/catalina.out -o '-n 250'"
diff --git a/cartridges/openshift-origin-cartridge-jbossews-2.0/template/src/main/webapp/index.html b/cartridges/openshift-origin-cartridge-jbossews-2.0/template/src/main/webapp/index.html
@@ -122,7 +122,7 @@
     <div class="brand-text"><strong>Open</strong>Shift</div>
   </a>
   <h1>
-    Welcome to OpenShift, JBossEWS2.0 (Apache/Tomcat7) Cartridge
+    Welcome to OpenShift, JBossEWS1.0 (Apache/Tomcat6) Cartridge
   </h1>
   <p>
     Place your application here
@@ -148,16 +148,15 @@ <h1>
 <h2>Sample Applications</h2>
 <p>To get started you can either modify the default war or try one of these samples:
   <ul>
-    <li><a href="https://github.com/openshift/kitchensink-example">https://github.com/openshift/kitchensink-example</a> this quickstart showcases some of the exciting Java EE6 features available on JBoss AS 7.1.</li>
-    <li><a href="https://github.com/openshift/kitchensink-html5-mobile-example">https://github.com/openshift/kitchensink-html5-mobile-example</a> based on kitchensink (above), but with an HTML5 client that displays great on a PC or mobile device.</li>
-    <li><a href="https://github.com/openshift/tweetstream-example">https://github.com/openshift/tweetstream-example</a> a TweetStream example</li>
+    <li><a href="https://github.com/openshift/tomcat6-example">https://github.com/openshift/tomcat6-example</a> this quickstart showcases some of the basic Tomcat6 features available on JBoss EWS 1.0.</li>
   </ul>
 
   <h4>Example usage:</h4>
   <pre>
-  cd kitchensink
-  git remote add upstream -m master git://github.com/openshift/kitchensink-example.git
+  cd tomcat
+  git remote add upstream -m master git://github.com/openshift/tomcat6-example.git
   git pull -s recursive -X theirs upstream master
+  git push
   </pre>
 </p>