diff --git a/build.xml b/build.xml index a0ed5c9d..4fbd1c16 100644 --- a/build.xml +++ b/build.xml @@ -19,27 +19,28 @@ - - - - + + + - + - - - - + + + + @@ -107,11 +108,12 @@ - + + diff --git a/libraries/CTP.jar b/libraries/CTP.jar index 236cbb49..41d39362 100644 Binary files a/libraries/CTP.jar and b/libraries/CTP.jar differ diff --git a/libraries/commons-compress-1.0.jar b/libraries/commons-compress-1.0.jar deleted file mode 100644 index 78d832c1..00000000 Binary files a/libraries/commons-compress-1.0.jar and /dev/null differ diff --git a/libraries/commons-compress-1.27.1.jar b/libraries/commons-compress-1.27.1.jar new file mode 100644 index 00000000..1bea2d9c Binary files /dev/null and b/libraries/commons-compress-1.27.1.jar differ diff --git a/libraries/ftp/commons-logging-1.2.jar b/libraries/ftp/commons-logging-1.2.jar deleted file mode 100644 index 93a3b9f6..00000000 Binary files a/libraries/ftp/commons-logging-1.2.jar and /dev/null differ diff --git a/libraries/ftp/commons-logging-1.3.6.jar b/libraries/ftp/commons-logging-1.3.6.jar new file mode 100644 index 00000000..399a2fc2 Binary files /dev/null and b/libraries/ftp/commons-logging-1.3.6.jar differ diff --git a/libraries/ftp/commons-net-3.13.0.jar b/libraries/ftp/commons-net-3.13.0.jar new file mode 100644 index 00000000..b8229f8a Binary files /dev/null and b/libraries/ftp/commons-net-3.13.0.jar differ diff --git a/libraries/ftp/commons-net-3.3.jar b/libraries/ftp/commons-net-3.3.jar deleted file mode 100644 index f4f19a90..00000000 Binary files a/libraries/ftp/commons-net-3.3.jar and /dev/null differ diff --git a/libraries/ftp/commons-vfs2-2.0.jar b/libraries/ftp/commons-vfs2-2.0.jar deleted file mode 100644 index 5e1b0b4d..00000000 Binary files a/libraries/ftp/commons-vfs2-2.0.jar and /dev/null differ diff --git a/libraries/ftp/commons-vfs2-2.10.0.jar b/libraries/ftp/commons-vfs2-2.10.0.jar new file mode 100644 index 00000000..cf5182ed Binary files /dev/null and b/libraries/ftp/commons-vfs2-2.10.0.jar differ diff --git a/libraries/ftp/jsch-0.1.53.jar b/libraries/ftp/jsch-0.1.55.jar similarity index 52% rename from libraries/ftp/jsch-0.1.53.jar rename to libraries/ftp/jsch-0.1.55.jar index 2e4c69d6..1a64e71d 100644 Binary files a/libraries/ftp/jsch-0.1.53.jar and b/libraries/ftp/jsch-0.1.55.jar differ diff --git a/libraries/log4j/log4j-1.2-api-2.17.2.jar b/libraries/log4j/log4j-1.2-api-2.17.2.jar deleted file mode 100644 index bff129dc..00000000 Binary files a/libraries/log4j/log4j-1.2-api-2.17.2.jar and /dev/null differ diff --git a/libraries/log4j/log4j-1.2-api-2.26.0.jar b/libraries/log4j/log4j-1.2-api-2.26.0.jar new file mode 100644 index 00000000..07b59a76 Binary files /dev/null and b/libraries/log4j/log4j-1.2-api-2.26.0.jar differ diff --git a/libraries/log4j/log4j-api-2.17.2.jar b/libraries/log4j/log4j-api-2.17.2.jar deleted file mode 100644 index a03f3151..00000000 Binary files a/libraries/log4j/log4j-api-2.17.2.jar and /dev/null differ diff --git a/libraries/log4j/log4j-api-2.26.0.jar b/libraries/log4j/log4j-api-2.26.0.jar new file mode 100644 index 00000000..840048c7 Binary files /dev/null and b/libraries/log4j/log4j-api-2.26.0.jar differ diff --git a/libraries/log4j/log4j-core-2.17.2.jar b/libraries/log4j/log4j-core-2.17.2.jar deleted file mode 100644 index fbc0641d..00000000 Binary files a/libraries/log4j/log4j-core-2.17.2.jar and /dev/null differ diff --git a/libraries/log4j/log4j-core-2.26.0.jar b/libraries/log4j/log4j-core-2.26.0.jar new file mode 100644 index 00000000..d8632609 Binary files /dev/null and b/libraries/log4j/log4j-core-2.26.0.jar differ diff --git a/libraries/util.jar b/libraries/util.jar index 9faabe93..9c877a29 100644 Binary files a/libraries/util.jar and b/libraries/util.jar differ diff --git a/products/CTP-installer.jar b/products/CTP-installer.jar index 55eb57fa..ed472257 100644 Binary files a/products/CTP-installer.jar and b/products/CTP-installer.jar differ diff --git a/source/files/log4j.properties b/source/files/log4j.properties deleted file mode 100644 index bdddd458..00000000 --- a/source/files/log4j.properties +++ /dev/null @@ -1,55 +0,0 @@ -# Logging Configuration - -# set root logger level to ERROR and give it an appender -log4j.rootLogger = ERROR, RootAppender - -# make the appender -log4j.appender.RootAppender = org.apache.log4j.DailyRollingFileAppender - -# give it a layout -log4j.appender.RootAppender.layout = org.apache.log4j.PatternLayout -log4j.appender.RootAppender.layout.ConversionPattern = %d{HH:mm:ss} %-5p [%c{1}] %m%n - -# set the filename -log4j.appender.RootAppender.File = logs/ctp.log - -# set the datepattern -log4j.appender.RootAppender.DatePattern = '.'yyyy-MM-dd - -#-------------------------------- -# set the starting logger levels -#-------------------------------- -log4j.logger.gov = WARN -log4j.logger.edu = INFO -log4j.logger.org = WARN -log4j.logger.org.rsna = INFO -log4j.logger.mirc = INFO -log4j.logger.com = INFO - -#TEST -#log4j.logger.edu.uams.tcia.PosdaExportService = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.PollingHttpImportService = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.PolledHttpExportService = DEBUG -#log4j.logger.org.rsna.ctp.servlets.PolledServlet = DEBUG -#log4j.logger.org.rsna.ctp.pipeline.Pipeline = DEBUG -#log4j.logger.org.rsna.ctp.pipeline.AbstractImportService = DEBUG - -#log4j.logger.org.rsna.ctp.stdstages.dicom.DicomStorageSCP = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.FileStorageService = DEBUG; - -#log4j.logger.org.rsna.ctp.stdstages.DicomPixelAnonymizer = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.anonymizer.dicom.DICOMPixelAnonymizer = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.anonymizer.dicom.PrivateTagIndex = DEBUG - -#log4j.logger.org.rsna.ctp.pipeline.AbstractExportService = DEBUG -#log4j.logger.org.rsna.ctp.pipeline.AbstractQueuedExportService = DEBUG -#log4j.logger.org.rsna.ctp.pipeline.AbstractImportService = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.HttpImportService = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.HttpExportService = DEBUG -#log4j.logger.org.rsna.service.HttpService = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.DicomSTOWRSExportService = DEBUG -#log4j.logger.org.rsna.ctp.stdstages.DicomSTOWRSImportService = DEBUG - -#log4j.logger.org.rsna.server.Authenticator = DEBUG -#log4j.logger.org.rsna.server.UsersOpenAMImpl = DEBUG -#log4j.logger.org.rsna.isn = OFF diff --git a/source/files/log4j2.xml b/source/files/log4j2.xml new file mode 100644 index 00000000..5110dc36 --- /dev/null +++ b/source/files/log4j2.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/java/org/rsna/ctp/ClinicalTrialProcessor.java b/source/java/org/rsna/ctp/ClinicalTrialProcessor.java index 8039d1ec..f2d4d807 100644 --- a/source/java/org/rsna/ctp/ClinicalTrialProcessor.java +++ b/source/java/org/rsna/ctp/ClinicalTrialProcessor.java @@ -146,13 +146,6 @@ public ClinicalTrialProcessor() { //Initialize Log4J File logs = new File("logs"); logs.mkdirs(); - File logProps = new File("log4j.properties"); - String propsPath = logProps.getAbsolutePath(); - if (!logProps.exists()) { - System.out.println("Logger configuration file: "+propsPath); - System.out.println("Logger configuration file not found."); - } - PropertyConfigurator.configure(propsPath); logger = Logger.getLogger(ClinicalTrialProcessor.class); //Instantiate the singleton Cache, clear it, and preload