source.jalview.org Git - proteocache.git/commit

author	Natasha Sherstneva <n.shertneva@gmail.com>
	Thu, 7 Nov 2013 13:32:02 +0000 (13:32 +0000)
committer	Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
	Fri, 8 Nov 2013 12:58:30 +0000 (12:58 +0000)
commit	e371943c7ba7e4d2efe3c11bca6ed9ad1a94632b
tree	eee2198265bbecafd16cb758b523036cc7e04ff8	tree \| snapshot
parent	6097c3a4b7510ced14696c7ec98981b0cd0cea01	commit \| diff

fix data report, protein report

Conflicts:
.classpath
datadb/compbio/cassandra/CassandraNativeConnector.java
website/AllReports.jsp

14 files changed:

.classpath		diff \| blob \| history
datadb/compbio/cassandra/CassandraNativeConnector.java		diff \| blob \| history
datadb/compbio/cassandra/DataBase.java		diff \| blob \| history
server/compbio/listeners/ServletJobsByDate.java	[moved from server/compbio/listeners/QueryServlet.java with 81% similarity]	diff \| blob \| history
server/compbio/listeners/ServletSequenceProtein.java	[moved from server/compbio/listeners/ProtServlet.java with 79% similarity]	diff \| blob \| history
server/compbio/listeners/ServletTimeExecution.java	[moved from server/compbio/listeners/LengthServlet.java with 91% similarity]	diff \| blob \| history
server/compbio/statistic/CassandraRequester.java		diff \| blob \| history
website/AllReports.jsp		diff \| blob \| history
website/QueryJobsByDate.jsp	[moved from website/Sample.jsp with 94% similarity]	diff \| blob \| history
website/QuerySequenceProtein.jsp	[moved from website/Sequence.jsp with 78% similarity]	diff \| blob \| history
website/QueryTimeExecition.jsp	[moved from website/JobLength.jsp with 95% similarity]	diff \| blob \| history
website/ReportJobsByDate.jsp	[moved from website/ReportNew.jsp with 97% similarity]	diff \| blob \| history
website/ReportSequenceProtein.jsp	[moved from website/ReportProt.jsp with 100% similarity]	blob \| history
website/ReportTimeExecution.jsp	[moved from website/ReportLength.jsp with 100% similarity]	blob \| history