[WebMacro-cvs] webmacro/src/org/webmacro/servlet ServletBroker.java,1.7,1.8

[<wan...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv8771

Modified Files:
	ServletBroker.java 
Log Message:
Fixed linebreaks

Index: ServletBroker.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ServletBroker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ServletBroker.java	4 Jun 2003 12:14:54 -0000	1.7
--- ServletBroker.java	4 Jun 2003 12:25:20 -0000	1.8
***************
*** 1,138 ****
! /*
!  * Copyright (C) 1998-2000 Semiotek Inc.  All Rights Reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted under the terms of either of the following
!  * Open Source licenses:
!  *
!  * The GNU General Public License, version 2, or any later version, as
!  * published by the Free Software Foundation
!  * (http://www.fsf.org/copyleft/gpl.html);
!  *
!  *  or
!  *
!  * The Semiotek Public License (http://webmacro.org/LICENSE.)
!  *
!  * This software is provided "as is", with NO WARRANTY, not even the
!  * implied warranties of fitness to purpose, or merchantability. You
!  * assume all risks and liabilities associated with its use.
!  *
!  * See www.webmacro.org for more information on the WebMacro project.
!  */
! 
! 
! /**
!  * Base class for servlet brokers.
!  * @see Servlet20Broker
!  * @see Servlet22Broker
!  * @see Broker
!  * @author Brian Goetz
!  * @since 0.96
!  */
! package org.webmacro.servlet;
! 
! import java.util.*;
! import javax.servlet.*;
! 
! import org.webmacro.Broker;
! import org.webmacro.InitException;
! import org.webmacro.util.Settings;
! 
! abstract public class ServletBroker extends Broker {
! 
!    protected ServletContext _servletContext;
! 
!      /**
!       * Tracks ServletContexts we have been instantiated for, to prevent
!       * duplicate log targets where multiple ServletBroker instances are
!       * created. We use WeakHashMap instead of Set because it does the
!       * key polled removal for us.
!       */
!      private static Map servletContextsWithLogTargets = new WeakHashMap();
! 
!      protected ServletBroker(ServletContext sc) throws InitException {
!       super((Broker) null, sc.toString());
!       _servletContext = sc;
!    }
! 
!    public void initLog(Settings config) {
!       String logFile = config.getSetting("LogFile");
!       if ((logFile == null || logFile.equals(""))
!             && _config.getBooleanSetting("LogUsingServletLog"))
!          addLogTarget();
!       else
!          initLog();
!    }
! 
!      private void addLogTarget()
!      {
!           synchronized (servletContextsWithLogTargets)
!           {
!                if (!servletContextsWithLogTargets.containsKey(_servletContext))
!                {
!                     _ls.addTarget( new ServletLog( _servletContext, _config ));
!                     servletContextsWithLogTargets.put( _servletContext, Boolean.TRUE);
!                }
!           }
!      }
! 
!      public static Broker getBroker(Servlet s, Properties additionalProperties) throws InitException {
!       int minorVersion, majorVersion;
! 
!       ServletContext sc = s.getServletConfig().getServletContext();
!       try {
!          majorVersion = sc.getMajorVersion();
!          minorVersion = sc.getMinorVersion();
!       }
!       catch (NoSuchMethodError e) {
!          majorVersion = 2;
!          minorVersion = 0;
!       }
! 
!       Broker b;
!       if (majorVersion > 2
!             || (majorVersion == 2 && minorVersion >= 2))
!          b = Servlet22Broker.getBroker(s, additionalProperties);
!       else
!          b = Servlet20Broker.getBroker(s, additionalProperties);
!       b.startClient();
!       return b;
!    }
! 
!    public static Broker getBroker(Servlet s) throws InitException {
!        return getBroker(s, null);
!    }
! 
!    public ServletContext getServletContext() {
!       return _servletContext;
!    }
! 
!    protected static final class PropertiesPair {
!        private final Object obj;
!        private final Properties p;
! 
!        public PropertiesPair(Object s, Properties p) {
!            this.obj = s;
!            this.p = p;
!        }
! 
!        public boolean equals(Object o) {
!            if (this == o) return true;
!            if (!(o instanceof PropertiesPair)) return false;
! 
!            final PropertiesPair servletPropertiesPair = (PropertiesPair) o;
! 
!            if (!p.equals(servletPropertiesPair.p)) return false;
!            if (!obj.equals(servletPropertiesPair.obj)) return false;
! 
!            return true;
!        }
! 
!        public int hashCode() {
!            int result;
!            result = obj.hashCode();
!            result = 29 * result + p.hashCode();
!            return result;
!        }
!    }
! }
--- 1,138 ----
! /*
!  * Copyright (C) 1998-2000 Semiotek Inc.  All Rights Reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted under the terms of either of the following
!  * Open Source licenses:
!  *
!  * The GNU General Public License, version 2, or any later version, as
!  * published by the Free Software Foundation
!  * (http://www.fsf.org/copyleft/gpl.html);
!  *
!  *  or
!  *
!  * The Semiotek Public License (http://webmacro.org/LICENSE.)
!  *
!  * This software is provided "as is", with NO WARRANTY, not even the
!  * implied warranties of fitness to purpose, or merchantability. You
!  * assume all risks and liabilities associated with its use.
!  *
!  * See www.webmacro.org for more information on the WebMacro project.
!  */
! 
! 
! /**
!  * Base class for servlet brokers.
!  * @see Servlet20Broker
!  * @see Servlet22Broker
!  * @see Broker
!  * @author Brian Goetz
!  * @since 0.96
!  */
! package org.webmacro.servlet;
! 
! import java.util.*;
! import javax.servlet.*;
! 
! import org.webmacro.Broker;
! import org.webmacro.InitException;
! import org.webmacro.util.Settings;
! 
! abstract public class ServletBroker extends Broker {
! 
!    protected ServletContext _servletContext;
! 
!      /**
!       * Tracks ServletContexts we have been instantiated for, to prevent
!       * duplicate log targets where multiple ServletBroker instances are
!       * created. We use WeakHashMap instead of Set because it does the
!       * key polled removal for us.
!       */
!      private static Map servletContextsWithLogTargets = new WeakHashMap();
! 
!      protected ServletBroker(ServletContext sc) throws InitException {
!       super((Broker) null, sc.toString());
!       _servletContext = sc;
!    }
! 
!    public void initLog(Settings config) {
!       String logFile = config.getSetting("LogFile");
!       if ((logFile == null || logFile.equals(""))
!             && _config.getBooleanSetting("LogUsingServletLog"))
!          addLogTarget();
!       else
!          initLog();
!    }
! 
!      private void addLogTarget()
!      {
!           synchronized (servletContextsWithLogTargets)
!           {
!                if (!servletContextsWithLogTargets.containsKey(_servletContext))
!                {
!                     _ls.addTarget( new ServletLog( _servletContext, _config ));
!                     servletContextsWithLogTargets.put( _servletContext, Boolean.TRUE);
!                }
!           }
!      }
! 
!      public static Broker getBroker(Servlet s, Properties additionalProperties) throws InitException {
!       int minorVersion, majorVersion;
! 
!       ServletContext sc = s.getServletConfig().getServletContext();
!       try {
!          majorVersion = sc.getMajorVersion();
!          minorVersion = sc.getMinorVersion();
!       }
!       catch (NoSuchMethodError e) {
!          majorVersion = 2;
!          minorVersion = 0;
!       }
! 
!       Broker b;
!       if (majorVersion > 2
!             || (majorVersion == 2 && minorVersion >= 2))
!          b = Servlet22Broker.getBroker(s, additionalProperties);
!       else
!          b = Servlet20Broker.getBroker(s, additionalProperties);
!       b.startClient();
!       return b;
!    }
! 
!    public static Broker getBroker(Servlet s) throws InitException {
!        return getBroker(s, null);
!    }
! 
!    public ServletContext getServletContext() {
!       return _servletContext;
!    }
! 
!    protected static final class PropertiesPair {
!        private final Object obj;
!        private final Properties p;
! 
!        public PropertiesPair(Object s, Properties p) {
!            this.obj = s;
!            this.p = p;
!        }
! 
!        public boolean equals(Object o) {
!            if (this == o) return true;
!            if (!(o instanceof PropertiesPair)) return false;
! 
!            final PropertiesPair servletPropertiesPair = (PropertiesPair) o;
! 
!            if (!p.equals(servletPropertiesPair.p)) return false;
!            if (!obj.equals(servletPropertiesPair.obj)) return false;
! 
!            return true;
!        }
! 
!        public int hashCode() {
!            int result;
!            result = obj.hashCode();
!            result = 29 * result + p.hashCode();
!            return result;
!        }
!    }
! }