Return-Path: <mandar@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 60343 invoked by uid 500); 22 Feb 2000 21:56:13 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 60340 invoked by uid 1054); 22 Feb 2000 21:56:13 -0000
Date: 22 Feb 2000 21:56:13 -0000
Message-ID: <20000222215613.60339.qmail@locus.apache.org>
From: mandar@locus.apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service
 TcpEndpoint.java

mandar      00/02/22 13:56:12

  Modified:    src/share/org/apache/jasper/compiler Tag: latest_TOMCAT_30
                        TagBeginGenerator.java
               src/share/org/apache/tomcat/service Tag: latest_TOMCAT_30
                        TcpEndpoint.java
  Log:
  selected fixes to the patch.
  
  Added "Webservice started" debug msg.
  Fixed some tag SetP. stuff.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.2   +19 -15    jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java
  
  Index: TagBeginGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- TagBeginGenerator.java	2000/02/02 23:30:39	1.7.2.1
  +++ TagBeginGenerator.java	2000/02/22 21:56:12	1.7.2.2
  @@ -170,22 +170,26 @@
   	    for(int i = 0; i < attributes.length; i++) {
                   String attrValue = (String) attrs.get(attributes[i].getName());
                   if (attrValue != null) {
  -
  -                   String attrName = attributes[i].getName();
  +		    
  +		    if (attributes[i].canBeRequestTime()) {
  +			if (JspUtil.isExpression(attrValue))
  +			    attrValue = JspUtil.getExpr(attrValue);
  +			else
  +			    attrValue = writer.quoteString(attrValue);
  +		    } else
  +			attrValue = writer.quoteString(attrValue);
  +		    
  +		    String attrName = attributes[i].getName();
  +		    Method m = tc.getSetterMethod(attrName);
   		    
  -		    if (!JspUtil.isExpression (attrValue)) {
  -			writer.println("JspRuntimeLibrary.introspecthelper(" +
  -				       thVarName + ",\"" + attrName +
  -				       "\",\"" + JspUtil.escapeQueryString(attrValue) +
  -				       "\",null,null,false);");
  -		    } else {
  -			
  -			// This requires some careful handling.
  -			// int, boolean, ... are not Object(s).
  -			writer.println("JspRuntimeLibrary.handleSetProperty(" +
  -				       thVarName + ",\"" + attrName +
  -				       "\"," + JspUtil.getExpr(attrValue) + ");");
  -		    }
  +		    if (m == null)
  +			throw new JasperException
  +			    (Constants.getString
  +			     ("jsp.error.unable.to_find_method",
  +			      new Object[] { attrName }));
  +		    
  +		    writer.println(thVarName+"."+m.getName()+"("+attrValue+");");
  +
                   }
               }
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.2   +8 -3      jakarta-tomcat/src/share/org/apache/tomcat/service/TcpEndpoint.java
  
  Index: TcpEndpoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/TcpEndpoint.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- TcpEndpoint.java	2000/02/14 00:10:53	1.4.2.1
  +++ TcpEndpoint.java	2000/02/22 21:56:12	1.4.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/TcpEndpoint.java,v 1.4.2.1 2000/02/14 00:10:53 mandar Exp $
  - * $Revision: 1.4.2.1 $
  - * $Date: 2000/02/14 00:10:53 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/TcpEndpoint.java,v 1.4.2.2 2000/02/22 21:56:12 mandar Exp $
  + * $Revision: 1.4.2.2 $
  + * $Date: 2000/02/22 21:56:12 $
    *
    * ====================================================================
    *
  @@ -209,6 +209,11 @@
   	}
   	running=true;
   	//System.out.println("Starting tcp endpoint on " + port + " with " + handler.getClass().getName());
  +
  +	String messg = sm.getString("endptmgr.created",
  +				    (new Integer(port)).toString());
  +	System.out.println(messg);
  +	
   	listener=new TcpListenerThread( this );
   	Thread thread = new Thread(listener);
   	thread.start();