Diffusion Genome Privacy - SHCS App fe7dd12eef87

Merge branch 'develop'
fe7dd12eef87
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on Jul 5 2014, 18:36.

Description

Merge branch 'develop'

Details

Committed

Franck Youssef <franck.youssef@epfl.ch>

Jul 5 2014, 18:36

Pushed

raisaro

Apr 20 2017, 12:42

Parents

R3229:da652ed24928: Merge branch 'webservice' into develop
R3229:9583a91413e4: MINOR: codec and jdom

Branches

Unknown

Tags

Unknown

References

tag: v1.0.0

Event Timeline

Franck Youssef <franck.youssef@epfl.ch> committed R3229:fe7dd12eef87: Merge branch 'develop' (authored by Franck Youssef <franck.youssef@epfl.ch>).Jul 5 2014, 18:36

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
da652ed24928	Franck Youssef	Merge branch 'webservice' into develop	Jul 5 2014
a0c5ae42f42b	Franck Youssef	Merge branch 'webservice' of https://git.epfl.ch/repo/genomeprivacy into…	Jul 5 2014
9d9b923c5cbf	Franck Youssef	jdom added	Jul 5 2014
e086b35b2dff	Franck Youssef	Merge branch 'webservice_xml' of https://git.epfl.ch/repo/genomeprivacy into…	Jul 5 2014
840580a5238a	Franck Youssef	XML: various fixes not only to XML.	Jul 5 2014
b2bd854efea0	Franck Youssef	Merge branch 'webservice_xml' of https://git.epfl.ch/repo/genomeprivacy into…	Jul 5 2014
a1fc1bee1419	Franck Youssef	XML: fixed parsing and request handling	Jul 5 2014
09262c2d586f	Franck Youssef	progress in missing material handling.	Jul 4 2014
ef00847bd047	Franck Youssef	MINOR: added Oracle JDBC adapter library.	Jul 4 2014
6ba7380658fa	Franck Youssef	Merge branch 'webservice_xml' of https://git.epfl.ch/repo/genomeprivacy into…	Jul 3 2014
438db9d049d4	Franck Youssef	fixing XML formatting and parsing. Various bug fixes.	Jul 3 2014
1dd821fc80ac	Franck Youssef	debugging XML formatting and parsing	Jul 3 2014
19e88dbd7dbb	Franck Youssef	Merge branch 'webservice_xml' of https://git.epfl.ch/repo/genomeprivacy into…	Jul 2 2014
678a3f20905e	Franck Youssef	MINOR: progress in MINOR: started integrating new messages in client and server	Jun 27 2014
ba32552da914	Franck Youssef	MINOR: progress in formatting of query and replies	Jun 27 2014
0b3a9801f2eb	Franck Youssef	XML: generation and parsing of DECRYPT requests and replies. To be tested.	Jun 26 2014
47de4fd57ff8	Franck Youssef	MINOR: added XML parsing libraries	Jun 26 2014
709ec6992205	Franck Youssef	XML: removed unnecessary classes	Jun 26 2014
93fb20831904	Franck Youssef	WS: debugging calls	Jun 25 2014
003ccb86863b	Franck Youssef	DEBUG: trying alternative to JSON-IO	Jun 24 2014
2f5ea53391db	Franck Youssef	DEBUG: further debugging for second WS call.	Jun 24 2014
7c7919ca93b7	Franck Youssef	MINOR: fixed gitignore	Jun 24 2014
d4757386f539	Franck Youssef	MINOR: fixed gitignore	Jun 24 2014
1c372aeffc2f	Franck Youssef	MINOR: fixed gitignore	Jun 24 2014
aa5944aa21ae	Franck Youssef	MINOR: fixed gitignore	Jun 24 2014
1fe3e3668e83	Franck Youssef	MINOR: fixed gitignore	Jun 24 2014
83d616e6339e	Franck Youssef	REPORT: pushed final presentation.	Jun 20 2014
8a95a356dfee	Franck Youssef	PRESENTATION: fixed presentation based on JL feedback.	Jun 18 2014
8b053926f535	Franck Youssef	MAJOR: commited report.	Jun 17 2014
fc0616a16875	Franck Youssef	MINOR: sample code for Raisaro	Jun 17 2014
d704d6bd8a1d	Franck Youssef	REPORT: migration to biblatex	Jun 17 2014
5142373eb440	Franck Youssef	MAJOR: pre final release of report. Added extensive EC testing. Updated plots.	Jun 17 2014
9edd36a89f2d	Franck Youssef	REPORT: updated figures with compression of EC points.	Jun 15 2014
1c5cffaf2c15	Franck Youssef	MAJOR: compression for encoded EC points.	Jun 15 2014
648a8e5f1ceb	Franck Youssef	REPORT: finished all sections. Missing explanations in math appendix.	Jun 13 2014
40f60fbfc3ae	ghorkhan	Merge branch 'develop' of https://git.epfl.ch/repo/genomeprivacy into develop	Jun 13 2014
a8ec9b3af7f4	ghorkhan	REPORT: adding monetary plots	Jun 13 2014
b989046d78aa	ghorkhan	REPORT: adding monetary plots	Jun 13 2014
447afa3303d2	Franck Youssef	REPORT: fixed captions	Jun 13 2014
212c6d5cb133	Franck Youssef	Merge branch 'develop' of https://git.epfl.ch/repo/genomeprivacy into develop	Jun 13 2014
dd12849ff6a3	Franck Youssef	REPORT: replaced curve K-571 by P-384	Jun 13 2014
98c7c8569cac	Franck Youssef	REPORT: various updates. completed section introduction. Need to be checked.	Jun 11 2014
25051acf9a57	Franck Youssef	ECCEG: request Jean Louis, are numbers correctly wrapped if they exceed k=n or…	Jun 10 2014
00d2baa5626c	Franck Youssef	REPORT: various updates	Jun 10 2014
2962cb60645a	Franck Youssef	REPORT: progress in deployment and intro.	Jun 5 2014
9fc15434dcde	Franck Youssef	REPORT: major advance in report. Will be submitted to JL.	Jun 5 2014
33564065435c	Franck Youssef	Adapted crypto modules for old ec curve tests.	Jun 5 2014
9eb3619f9af7	Franck Youssef	REPORT: progress in performance analysis	Jun 4 2014
e6417fd8b2a4	Franck Youssef	REPORT: added Swisscom figures. fixed typos.	Jun 4 2014
b5b1a1f724f2	Franck Youssef	REPORT: progress made.	Jun 4 2014

