reworked examples replacing to "server" and "remote" with "receiver"

qos-ch · Apr 11, 2013 · babb52e · babb52e
1 parent 391c120
commit babb52e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 28 deletions.
diff --git a/.../appenders/socket/SocketRemoteServer.java → ...penders/socket/ServerSocketAppender1.java b/.../appenders/socket/SocketRemoteServer.java → ...penders/socket/ServerSocketAppender1.java
@@ -32,11 +32,11 @@
  * {@link ServerSocketAppender} and then allows the user to enter messages
  * which will be relayed to remote clients via this appender.
  */
-public class SocketRemoteServer {
+public class ServerSocketAppender1 {
 
   static void usage(String msg) {
     System.err.println(msg);
-    System.err.println("Usage: java " + SocketRemoteServer.class.getName() +
+    System.err.println("Usage: java " + ServerSocketAppender1.class.getName() +
       " configFile\n" +
       "   configFile a logback configuration file" +
       "   in XML format.");
@@ -58,7 +58,7 @@ static public void main(String[] args) throws Exception {
       configurator.doConfigure(configFile);
     }
 
-    Logger logger = LoggerFactory.getLogger(SocketRemoteServer.class);
+    Logger logger = LoggerFactory.getLogger(ServerSocketAppender1.class);
 
     BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
 

diff --git a/...apters/appenders/socket/SocketServer.java → ...penders/socket/ServerSocketReceiver1.java b/...apters/appenders/socket/SocketServer.java → ...penders/socket/ServerSocketReceiver1.java
@@ -20,14 +20,15 @@
 
 
 /**
- * This application uses an SSLSocketServer that log messages to a
+ * This application uses a SocketAppender that log messages to a
  * server on a host and port specified by the user. It waits for the
  * user to type a message which will be sent to the server.
  * */
-public class SocketServer {
+public class ServerSocketReceiver1 {
+
   static void usage(String msg) {
     System.err.println(msg);
-    System.err.println("Usage: java " + SocketServer.class.getName() +
+    System.err.println("Usage: java " + ServerSocketReceiver1.class.getName() +
       " configFile\n" +
       "   configFile a logback configuration file" +
       "   in XML format.");

diff --git a/.../appenders/socket/SocketRemoteClient.java → ...ers/appenders/socket/SocketReceiver1.java b/.../appenders/socket/SocketRemoteClient.java → ...ers/appenders/socket/SocketReceiver1.java
@@ -28,11 +28,11 @@
  * {@link SocketRemote} and then logs events received from the remote
  * appender to the console.
  */
-public class SocketRemoteClient {
+public class SocketReceiver1 {
 
   static void usage(String msg) {
     System.err.println(msg);
-    System.err.println("Usage: java " + SocketRemoteClient.class.getName() +
+    System.err.println("Usage: java " + SocketReceiver1.class.getName() +
       " configFile\n" +
       "   configFile a logback configuration file" +
       "   in XML format.");

diff --git a/...hapters/appenders/socket/remoteClient.xml → ...ava/chapters/appenders/socket/client2.xml b/...hapters/appenders/socket/remoteClient.xml → ...ava/chapters/appenders/socket/client2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!-- ==================================================================== -->
-<!-- Sample SocketRemote configuration.                                   -->
+<!-- Sample SocketReceiver configuration.                                 -->
 <!-- ==================================================================== -->
 
 <configuration debug="true">
@@ -11,17 +11,17 @@
       <pattern>%date %-5level [%thread] %logger - %message%n</pattern>
     </encoder>
   </appender>
+
+  <root level="DEBUG">
+    <appender-ref ref="CONSOLE" />
+  </root>  
 
-  <remote class="ch.qos.logback.classic.net.SocketRemote">
+  <receiver class="ch.qos.logback.classic.net.SocketReceiver">
     <host>${host}</host>
     <port>${port}</port>
     <reconnectionDelay>10000</reconnectionDelay>
-  </remote>
+  </receiver>
 
-  <root level="DEBUG">
-    <appender-ref ref="CONSOLE" />
-  </root>  
-
 </configuration>
 
 

diff --git a/logback-examples/src/main/java/chapters/appenders/socket/server3.xml b/logback-examples/src/main/java/chapters/appenders/socket/server3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!-- ==================================================================== -->
-<!-- Sample SocketServer configuration.                                 -->
+<!-- Sample ServerSocketReceiver configuration.                           -->
 <!-- ==================================================================== -->
 
 <configuration debug="true">
@@ -16,9 +16,9 @@
     <appender-ref ref="CONSOLE" />
   </root>
 
-  <server class="ch.qos.logback.classic.net.server.SocketServer">
+  <receiver class="ch.qos.logback.classic.net.server.ServerSocketReceiver">
     <port>${port}</port>
-  </server>
+  </receiver>
 
 </configuration>
 

diff --git a/...hapters/appenders/socket/remoteServer.xml → ...ava/chapters/appenders/socket/server4.xml b/...hapters/appenders/socket/remoteServer.xml → ...ava/chapters/appenders/socket/server4.xml
diff --git a/...ers/appenders/socket/ssl/remoteClient.xml → ...chapters/appenders/socket/ssl/client2.xml b/...ers/appenders/socket/ssl/remoteClient.xml → ...chapters/appenders/socket/ssl/client2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!-- ==================================================================== -->
-<!-- Sample SSLSocketRemote configuration.                                -->
+<!-- Sample SSLSocketReceiver configuration.                              -->
 <!-- ==================================================================== -->
 
 <configuration debug="true">
@@ -12,7 +12,11 @@
     </encoder>         
   </appender>
 
-  <remote class="ch.qos.logback.classic.net.SSLSocketRemote">
+  <root level="DEBUG">
+    <appender-ref ref="CONSOLE" />
+  </root>  
+
+  <receiver class="ch.qos.logback.classic.net.SSLSocketReceiver">
     <host>${host}</host>
     <port>${port}</port>
     <reconnectionDelay>10000</reconnectionDelay>
@@ -22,12 +26,8 @@
         <password>${password}</password>
       </trustStore>
     </ssl>
-  </remote>
+  </receiver>
 
-  <root level="DEBUG">
-    <appender-ref ref="CONSOLE" />
-  </root>  
-
 </configuration>
 
 

diff --git a/logback-examples/src/main/java/chapters/appenders/socket/ssl/server2.xml b/logback-examples/src/main/java/chapters/appenders/socket/ssl/server2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!-- ==================================================================== -->
-<!-- Sample SSLSocketServer configuration.                                 -->
+<!-- Sample SSLServerSocketReceiver configuration.                        -->
 <!-- ==================================================================== -->
 
 <configuration debug="true">
@@ -16,15 +16,15 @@
     <appender-ref ref="CONSOLE" />
   </root>
 
-  <server class="ch.qos.logback.classic.net.server.SSLSocketServer">
+  <receiver class="ch.qos.logback.classic.net.server.SSLServerSocketReceiver">
     <port>${port}</port>
     <ssl>
       <keyStore>
         <location>${keystore}</location>
         <password>${password}</password>
       </keyStore>
     </ssl>
-  </server>
+  </receiver>
 
 </configuration>
 

diff --git a/...ers/appenders/socket/ssl/remoteServer.xml → ...chapters/appenders/socket/ssl/server3.xml b/...ers/appenders/socket/ssl/remoteServer.xml → ...chapters/appenders/socket/ssl/server3.xml