From 85195603b9a6e7a0426fbf25be5d4c18e89cb241 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Wed, 4 May 2016 16:14:01 -0500
Subject: [PATCH] Removed changes that accidentally got in last commit.
---
config/xnat-conf.properties | 22 ------
.../helpers/prearchive/DatabaseSession.java | 1 -
.../helpers/prearchive/PrearcDatabase.java | 7 --
.../modules/actions/XDATForgotLogin.java | 1 -
.../turbine/modules/screens/ForgotLogin.java | 23 -------
.../modules/screens/XDATScreen_email.java | 67 -------------------
6 files changed, 121 deletions(-)
delete mode 100644 config/xnat-conf.properties
delete mode 100644 src/main/java/org/nrg/xnat/turbine/modules/screens/ForgotLogin.java
delete mode 100644 src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_email.java
diff --git a/config/xnat-conf.properties b/config/xnat-conf.properties
deleted file mode 100644
index 3d085758..00000000
--- a/config/xnat-conf.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# xnat-conf.properties
-# XNAT http://www.xnat.org
-# Copyright (c) 2016, Washington University School of Medicine
-# All Rights Reserved
-#
-# Released under the Simplified BSD.
-#
-datasource.driver=org.postgresql.Driver
-datasource.url=jdbc:postgresql://localhost/xnat
-datasource.username=xnat
-datasource.password=xnat
-
-hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect
-hibernate.hbm2ddl.auto=update
-hibernate.show_sql=false
-hibernate.cache.use_second_level_cache=true
-hibernate.cache.use_query_cache=true
-
-amq.usage.temp=128mb
-amq.usage.mem=512mb
-amq.usage.store=1gb
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java b/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java
index a0fa40e7..64ce9291 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java
@@ -18,7 +18,6 @@ import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Date;
import java.util.List;
public enum DatabaseSession {
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
index 1d039b5c..1941edcb 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
@@ -2227,13 +2227,6 @@ public final class PrearcDatabase {
return convertRStoList(rs);
}
}.run();
-
-// return new SessionOp<ArrayList<ArrayList<Object>>>() {
-// public ArrayList<ArrayList<Object>> op() throws SQLException, SessionException, Exception {
-// ResultSet rs = this.pdb.executeQuery(null, DatabaseSession.findStudySql(patientName, patientID, studyDate), null);
-// return convertRStoList(rs);
-// }
-// }.run();
}
private static ArrayList<ArrayList<Object>> convertRStoList(ResultSet rs) throws SQLException {
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java
index 06593cd8..3b6cffc7 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java
@@ -27,7 +27,6 @@ public class XDATForgotLogin extends org.nrg.xdat.turbine.modules.actions.XDATFo
context.put("user", user);
action.doPerform(data, context);
}
- context.put("turbineUtils",TurbineUtils.GetInstance());
}
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/ForgotLogin.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/ForgotLogin.java
deleted file mode 100644
index f9e6d8ad..00000000
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/ForgotLogin.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * org.nrg.xnat.turbine.modules.screens.Index
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xnat.turbine.modules.screens;
-
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureScreen;
-
-public class ForgotLogin extends SecureScreen {
-
- @Override
- protected void doBuildTemplate(RunData data, Context c) throws Exception {
-
- }
-}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_email.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_email.java
deleted file mode 100644
index ce30922e..00000000
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_email.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * org.nrg.xnat.turbine.modules.screens.XDATScreen_edit_xnat_projectData
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xnat.turbine.modules.screens;
-
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureScreen;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.search.ItemSearch;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_email extends SecureScreen {
-
- /* (non-Javadoc)
- * @see org.apache.turbine.modules.screens.VelocityScreen#doBuildTemplate(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- protected void doBuildTemplate(RunData data, Context context)
- throws Exception {
- ArrayList al = ItemSearch.GetAllItems("xdat:user",null,false).items();
- Collections.sort(al, new nameComparator());
- context.put("users",al);
-
- String s= (String) TurbineUtils.GetPassedParameter("emailTo",data,"");
- context.put("emailTo",s);
- }
- public class nameComparator implements Comparator<XFTItem> {
- public int compare(XFTItem object1, XFTItem object2) {
- String fn1 = (String) object1.getField("firstname");
- String ln1 = (String) object1.getField("lastname");
- String fn2 = (String) object2.getField("firstname");
- String ln2 = (String) object2.getField("lastname");
- if(fn1==null){
- return 1;
- }
- if(fn2==null){
- return -1;
- }
- int c = fn1.toUpperCase().compareTo(fn2.toUpperCase());
- if(c!=0){
- return c;
- }
- if(ln1==null){
- return 1;
- }
- if(ln2==null){
- return -1;
- }
- return ln1.toUpperCase().compareTo(ln2.toUpperCase());
- }
- }
-}
--
GitLab