Return-Path: 
 <tomcat-dev-return-16211-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 80347 invoked from network); 13 Aug 2002 16:30:56 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 13 Aug 2002 16:30:56 -0000
Received: (qmail 504 invoked by uid 97); 13 Aug 2002 16:31:16 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 459 invoked by uid 97); 13 Aug 2002 16:31:15 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 448 invoked by uid 97); 13 Aug 2002 16:31:15 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 13 Aug 2002 16:30:44 -0000
Message-ID: <20020813163044.15471.qmail@icarus.apache.org>
From: remm@apache.org
To: jakarta-tomcat-catalina-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-catalina/webapps/admin build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

remm        2002/08/13 09:30:44

  Modified:    webapps/admin build.xml
  Log:
  - Use the new APIs home.
  
  Revision  Changes    Path
  1.3       +13 -5     jakarta-tomcat-catalina/webapps/admin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	26 Jul 2002 15:29:35 -0000	1.2
  +++ build.xml	13 Aug 2002 16:30:44 -0000	1.3
  @@ -17,13 +17,15 @@
     <property name="webapp.name"     value="admin"/>
   
     <!-- Dependent JARs and files -->
  -  <property name="servlet.jar" value="${api.home}/dist/lib/servlet.jar"/>
  +  <property name="servlet-api.jar" value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
  +  <property name="jsp-api.jar"     value="${api.home}/jsr152/dist/lib/jsp-api.jar"/>
   
     <!-- Construct Admin classpath -->
     <path id="admin.classpath">
       <pathelement location="${commons-modeler.jar}"/>
       <pathelement location="${jmx.jar}"/>
  -    <pathelement location="${servlet.jar}"/>
  +    <pathelement location="${servlet-api.jar}"/>
  +    <pathelement location="${jsp-api.jar}"/>
       <pathelement location="${struts.jar}"/>
     </path>
   
  @@ -58,7 +60,10 @@
        classpath="${commons-modeler.jar}"/>
       <available property="servlet.present"
        classname="javax.servlet.Servlet"
  -     classpath="${servlet.jar}" />
  +     classpath="${servlet-api.jar}" />
  +    <available property="jsp.present"
  +     classname="javax.servlet.jsp.JspPage"
  +     classpath="${jsp-api.jar}" />
       <available property="struts.present"
        classname="org.apache.struts.action.ActionForm"
        classpath="${struts.jar}" />
  @@ -66,7 +71,8 @@
       <!-- JAR files availability flags -->
       <available property="jmx.jar.present"   file="${jmx.jar}" />
       <available property="modeler.jar.present" file="${commons-modeler.jar}" />
  -    <available property="servlet.jar.present" file="${servlet.jar}" />
  +    <available property="servlet-api.jar.present" file="${servlet-api.jar}" />
  +    <available property="jsp-api.jar.present" file="${jsp-api.jar}" />
       <available property="struts.jar.present"  file="${struts.jar}" />
   
       <!-- Conditional compilation flags (determined from the flags above) -->
  @@ -122,11 +128,13 @@
       <echo message="jmx.present=${jmx.present}" />
       <echo message="modeler.present=${modeler.present}" />
       <echo message="servlet.present=${servlet.present}" />
  +    <echo message="jsp.present=${jsp.present}" />
   
       <echo message="--- Required JARs ---" />
       <echo message="jmx.jar.present=${jmx.jar.present}" />
       <echo message="modeler.jar.present=${modeler.jar.present}" />
  -    <echo message="servlet.jar.present=${servlet.jar.present}" />
  +    <echo message="servlet-api.jar.present=${servlet-api.jar.present}" />
  +    <echo message="jsp-api.jar.present=${jsp-api.jar.present}" />
       <echo message="struts.jar.present=${struts.jar.present}" />
   
       <echo message="--- Optional JARs ---" />
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>