Changes (212)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
A		documentation/meetings/EPFL_LOG_RVB-96.TIF
A		documentation/meetings/Feedback Jean Louis on Plan sketch 2014-05-26.txt
A		documentation/meetings/Transcript Meeting SHCS 20140617.docx
M		documentation/meetings/meeting SHCS 20140508.vsdx
A		documentation/meetings/meeting ayday raisaro youssef 20140608.docx
A		documentation/meetings/meeting ayday raisaro youssef 20140608.pdf
A		documentation/papers/ECCEG/2006_pkcC.pdf
A		documentation/requirements/DTDs.zip
M		documentation/requirements/answer_decrypt.dtd
M		documentation/requirements/answer_material.dtd
M		documentation/requirements/request_decrypt.dtd
M		documentation/requirements/request_material.dtd
A	(dir)	documentation/requirements/sample SOAP/
A		documentation/requirements/sample SOAP/reply_decrypt.soap.xml
A		documentation/requirements/sample SOAP/reply_material.soap.xml
A		documentation/requirements/sample SOAP/request_decrypt.soap.xml
A		documentation/requirements/sample SOAP/request_material.soap.xml
A		documentation/requirements/sample SOAP/sample SOAP messages.zip
A		documentation/requirements/schema meeting SHCS 20140508.pdf
A	(dir)	presentations/presentation_final/
P		presentations/presentation_final/bc2.jpg Copied from presentations/presentation_midterm/presentation_semester_franck_visit_juels.pptx
A		presentations/presentation_final/bouncyjava.gif
A		presentations/presentation_final/cost pailler elgamal.xlsx
A		presentations/presentation_final/database-icons-screenshots-2.png
A		presentations/presentation_final/framework.eps
P		presentations/presentation_final/presentation_final.pptx Copied from presentations/presentation_midterm/presentation_semester_franck_visit_juels.pptx
A		presentations/presentation_final/protocol_new.PNG
A		presentations/presentation_final/protocol_old.PNG
A	(dir)	presentations/presentation_final/sequence diagrams/
A		presentations/presentation_final/sequence diagrams/sd_new.vsdx
A		presentations/presentation_final/sequence diagrams/sd_old.vsdx
A		presentations/presentation_final/web_service_decrypt.png
A		presentations/presentation_final/web_service_full.png
A		presentations/presentation_final/web_service_request_manager.png
P		presentations/presentation_midterm/presentation_semester_franck_visit_juels.pptx Copied to multiple locations: presentations/presentation_final/bc2.jpg presentations/presentation_final/presentation_final.pptx
A	(dir)	project/CodeTests/
A		project/CodeTests/.classpath
A		project/CodeTests/.gitignore
A		project/CodeTests/.project
A	(dir)	project/CodeTests/src/
A	(dir)	project/CodeTests/src/webservice/
A		project/CodeTests/src/webservice/SOAPSimple.java
M		project/PPPClient/.classpath
M		project/PPPClient/src/ClientApp.java
M		project/PPPClient/src/ClientTestSimple.java
M		project/PPPClient/src/database/DBconnectorClient.java
A		project/PPPClient/src/framework/ClinicalAnalyzer.java
A		project/PPPClient/src/framework/ClinicalEngine.java
A		project/PPPClient/src/framework/Diagnostic.java
A		project/PPPClient/src/framework/DiagnosticRaw.java
M		project/PPPClient/src/framework/MedUnit.java
A		project/PPPClient/src/framework/MissingMaterialException.java
A		project/PPPClient/src/io/CommAdapter.java
A		project/PPPClient/src/io/SOAPClientSAAJ.java
A	(dir)	project/PPPClient/src/test/
A		project/PPPClient/src/test/ClientStringComm.java
M		project/PPPClient/src/ui/GUI.java
M		project/PPPClient/src/utils/ClientProperties.java
M		project/PPPClient/src/utils/GenerateLookupTableTest.java
M		project/PPPCommons/.classpath
A		project/PPPCommons/lib/javadoc/commons-codec-1.9-javadoc.jar
A		project/PPPCommons/lib/javadoc/jdom-2.0.5-javadoc.jar
A		project/PPPCommons/lib/sources/commons-codec-1.9-sources.jar
A		project/PPPCommons/lib/sources/jdom-2.0.5-sources.jar
M		project/PPPCommons/src/crypto/elgamal/ECCEGKeyGenerator.java
M		project/PPPCommons/src/crypto/elgamal/ECElGamal.java
M		project/PPPCommons/src/crypto/elgamal/EvalEC.java
M		project/PPPCommons/src/crypto/elgamal/KeyPair.java
M		project/PPPCommons/src/crypto/elgamal/fragment/FragmentEncoded.java
M		project/PPPCommons/src/crypto/elgamal/fragment/FragmentPartialEncoded.java
M		project/PPPCommons/src/database/DBConnection.java
M		project/PPPCommons/src/framework/Marker.java
M		project/PPPCommons/src/framework/MarkerEncrypted.java
A		project/PPPCommons/src/framework/TestMaterial.java
M		project/PPPCommons/src/framework/Type.java
A		project/PPPCommons/src/framework/TypeString.java
M		project/PPPCommons/src/framework/WeightedMarker.java
M		project/PPPCommons/src/framework/reply/Reply.java
M		project/PPPCommons/src/framework/reply/ReplyDecryption.java
D		project/PPPCommons/src/framework/reply/ReplyHLA.java
A		project/PPPCommons/src/framework/reply/ReplyMaterial.java
D		project/PPPCommons/src/framework/reply/ReplySNPandCF.java
M		project/PPPCommons/src/framework/request/Request.java
M		project/PPPCommons/src/framework/request/RequestDecryption.java
A		project/PPPCommons/src/framework/request/RequestMaterial.java
D		project/PPPCommons/src/framework/request/RequestSNPandCF.java
A		project/PPPCommons/src/framework/test/NamedTestResult.java
M		project/PPPCommons/src/framework/test/TestResult.java
A		project/PPPCommons/src/framework/test/TestResultEncoded.java
A		project/PPPCommons/src/framework/test/TestResultEncrypted.java
A		project/PPPCommons/src/framework/test/TestResultPartialEncoded.java
A		project/PPPCommons/src/framework/test/TestResultRaw.java
A		project/PPPCommons/src/io/ClientConnection.java
D		project/PPPCommons/src/io/JSONConnection.java
A		project/PPPCommons/src/io/SOAPMessageFormatter.java
A	(dir)	project/PPPCommons/src/io/serializer/
A		project/PPPCommons/src/io/serializer/Parser.java
A		project/PPPCommons/src/io/serializer/ParserNamespace.java
A	(dir)	project/PPPCommons/src/io/serializer/url/
A		project/PPPCommons/src/io/serializer/url/URLParser.java
A		project/PPPCommons/src/io/serializer/url/URLParserDecrypt.java
A		project/PPPCommons/src/io/serializer/url/URLParserMaterial.java
A	(dir)	project/PPPCommons/src/io/serializer/xml/
A		project/PPPCommons/src/io/serializer/xml/XMLParser.java
A		project/PPPCommons/src/io/serializer/xml/XMLParserDecrypt.java
A		project/PPPCommons/src/io/serializer/xml/XMLParserMaterial.java
A	(dir)	project/PPPCommons/src/test/
A		project/PPPCommons/src/test/ECPointCompressionTest.java
A		project/PPPCommons/src/test/FieldSizeTest.java
A		project/PPPCommons/src/test/TestRaisaro.java
A		project/PPPCommons/src/utils/CollectionUtils.java
V		project/PPPCommons/src/utils/{ECPointMapSerializer.java ← ECPointSerializer.java}
V		project/PPPCommons/src/utils/{ECPointSerializer.java → ECPointMapSerializer.java}
A		project/PPPCommons/src/utils/MessageSerializer.java
A		project/PPPCommons/src/utils/StringUtils.java
A	(dir)	project/PPPCommons/src/ws/
A		project/PPPCommons/src/ws/SOAPMessageFormatter.java
A		project/PPPServer/.gitignore
D		project/PPPServer/bin
D		project/PPPServer/bin/.gitignore
A	(dir)	project/PPPServer/lib/
A		project/PPPServer/lib/ojdbc6.jar
M		project/PPPServer/src/database/DBconnectorServer.java
M		project/PPPServer/src/framework/Server.java
M		project/PPPServer/src/framework/Worker.java
A	(dir)	project/PPPServer/src/test/
A		project/PPPServer/src/test/ServerStringComm.java
A	(dir)	project/RemoteSystemsTempFiles/
A		project/RemoteSystemsTempFiles/.project
A	(dir)	report/
A	(dir)	report/biblio/
A		report/biblio/research.bib
A	(dir)	report/external_sty/
A		report/external_sty/tikz-uml.sty
A	(dir)	report/figures/
A		report/figures/framework.eps
A	(dir)	report/layouts/
A		report/layouts/report.cls
A	(dir)	report/plots/
A		report/plots/data_mon.txt
A		report/plots/data_perf.txt
A		report/plots/data_perf2.txt
A		report/plots/data_perf_comp.txt
A		report/plots/gp_perf.gp
A		report/plots/gp_perf_comp.gp
A		report/plots/perf_binary.txt
A		report/plots/perf_binary_comp.txt
A		report/plots/perf_binary_comp.txt~
A		report/plots/perf_koblitz.txt
A		report/plots/perf_koblitz_comp.txt
A		report/plots/perf_koblitz_comp.txt~
A		report/plots/perf_monetary.eps
A		report/plots/perf_monetary.tex
A		report/plots/perf_monetary_comp.eps
A		report/plots/perf_monetary_comp.tex
A		report/plots/perf_primary.txt
A		report/plots/perf_primary_comp.txt
A		report/plots/perf_primary_comp.txt~
A		report/plots/perf_runtime.eps
A		report/plots/perf_runtime.tex
A		report/plots/perf_runtime_comp.eps
A		report/plots/perf_runtime_comp.tex
A		report/plots/perf_storage.eps
A		report/plots/perf_storage.tex
A		report/plots/perf_storage_comp.eps
A		report/plots/perf_storage_comp.tex
A	(dir)	report/plots/plots/
A		report/plots/plots/perf_monetary.eps
A		report/plots/plots/perf_monetary.png
A		report/plots/plots/perf_monetary.tex
A		report/plots/plots/perf_monetary_comp.eps
A		report/plots/plots/perf_monetary_comp.png
A		report/plots/plots/perf_monetary_comp.tex
A		report/plots/plots/perf_runtime.eps
A		report/plots/plots/perf_runtime.png
A		report/plots/plots/perf_runtime.tex
A		report/plots/plots/perf_runtime_comp.eps
A		report/plots/plots/perf_runtime_comp.png
A		report/plots/plots/perf_runtime_comp.tex
A		report/plots/plots/perf_storage.eps
A		report/plots/plots/perf_storage.png
A		report/plots/plots/perf_storage.tex
A		report/plots/plots/perf_storage_comp.eps
A		report/plots/plots/perf_storage_comp.png
A		report/plots/plots/perf_storage_comp.tex
A	(dir)	report/sections/
A	(dir)	report/sections/appendix/
A		report/sections/appendix.tex
A		report/sections/appendix/appendix_add_material.tex
A		report/sections/appendix/appendix_additional_math_material.tex
A		report/sections/appendix/appendix_specs.tex
A		report/sections/conclusion.tex
A		report/sections/crypto_background.tex
A		report/sections/deployment.tex
A	(dir)	report/sections/diagrams/
A		report/sections/diagrams/protocol_diagram.tex
A		report/sections/diagrams/protocol_diagram_old.tex
A		report/sections/diagrams/web_service_decrypt.pdf
A		report/sections/diagrams/web_service_decrypt.vsdx
A		report/sections/diagrams/web_service_full.pdf
A		report/sections/diagrams/web_service_full.vsdx
A		report/sections/diagrams/web_service_request_manager.pdf
A		report/sections/diagrams/web_service_request_manager.vsdx
A		report/sections/ecceg_impl.tex
A		report/sections/genomic_background.tex
A		report/sections/intro.tex
A		report/sections/performance_analysis.tex
A	(dir)	report/title/
A		report/title/epfl_logo.eps
A		report/title/youssef-genomic_title.tex
A		report/youssef-genomic.tex