Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,28 @@
<pathelement location="${libraries}/util.jar"/>
<pathelement location="${libraries}/dcm4che.jar"/>
<pathelement location="${libraries}/getopt.jar"/>
<!--<pathelement location="${libraries}/log4j.jar"/>-->
<pathelement location="${libraries}/log4j/log4j-1.2-api-2.17.2.jar"/>
<pathelement location="${libraries}/log4j/log4j-api-2.17.2.jar"/>
<pathelement location="${libraries}/log4j/log4j-core-2.17.2.jar"/>
<pathelement location="${libraries}/log4j/log4j-1.2-api-2.26.0.jar"/>
<pathelement location="${libraries}/log4j/log4j-api-2.26.0.jar"/>
<pathelement location="${libraries}/log4j/log4j-core-2.26.0.jar"/>
<pathelement location="${libraries}/edtftpj.jar"/>
<pathelement location="${libraries}/jdbm.jar"/>
<pathelement location="${libraries}/commons-compress-1.0.jar"/>
<pathelement location="${libraries}/commons-compress-1.27.1.jar"/>
<pathelement location="${libraries}/imageio/jai_imageio-1.2-pre-dr-b04.jar"/>
<pathelement location="${libraries}/imageio/pixelmed_codec.jar"/>
<pathelement location="${libraries}/email/activation.jar"/>
<pathelement location="${libraries}/email/mailapi.jar"/>
<pathelement location="${libraries}/email/mail.jar"/>
<pathelement location="${libraries}/ftp/commons-logging-1.2.jar"/>
<pathelement location="${libraries}/ftp/commons-net-3.3.jar"/>
<pathelement location="${libraries}/ftp/commons-vfs2-2.0.jar"/>
<pathelement location="${libraries}/ftp/jsch-0.1.53.jar"/>
<pathelement location="${libraries}/ftp/commons-logging-1.3.6.jar"/>
<pathelement location="${libraries}/ftp/commons-net-3.13.0.jar"/>
<pathelement location="${libraries}/ftp/commons-vfs2-2.10.0.jar"/>
<pathelement location="${libraries}/ftp/jsch-0.1.55.jar"/>
</path>

<property name="jarclasspath" value="
libraries/util.jar
libraries/log4j.jar
libraries/log4j/log4j-1.2-api-2.26.0.jar
libraries/log4j/log4j-api-2.26.0.jar
libraries/log4j/log4j-core-2.26.0.jar
"/>

<target name="clean">
Expand Down Expand Up @@ -107,11 +108,12 @@
<attribute name="Main-Class" value="org.rsna.ctp.ClinicalTrialProcessor"/>
<attribute name="Date" value="${today} at ${now}"/>
<attribute name="Java-Version" value="${java.version}"/>
<attribute name="Class-Path" value="util.jar log4j.jar"/>
<attribute name="Class-Path" value="util.jar log4j/log4j-api-2.26.0.jar log4j/log4j-core-2.26.0.jar log4j/log4j-1.2-api-2.26.0.jar"/>
</manifest>
<fileset dir="${build}"
includes="**"
excludes="${installer}/**, ${launcher}/**, ${runner}/** CTP/Launcher.jar CTP/Runner.jar" />
<fileset dir="${files}" includes="log4j2.xml"/>
</jar>

</target>
Expand Down
Binary file modified libraries/CTP.jar
Binary file not shown.
Binary file removed libraries/commons-compress-1.0.jar
Binary file not shown.
Binary file added libraries/commons-compress-1.27.1.jar
Binary file not shown.
Binary file removed libraries/ftp/commons-logging-1.2.jar
Binary file not shown.
Binary file added libraries/ftp/commons-logging-1.3.6.jar
Binary file not shown.
Binary file added libraries/ftp/commons-net-3.13.0.jar
Binary file not shown.
Binary file removed libraries/ftp/commons-net-3.3.jar
Binary file not shown.
Binary file removed libraries/ftp/commons-vfs2-2.0.jar
Binary file not shown.
Binary file added libraries/ftp/commons-vfs2-2.10.0.jar
Binary file not shown.
Binary file not shown.
Binary file removed libraries/log4j/log4j-1.2-api-2.17.2.jar
Binary file not shown.
Binary file added libraries/log4j/log4j-1.2-api-2.26.0.jar
Binary file not shown.
Binary file removed libraries/log4j/log4j-api-2.17.2.jar
Binary file not shown.
Binary file added libraries/log4j/log4j-api-2.26.0.jar
Binary file not shown.
Binary file removed libraries/log4j/log4j-core-2.17.2.jar
Binary file not shown.
Binary file added libraries/log4j/log4j-core-2.26.0.jar
Binary file not shown.
Binary file modified libraries/util.jar
Binary file not shown.
Binary file modified products/CTP-installer.jar
Binary file not shown.
55 changes: 0 additions & 55 deletions source/files/log4j.properties

This file was deleted.

23 changes: 23 additions & 0 deletions source/files/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" ?>
<Configuration name="Log4j1">
<Appenders>
<RollingFile name="RootAppender" fileName="logs/ctp.log" filePattern="logs/ctp.log.%d{yyyy-MM-dd}">
<PatternLayout pattern="%d{HH:mm:ss} %-5p [%c{1}] %m%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
</Policies>
<DefaultRolloverStrategy max="2147483647" fileIndex="min"/>
</RollingFile>
</Appenders>
<Loggers>
<Root level="ERROR">
<AppenderRef ref="RootAppender"/>
</Root>
<Logger name="gov" level="WARN"/>
<Logger name="edu" level="INFO"/>
<Logger name="mirc" level="INFO"/>
<Logger name="com" level="INFO"/>
<Logger name="org.rsna" level="INFO"/>
<Logger name="org" level="WARN"/>
</Loggers>
</Configuration>
7 changes: 0 additions & 7 deletions source/java/org/rsna/ctp/ClinicalTrialProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down