Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 73312 invoked from network); 30 Jul 2007 02:06:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jul 2007 02:06:03 -0000 Received: (qmail 42302 invoked by uid 500); 30 Jul 2007 02:06:03 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 42259 invoked by uid 500); 30 Jul 2007 02:06:03 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 42250 invoked by uid 99); 30 Jul 2007 02:06:03 -0000 Received: from Unknown (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Jul 2007 19:06:03 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2007 02:06:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2BF291A981A; Sun, 29 Jul 2007 19:05:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r560841 - in /incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty: JettyHTTPServerEngine.java Messages.properties spring/JettyHTTPServerEngineBeanDefinitionParser.java Date: Mon, 30 Jul 2007 02:05:41 -0000 To: cxf-commits@incubator.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070730020542.2BF291A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Sun Jul 29 19:05:39 2007 New Revision: 560841 URL: http://svn.apache.org/viewvc?view=rev&rev=560841 Log: Better http-jetty spring parsing exception message and replaced 'servant' with 'jetty handler' from the service logging message Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?view=diff&rev=560841&r1=560840&r2=560841 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Sun Jul 29 19:05:39 2007 @@ -287,7 +287,7 @@ try { context.start(); } catch (Exception ex) { - LOG.log(Level.WARNING, "ADD_SERVANT_FAILED_MSG", new Object[] {ex.getMessage()}); + LOG.log(Level.WARNING, "ADD_HANDLER_FAILED_MSG", new Object[] {ex.getMessage()}); } } @@ -318,7 +318,7 @@ handler.stop(); handler.destroy(); } catch (Exception ex) { - LOG.log(Level.WARNING, "REMOVE_SERVANT_FAILED_MSG", + LOG.log(Level.WARNING, "REMOVE_HANDLER_FAILED_MSG", new Object[] {ex.getMessage()}); } Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?view=diff&rev=560841&r1=560840&r2=560841 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties Sun Jul 29 19:05:39 2007 @@ -19,6 +19,6 @@ # # START_UP_SERVER_FAILED_MSG = Could not start Jetty server: {0} -ADD_SERVANT_FAILED_MSG = Could not add servant to Jetty server: {0} -REMOVE_SERVANT_FAILED_MSG = Could not remove servant from Jetty server: {0} +ADD_HANDLER_FAILED_MSG = Could not add cxf jetty handler to Jetty server: {0} +REMOVE_HANDLER_FAILED_MSG = Could not remove cxf jetty handler from Jetty server: {0} CAN_NOT_FIND_HANDLER_MSG = Could not find the handler to remove for context url {0} Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java?view=diff&rev=560841&r1=560840&r2=560841 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java Sun Jul 29 19:05:39 2007 @@ -77,7 +77,7 @@ TLSServerParametersIdentifiedType.class); TLSServerParameters param = - getServerParameters(engineFactoryProperties, parameterTypeRef.getId()); + getTlsServerParameters(engineFactoryProperties, parameterTypeRef.getId()); bean.addPropertyValue("tlsServerParameters", param); } else if ("threadingParameters".equals(name)) { @@ -122,21 +122,21 @@ } - private TLSServerParameters getServerParameters( + private TLSServerParameters getTlsServerParameters( MutablePropertyValues engineFactoryProperties, String reference) { TLSServerParameters result = null; PropertyValue tlsParameterMapValue = engineFactoryProperties.getPropertyValue("tlsServerParametersMap"); if (null == tlsParameterMapValue) { - throw new RuntimeException("Could not find the tlsParametersMap " + throw new RuntimeException("Could not find the tlsServerParametersMap " + "from the JettyHTTPServerEngineFactory!"); } else { Map tlsServerParametersMap = (Map)tlsParameterMapValue.getValue(); result = (TLSServerParameters)tlsServerParametersMap.get(reference); if (result == null) { - throw new RuntimeException("Could not find the reference [" + throw new RuntimeException("Could not find the tlsServerParamentersMap reference [" + reference + "]'s mapping tlsParameter"); } } @@ -156,7 +156,7 @@ Map threadingParametersMap = (Map)threadingParametersMapValue.getValue(); result = (ThreadingParameters)threadingParametersMap.get(reference); if (result == null) { - throw new RuntimeException("Could not find the reference [" + throw new RuntimeException("Could not find the threadingParametersMap reference [" + reference + "]'s mapping threadingParameters"); } }