tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprImpl.java
Date Thu, 24 Mar 2005 15:31:16 GMT
remm        2005/03/24 07:31:16

  Modified:    jk/java/org/apache/jk/common ChannelSocket.java
                        ChannelJni.java
               jk/java/org/apache/jk/server JkCoyoteHandler.java
               jk/java/org/apache/jk/apr AprImpl.java
  Log:
  - Fix messages.
  
  Revision  Changes    Path
  1.53      +4 -4      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
  
  Index: ChannelSocket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- ChannelSocket.java	29 Jan 2005 19:29:55 -0000	1.52
  +++ ChannelSocket.java	24 Mar 2005 15:31:16 -0000	1.53
  @@ -59,7 +59,7 @@
   */
   
   /**
  - *  Jk2 can use multiple protocols/transports.
  + *  Jk can use multiple protocols/transports.
    *  Various container adapters should load this object ( as a bean ),
    *  set configurations and use it. Note that the connector will handle
    *  all incoming protocols - it's not specific to ajp1x. The protocol
  @@ -70,7 +70,7 @@
   /** Accept ( and send ) TCP messages.
    *
    * @author Costin Manolache
  - * @jmx:mbean name="jk2:service=ChannelSocket"
  + * @jmx:mbean name="jk:service=ChannelSocket"
    *            description="Accept socket connections"
    * @jmx:notification name="org.apache.coyote.INVOKE
    * @jmx:notification-handler name="org.apache.jk.JK_SEND_PACKET
  @@ -336,7 +336,7 @@
           if (startPort == 0) {
               port = 0;
               if(log.isInfoEnabled())
  -                log.info("JK2: ajp13 disabling channelSocket");
  +                log.info("JK: ajp13 disabling channelSocket");
               running = true;
               return;
           }
  @@ -363,7 +363,7 @@
               return;
           }
           if(log.isInfoEnabled())
  -            log.info("JK2: ajp13 listening on " + getAddress() + ":" + port );
  +            log.info("JK: ajp13 listening on " + getAddress() + ":" + port );
   
           // If this is not the base port and we are the 'main' channleSocket and
           // SHM didn't already set the localId - we'll set the instance id
  
  
  
  1.19      +1 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
  
  Index: ChannelJni.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ChannelJni.java	15 Oct 2004 04:42:25 -0000	1.18
  +++ ChannelJni.java	24 Mar 2005 15:31:16 -0000	1.19
  @@ -43,7 +43,7 @@
           
           // We'll be called from C. This deals with that.
           apr.addJkHandler( "channelJni", this );        
  -        log.info("JK2: listening on channel.jni:jni" );
  +        log.info("JK: listening on channel.jni:jni" );
           
           if( next==null ) {
               if( nextName!=null ) 
  
  
  
  1.60      +1 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
  
  Index: JkCoyoteHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- JkCoyoteHandler.java	3 Feb 2005 03:36:57 -0000	1.59
  +++ JkCoyoteHandler.java	24 Mar 2005 15:31:16 -0000	1.60
  @@ -53,7 +53,7 @@
   import org.apache.tomcat.util.http.MimeHeaders;
   import org.apache.tomcat.util.net.SSLSupport;
   
  -/** Plugs Jk2 into Coyote. Must be named "type=JkHandler,name=container"
  +/** Plugs Jk into Coyote. Must be named "type=JkHandler,name=container"
    *
    * @jmx:notification-handler name="org.apache.jk.SEND_PACKET
    * @jmx:notification-handler name="org.apache.coyote.ACTION_COMMIT
  
  
  
  1.32      +1 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
  
  Index: AprImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- AprImpl.java	31 May 2004 04:48:54 -0000	1.31
  +++ AprImpl.java	24 Mar 2005 15:31:16 -0000	1.32
  @@ -207,7 +207,7 @@
               initialize();
               jkSetAttribute(0, 0, "channel:jni", "starting");
               
  -            log.info("JK2: Initialized apr" );
  +            log.info("JK: Initialized apr" );
               
           } catch( Throwable t ) {
               throw new IOException( t.toString() );
  
  
  

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


Mime
View raw message