svn commit: r480556 - in /incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm: logging.properties src/demo/ws_rm/common/ConciseFormatter.java src/demo/ws_rm/server/GreeterImplInternal.java

[an...@apache.org]

Author: andreasmyth
Date: Wed Nov 29 04:48:32 2006
New Revision: 480556

URL: http://svn.apache.org/viewvc?view=rev&rev=480556
Log:
Removed accidentally added file GreeterImplInternal.java.
Used same formatter as in addressing demo to improve readability output of demo.

Added:
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java   (with props)
Removed:
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/server/GreeterImplInternal.java
Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/logging.properties

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/logging.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/logging.properties?view=diff&rev=480556&r1=480555&r2=480556
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/logging.properties (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/logging.properties Wed Nov 29 04:48:32 2006
@@ -36,6 +36,7 @@
 
 # To also add the FileHandler, use the following line instead.
 #handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.formatter = demos.ws_rm.common.ConciseFormatter
 
 # Default global logging level.
 # This specifies which kinds of events are logged across
@@ -57,8 +58,9 @@
 java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
 
 # Limit the message that are printed on the console to WARNING and above.
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.level = INFO
+#java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.formatter = demos.ws_rm.common.ConciseFormatter
 
 
 ############################################################

Added: incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java?view=auto&rev=480556
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java Wed Nov 29 04:48:32 2006
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package demos.ws_rm.common;
+
+import java.util.logging.LogRecord;
+import java.util.logging.SimpleFormatter;
+
+public class ConciseFormatter extends SimpleFormatter {
+    public synchronized String format(LogRecord record) {
+        String longForm = super.format(record);
+        String shortForm = longForm.indexOf("INFO: ") > 0
+                           ? longForm.substring(longForm.indexOf("INFO: ") + 6)
+                           : longForm;
+        return shortForm;
+    }
+}

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/ConciseFormatter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date