summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Sasha Sherstnev [Fri, 8 Nov 2013 14:03:34 +0000 (14:03 +0000)]
Merge branch 'master' into servlets
Conflicts:
server/compbio/listeners/ServletSequenceProtein.java
server/compbio/statistic/CassandraRequester.java
Sasha Sherstnev [Fri, 8 Nov 2013 13:59:53 +0000 (13:59 +0000)]
Merge branch 'master' into servlets
Conflicts:
.classpath
datadb/compbio/cassandra/CassandraNativeConnector.java
datadb/compbio/cassandra/JpredParserHTTP.java
datadb/compbio/cassandra/JpredParserLocalFile.java
server/compbio/listeners/ContextListener.java
server/compbio/statistic/CassandraRequester.java
website/QuerySequenceProtein.jsp
website/ReportLength.jsp
website/ReportNew.jsp
Sasha Sherstnev [Fri, 8 Nov 2013 13:49:38 +0000 (13:49 +0000)]
Update classpath
Sasha Sherstnev [Fri, 8 Nov 2013 13:47:37 +0000 (13:47 +0000)]
Updated website
Sasha Sherstnev [Fri, 8 Nov 2013 13:47:17 +0000 (13:47 +0000)]
Updated website
Sasha Sherstnev [Fri, 8 Nov 2013 13:46:48 +0000 (13:46 +0000)]
Remove keyspace name from queries
Sasha Sherstnev [Fri, 8 Nov 2013 13:28:29 +0000 (13:28 +0000)]
Fix problems with Natasha's code
Natasha Sherstneva [Thu, 7 Nov 2013 13:32:02 +0000 (13:32 +0000)]
fix data report, protein report
Conflicts:
.classpath
datadb/compbio/cassandra/CassandraNativeConnector.java
Sasha Sherstnev [Fri, 8 Nov 2013 13:10:05 +0000 (13:10 +0000)]
Add lost JRE
Natasha Sherstneva [Thu, 7 Nov 2013 14:09:34 +0000 (14:09 +0000)]
add class with structure
Natasha Sherstneva [Thu, 7 Nov 2013 13:32:02 +0000 (13:32 +0000)]
fix data report, protein report
Conflicts:
.classpath
datadb/compbio/cassandra/CassandraNativeConnector.java
website/AllReports.jsp
Sasha Sherstnev [Fri, 8 Nov 2013 12:11:41 +0000 (12:11 +0000)]
Still not-working system for reading cassandra
Sasha Sherstnev [Fri, 8 Nov 2013 12:11:18 +0000 (12:11 +0000)]
Improved cassandra support
Sasha Sherstnev [Fri, 8 Nov 2013 11:26:45 +0000 (11:26 +0000)]
Start documentation
Natasha Sherstneva [Fri, 8 Nov 2013 11:10:46 +0000 (11:10 +0000)]
fix query log info, jobs by counter
Sasha Sherstnev [Fri, 8 Nov 2013 10:22:23 +0000 (10:22 +0000)]
Add PropertyHelper for running ProteoCache
Sasha Sherstnev [Fri, 8 Nov 2013 10:21:41 +0000 (10:21 +0000)]
Add properties configuration to the system
Sasha Sherstnev [Fri, 8 Nov 2013 10:20:24 +0000 (10:20 +0000)]
Fix logging system and add jabaws libs into the system
Natasha Sherstneva [Thu, 7 Nov 2013 14:09:34 +0000 (14:09 +0000)]
add class with structure
Natasha Sherstneva [Thu, 7 Nov 2013 13:32:02 +0000 (13:32 +0000)]
fix data report, protein report
Sasha Sherstnev [Tue, 5 Nov 2013 14:18:16 +0000 (14:18 +0000)]
Restore one servlet
Sasha Sherstnev [Tue, 5 Nov 2013 14:17:02 +0000 (14:17 +0000)]
Restore libraries for JSP tags
Sasha Sherstnev [Mon, 4 Nov 2013 21:17:39 +0000 (21:17 +0000)]
First working "writing" code for Cassandra 2.0
Sasha Sherstnev [Sat, 2 Nov 2013 12:06:23 +0000 (12:06 +0000)]
Add new still not-working code for native binary protocol version
Conflicts:
server/compbio/statistic/StatisticsProt.java
Sasha Sherstnev [Sat, 2 Nov 2013 10:35:05 +0000 (10:35 +0000)]
Improve JSP pages
Conflicts:
website/ReportLength.jsp
Sasha Sherstnev [Sat, 2 Nov 2013 10:33:53 +0000 (10:33 +0000)]
Update basic jars: from Thrift to native banary protocol (2)
Sasha Sherstnev [Sat, 2 Nov 2013 10:32:59 +0000 (10:32 +0000)]
Update basic jars: from Thrift to native banary protocol
Sasha Sherstnev [Tue, 5 Nov 2013 14:51:38 +0000 (14:51 +0000)]
Add Jpred archive table
Sasha Sherstnev [Tue, 5 Nov 2013 14:18:16 +0000 (14:18 +0000)]
Restore one servlet
Sasha Sherstnev [Tue, 5 Nov 2013 14:17:02 +0000 (14:17 +0000)]
Restore libraries for JSP tags
Sasha Sherstnev [Mon, 4 Nov 2013 21:17:39 +0000 (21:17 +0000)]
First working "writing" code for Cassandra 2.0
Sasha Sherstnev [Sat, 2 Nov 2013 12:10:41 +0000 (12:10 +0000)]
New JPS code
Sasha Sherstnev [Sat, 2 Nov 2013 12:06:23 +0000 (12:06 +0000)]
Add new still not-working code for native binary protocol version
Sasha Sherstnev [Sat, 2 Nov 2013 10:35:05 +0000 (10:35 +0000)]
Improve JSP pages
Sasha Sherstnev [Sat, 2 Nov 2013 10:33:53 +0000 (10:33 +0000)]
Update basic jars: from Thrift to native banary protocol (2)
Sasha Sherstnev [Sat, 2 Nov 2013 10:32:59 +0000 (10:32 +0000)]
Update basic jars: from Thrift to native banary protocol
Sasha Sherstnev [Thu, 31 Oct 2013 22:54:13 +0000 (22:54 +0000)]
Some new servlet code
Sasha Sherstnev [Wed, 30 Oct 2013 09:17:34 +0000 (09:17 +0000)]
Add comments and make Time execution report more granular
Sasha Sherstnev [Tue, 29 Oct 2013 22:35:47 +0000 (22:35 +0000)]
Merge branch 'master' of https://source.jalview.org/git/proteocache
Sasha Sherstnev [Tue, 29 Oct 2013 22:34:36 +0000 (22:34 +0000)]
Remove surplus code
Sasha Sherstnev [Tue, 29 Oct 2013 22:31:27 +0000 (22:31 +0000)]
Fix problem with dates
Sasha Sherstnev [Tue, 29 Oct 2013 16:25:30 +0000 (16:25 +0000)]
nothing change
Sasha Sherstnev [Tue, 29 Oct 2013 14:59:46 +0000 (14:59 +0000)]
done time execution for queries, query by counter of job, total in column in query by execution time of job
Sasha Sherstnev [Tue, 29 Oct 2013 10:59:56 +0000 (10:59 +0000)]
Fix problem with too many open files and problem with not-flushed
info
Sasha Sherstnev [Mon, 28 Oct 2013 20:24:39 +0000 (20:24 +0000)]
Add still not-working code for the 2nd cassandra call
Sasha Sherstnev [Mon, 28 Oct 2013 20:24:16 +0000 (20:24 +0000)]
Make internal variable private
Sasha Sherstnev [Mon, 28 Oct 2013 20:23:42 +0000 (20:23 +0000)]
Fix bug with wrong source file
Sasha Sherstnev [Mon, 28 Oct 2013 20:22:05 +0000 (20:22 +0000)]
Remove surplus code and add format of the source file
Sasha Sherstnev [Mon, 28 Oct 2013 20:21:19 +0000 (20:21 +0000)]
Apply formatting
Sasha Sherstnev [Mon, 28 Oct 2013 20:20:47 +0000 (20:20 +0000)]
Simplify servlets
Sasha Sherstnev [Mon, 28 Oct 2013 20:20:16 +0000 (20:20 +0000)]
Optimize code
Sasha Sherstnev [Mon, 28 Oct 2013 20:18:54 +0000 (20:18 +0000)]
Apply formatting to the JSP pages
Sasha Sherstnev [Sat, 26 Oct 2013 09:43:23 +0000 (10:43 +0100)]
Add another parser for local files with metainformation
Sasha Sherstnev [Thu, 24 Oct 2013 17:27:58 +0000 (18:27 +0100)]
Add some necessary files
Sasha Sherstnev [Thu, 24 Oct 2013 17:27:29 +0000 (18:27 +0100)]
Modify project configuration
Sasha Sherstnev [Thu, 24 Oct 2013 17:27:00 +0000 (18:27 +0100)]
Add first banch of JSPs
Sasha Sherstnev [Thu, 24 Oct 2013 17:25:48 +0000 (18:25 +0100)]
Modify servlet configuration
Sasha Sherstnev [Thu, 24 Oct 2013 17:25:29 +0000 (18:25 +0100)]
First working code
Sasha Sherstnev [Thu, 24 Oct 2013 14:13:39 +0000 (15:13 +0100)]
Remove JABAWS testing code
Sasha Sherstnev [Thu, 24 Oct 2013 14:13:02 +0000 (15:13 +0100)]
Remove old libraries
Sasha Sherstnev [Thu, 24 Oct 2013 14:12:35 +0000 (15:12 +0100)]
Delete JABAWS testing codes
Sasha Sherstnev [Wed, 23 Oct 2013 16:38:26 +0000 (17:38 +0100)]
Some lost files
Sasha Sherstnev [Wed, 23 Oct 2013 16:38:05 +0000 (17:38 +0100)]
Add testing dirs
Sasha Sherstnev [Wed, 23 Oct 2013 16:37:52 +0000 (17:37 +0100)]
Rename projecet
Sasha Sherstnev [Wed, 23 Oct 2013 16:19:18 +0000 (17:19 +0100)]
First commit into ProteoCache (some basic files from JABAWS)
git://source.jalview.org / proteocache.git / log