From commits-return-5676-apmail-oodt-commits-archive=oodt.apache.org@oodt.apache.org Wed Aug 7 22:22:00 2013 Return-Path: X-Original-To: apmail-oodt-commits-archive@www.apache.org Delivered-To: apmail-oodt-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 584BB10A18 for ; Wed, 7 Aug 2013 22:22:00 +0000 (UTC) Received: (qmail 90894 invoked by uid 500); 7 Aug 2013 22:22:00 -0000 Delivered-To: apmail-oodt-commits-archive@oodt.apache.org Received: (qmail 90858 invoked by uid 500); 7 Aug 2013 22:22:00 -0000 Mailing-List: contact commits-help@oodt.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@oodt.apache.org Delivered-To: mailing list commits@oodt.apache.org Received: (qmail 90851 invoked by uid 99); 7 Aug 2013 22:21:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Aug 2013 22:21:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Aug 2013 22:21:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E785D23888E2; Wed, 7 Aug 2013 22:21:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1511518 - in /oodt/trunk: CHANGES.txt webapp/fmprod/pom.xml webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml webapp/fmprod/src/main/webapp/META-INF/context.xml Date: Wed, 07 Aug 2013 22:21:35 -0000 To: commits@oodt.apache.org From: rlaidlaw@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130807222135.E785D23888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rlaidlaw Date: Wed Aug 7 22:21:35 2013 New Revision: 1511518 URL: http://svn.apache.org/r1511518 Log: OODT-650: Removed duplicate context container example. Removed: oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml Modified: oodt/trunk/CHANGES.txt oodt/trunk/webapp/fmprod/pom.xml oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml Modified: oodt/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1511518&r1=1511517&r2=1511518&view=diff ============================================================================== --- oodt/trunk/CHANGES.txt (original) +++ oodt/trunk/CHANGES.txt Wed Aug 7 22:21:35 2013 @@ -4,6 +4,9 @@ Apache OODT Change Log Release 0.7 - Current Development --------------------------------- +* OODT-650 Remove duplicate context container example from CAS-Product web + application (rlaidlaw) + * OODT-649 Add PathUtils.replaceEnvVariables wrapper around calls to context.getInitParameter to process environment variables (rlaidlaw) Modified: oodt/trunk/webapp/fmprod/pom.xml URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/fmprod/pom.xml?rev=1511518&r1=1511517&r2=1511518&view=diff ============================================================================== --- oodt/trunk/webapp/fmprod/pom.xml (original) +++ oodt/trunk/webapp/fmprod/pom.xml Wed Aug 7 22:21:35 2013 @@ -39,9 +39,13 @@ ${basedir}/src/test/java + maven-war-plugin - 2.1.1 + 2.4 @@ -54,17 +58,9 @@ META-INF/ - src/main/webapp - - src/main/resources/cas-product-tomcat-5.5.9.xml - - maven-assembly-plugin Modified: oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml?rev=1511518&r1=1511517&r2=1511518&view=diff ============================================================================== --- oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml (original) +++ oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml Wed Aug 7 22:21:35 2013 @@ -1,3 +1,4 @@ +