perfsonar development work

Author: michael.bischoff
Date: 2008-06-02 20:11:13 -0400 (Mon, 02 Jun 2008)
New Revision: 3943

Removed:
   
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
Modified:
   trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Pipe.java
Log:
fixed some open tasks
removed generated file server-config.wsdd

Deleted: 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd

Modified: trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties        
2008-06-02 23:41:56 UTC (rev 3942)
+++ trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties        
2008-06-03 00:11:13 UTC (rev 3943)
@@ -13,11 +13,11 @@
 log4j.appender.FILE.MaxFileSize=10MB 
 log4j.appender.FILE.MaxBackupIndex=10 
 log4j.appender.FILE.layout=org.apache.log4j.PatternLayout 
-log4j.appender.FILE.layout.ConversionPattern=%p [%t] (%F:%L) %c - %m%n
+log4j.appender.FILE.layout.ConversionPattern=%p [%t] %c - %m%n
 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%5p [%t] (%F:%L) %c - %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=%5p [%t] %c - %m%n
 
 log4j.logger.sonar-debug=DEBUG, FILE, CONSOLE
 log4j.logger.sonar-info=INFO, FILE, CONSOLE

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
  2008-06-02 23:41:56 UTC (rev 3942)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
  2008-06-03 00:11:13 UTC (rev 3943)
@@ -139,8 +139,6 @@
                                        Integer value = task.take().get();
                                        resultValues.add(value);
                                } catch (ExecutionException e) {
-                                       e.printStackTrace(); //FIXME remove
-                                       
                                        if(e.getCause() != null) {
                                                
logger.error("processNewFile() nfreplaytask failed " + 
e.getCause().getLocalizedMessage());
                                        } else {

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Pipe.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Pipe.java
      2008-06-02 23:41:56 UTC (rev 3942)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Pipe.java
      2008-06-03 00:11:13 UTC (rev 3943)
@@ -55,11 +55,6 @@
                        target.write(i);
                        
                        bytesWrittenCount++;
-                       //TODO evaluate need
-//                     if(bytesWrittenCount >= flushAfterThisManyBytes) {
-//                             bytesWrittenCount = 0;
-//                             target.flush(); 
-//                     }
                }
                
                destroy();