Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 59529 invoked from network); 13 Nov 2005 07:26:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Nov 2005 07:26:07 -0000 Received: (qmail 32692 invoked by uid 500); 13 Nov 2005 07:26:01 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 32659 invoked by uid 500); 13 Nov 2005 07:26:01 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 32648 invoked by uid 500); 13 Nov 2005 07:26:01 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 32645 invoked by uid 99); 13 Nov 2005 07:26:01 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 12 Nov 2005 23:26:01 -0800 Received: (qmail 59449 invoked by uid 65534); 13 Nov 2005 07:25:41 -0000 Message-ID: <20051113072541.59448.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r332935 - in /tomcat/sandbox/java/org/apache/coyote: adapters/JsAdapter.java standalone/Main.java Date: Sun, 13 Nov 2005 07:25:40 -0000 To: tomcat-dev@jakarta.apache.org From: costin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: costin Date: Sat Nov 12 23:25:39 2005 New Revision: 332935 URL: http://svn.apache.org/viewcvs?rev=332935&view=rev Log: Use the real mapper, remove old unused code Modified: tomcat/sandbox/java/org/apache/coyote/adapters/JsAdapter.java tomcat/sandbox/java/org/apache/coyote/standalone/Main.java Modified: tomcat/sandbox/java/org/apache/coyote/adapters/JsAdapter.java URL: http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/adapters/JsAdapter.java?rev=332935&r1=332934&r2=332935&view=diff ============================================================================== --- tomcat/sandbox/java/org/apache/coyote/adapters/JsAdapter.java (original) +++ tomcat/sandbox/java/org/apache/coyote/adapters/JsAdapter.java Sat Nov 12 23:25:39 2005 @@ -149,7 +149,7 @@ ScriptableObject.putProperty(mainScope, "server", jsOut); Counters ct = (Counters) proto.getAdapter(); - Mapper mp = (Mapper) ct.getNext(); + MapperAdapter mp = (MapperAdapter) ct.getNext(); FileAdapter fa = (FileAdapter) mp.getDefaultAdapter(); jsOut = Context.javaToJS(ct, mainScope); Modified: tomcat/sandbox/java/org/apache/coyote/standalone/Main.java URL: http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/standalone/Main.java?rev=332935&r1=332934&r2=332935&view=diff ============================================================================== --- tomcat/sandbox/java/org/apache/coyote/standalone/Main.java (original) +++ tomcat/sandbox/java/org/apache/coyote/standalone/Main.java Sat Nov 12 23:25:39 2005 @@ -1,9 +1,15 @@ package org.apache.coyote.standalone; +import java.util.Enumeration; +import java.util.Hashtable; + +import org.apache.coyote.Adapter; import org.apache.coyote.adapters.Counters; import org.apache.coyote.adapters.HelloWorldAdapter; -import org.apache.coyote.adapters.Mapper; +import org.apache.coyote.adapters.MapperAdapter; import org.apache.coyote.http11.Http11BaseProtocol; +import org.apache.tomcat.util.loader.Loader; +import org.apache.tomcat.util.loader.Repository; /** @@ -13,7 +19,7 @@ public class Main { protected Http11BaseProtocol proto; - protected Mapper mainAdapter; + protected MapperAdapter mainAdapter; public Main() { } @@ -25,7 +31,7 @@ public void init() { proto = new Http11BaseProtocol(); - mainAdapter = new Mapper(); + mainAdapter = new MapperAdapter(); mainAdapter.addAdapter("/hello", new HelloWorldAdapter()); Counters cnt=new Counters(); @@ -55,6 +61,52 @@ } } + + /** Load the handler table. Just a hack, I'll find a better solution + */ + public void initHandlers() { + + Hashtable prefixMap=new Hashtable(); + Enumeration keys=System.getProperties().keys(); + + Loader loader=null; + if( loader == null ) { + // Not started from loader, we are embedded - create the loader, so we + // can do reloading. + //LoaderProperties.setPropertiesFile(""); + try { + loader=new Loader(); + ClassLoader myL=this.getClass().getClassLoader(); + loader.setParentClassLoader( myL ); + loader.init(); + } catch( Throwable t ) { + t.printStackTrace(); + } + } + + Repository sR=loader.getRepository("shared"); + // Construct handlers. Handlers will be created, they can get the protocol + // if they need additional init + + while( keys.hasMoreElements()) { + String n=(String)keys.nextElement(); + if( n.startsWith("handler.")) { + String cls=System.getProperty( n ); + String map=n.substring(8); + Adapter hC=null; + try { + // use the loader's server common repository + Class c=sR.getClassLoader().loadClass(cls); + //Class c=Class.forName(cls); + hC=(Adapter)c.newInstance(); + prefixMap.put( map, hC ); + } catch( Throwable t ) { + t.printStackTrace(); + } + } + } + } + // ------------------- Main --------------------- public static void main( String args[]) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org