openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1682246 - /openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat6.sh
Date Thu, 28 May 2015 13:51:37 GMT
Author: struberg
Date: Thu May 28 13:51:36 2015
New Revision: 1682246

URL: http://svn.apache.org/r1682246
Log:
OWB-1077 also add an install script for tomcat6 integration of OWB

Added:
    openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat6.sh
      - copied, changed from r1682245, openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat7.sh

Copied: openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat6.sh (from
r1682245, openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat7.sh)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat6.sh?p2=openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat6.sh&p1=openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat7.sh&r1=1682245&r2=1682246&rev=1682246&view=diff
==============================================================================
--- openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat7.sh (original)
+++ openwebbeans/trunk/distribution/src/main/install_scripts/install_owb_tomcat6.sh Thu May
28 13:51:36 2015
@@ -84,18 +84,18 @@ cp spi/openwebbeans-spi-*.jar "$CATALINA
 
 cp plugins/openwebbeans-web-*.jar "$CATALINA_HOME"/lib/
 cp plugins/openwebbeans-el22-*.jar "$CATALINA_HOME"/lib/
-cp plugins/openwebbeans-tomcat7-*.jar "$CATALINA_HOME"/lib/
+cp plugins/openwebbeans-tomcat6-*.jar "$CATALINA_HOME"/lib/
 cp plugins/openwebbeans-jsf-*.jar "$CATALINA_HOME"/lib/openwebbeans-jsf.jar.disabled
 
 
 # -----------------------------------------------------------------------------
-# as last step we add the OWB tomcat7 listener
+# as last step we add the OWB tomcat(6) listener
 # -----------------------------------------------------------------------------
 echo "OWB_INSTALLER: add OpenWebBeans ContextLifecycleListener to ${CATALINA_HOME}/conf/context.xml"
 
-if grep -q "tomcat7.ContextLifecycleListener" "${CATALINA_HOME}"/conf/context.xml ; then
+if grep -q "tomcat.ContextLifecycleListener" "${CATALINA_HOME}"/conf/context.xml ; then
     echo "OpenWebBeans context already in place"
 else
     sed -i -- 's/<Context>/<Context>\
-    <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" \/>/g'
"${CATALINA_HOME}"/conf/context.xml
+    <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" \/>/g'
"${CATALINA_HOME}"/conf/context.xml
 fi



Mime
View raw message