From 5e76924c64903dd27013651144b1b7e2fcfc7c27 Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Fri, 1 Aug 2014 09:07:38 +0100 Subject: [PATCH] fix html errors --- .swp | Bin 0 -> 12288 bytes conf/Proteocache.properties | 7 +++--- .../compbio/cassandra/CassandraNewTableWriter.java | 2 ++ datadb/compbio/cassandra/JpredParserHTTP.java | 23 +++++++++++++++++++- server/compbio/ws/jpred/JpredClient.java | 4 ++-- .../datatables-1.9.4/docs/DataTable.defaults.html | 4 ++-- 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 .swp diff --git a/.swp b/.swp new file mode 100644 index 0000000000000000000000000000000000000000..873b61ddee7dac64b3717c2ec73a89d3cab0c0f6 GIT binary patch literal 12288 zcmeI%%}T>S5Ww+?&_hm2eSxTlUZms;;tLckC`D|OgLoL(Ceakynw)$uAEVFIZYl*Y zJ(ZHne_(c(Wtmxi$K4M<9Y1@?FcKSA?eG`(JrS*=B=W=fuy<^Jou=7S5I-gle!Q=9 z>>&FHAkd+JJBz}=zq`HhuKTkN??Gz>5I_I{1Q0*~0R#}}LZDeWvbBvbY&!q4i@VSh z0R#|0009ILKmY**5I_I{1kNL%M&$QWWMi}a|8L&__UrSsqbdRjAb(g4 literal 0 HcmV?d00001 diff --git a/conf/Proteocache.properties b/conf/Proteocache.properties index 2b2a2fd..5502dc3 100644 --- a/conf/Proteocache.properties +++ b/conf/Proteocache.properties @@ -1,8 +1,8 @@ ################################################################################# # Cassandra host or IP # test server is 10.0.115.190 -#cassandra.host=localhost -cassandra.host=Main-laptop2.dyn.lifesci.dundee.ac.uk +cassandra.host=localhost +#cassandra.host=Main-laptop2.dyn.lifesci.dundee.ac.uk #cassandra.host=gjb-www-1.cluster.lifesci.dundee.ac.uk #cassandra.host=c6100-1.cluster.lifesci.dundee.ac.uk @@ -34,6 +34,7 @@ cassandra.jpred.local.period=300 ################################################################################# # archive features archive.enable=true -archive.path = /home/asherstnev/Projects/Java.projects/proteocache/archive +#archive.path = /home/asherstnev/Projects/Java.projects/proteocache/archive +archive.path = /drives/c/Users/as373024/Java_dev/archive/ #archive.path = /homes/www-jws2/ProteoCacheArchive archive.web.dir=results diff --git a/datadb/compbio/cassandra/CassandraNewTableWriter.java b/datadb/compbio/cassandra/CassandraNewTableWriter.java index db0e70c..c82cd63 100644 --- a/datadb/compbio/cassandra/CassandraNewTableWriter.java +++ b/datadb/compbio/cassandra/CassandraNewTableWriter.java @@ -102,4 +102,6 @@ public class CassandraNewTableWriter { Date gaga = new Date(newearliestday); System.out.println("New EarliestJobDate is " + gaga.toString()); } + public void FillNewTable() { + } } diff --git a/datadb/compbio/cassandra/JpredParserHTTP.java b/datadb/compbio/cassandra/JpredParserHTTP.java index c6db457..42df7cc 100644 --- a/datadb/compbio/cassandra/JpredParserHTTP.java +++ b/datadb/compbio/cassandra/JpredParserHTTP.java @@ -5,8 +5,10 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.Authenticator; import java.net.HttpURLConnection; import java.net.MalformedURLException; +import java.net.PasswordAuthentication; import java.net.URL; import java.net.URLConnection; import java.text.ParseException; @@ -41,10 +43,29 @@ public class JpredParserHTTP implements JpredParser { public JpredParserHTTP() { dirprefix = "http://www.compbio.dundee.ac.uk/www-jpred/results"; + launchAuthenticator(); } + public void launchAuthenticator() { + final String authUser = "as373024"; + final String authPassword = "Zx1--L12"; + final String authHost = "gskproxy.gsk.com"; + final String authPort = "800"; + Authenticator.setDefault(new Authenticator() { + public PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(authUser, authPassword.toCharArray()); + } + }); + System.setProperty("proxySet", "true"); + System.setProperty("http.proxyUser", authUser); + System.setProperty("http.proxyPassword", authPassword); + System.setProperty("http.proxyHost", authHost); + System.setProperty("http.proxyPort", authPort); + } + public JpredParserHTTP(String sourceurl) { - dirprefix = sourceurl; + dirprefix = sourceurl; + launchAuthenticator(); } public void setSource(String newsourceprefix) { diff --git a/server/compbio/ws/jpred/JpredClient.java b/server/compbio/ws/jpred/JpredClient.java index 6fe8f84..ea62bde 100644 --- a/server/compbio/ws/jpred/JpredClient.java +++ b/server/compbio/ws/jpred/JpredClient.java @@ -15,9 +15,9 @@ public class JpredClient { URL url = new URL("http://localhost:8080/proteocache-1.0/ProteoCacheWS"); Service service = Service.create(url, qname); Jpred sequense = service.getPort(Jpred.class); - String result = sequense.findSequence("EQCGRQAGGKLCPNNLCCSQWGWCGSTDEYCS", "Jpred", "3.0.1"); + int result = sequense.findSequence("EQCGRQAGGKLCPNNLCCSQWGWCGSTDEYCS", "Jpred", "3.0.1"); - System.out.println("Result : " + result); + System.out.println("Result : " + result + " jobs found"); } } diff --git a/webapp/resources/datatables-1.9.4/docs/DataTable.defaults.html b/webapp/resources/datatables-1.9.4/docs/DataTable.defaults.html index d86664a..2349749 100644 --- a/webapp/resources/datatables-1.9.4/docs/DataTable.defaults.html +++ b/webapp/resources/datatables-1.9.4/docs/DataTable.defaults.html @@ -257,7 +257,7 @@ aid styling. The follow syntax is used: