Diffusion Genome Privacy - SHCS App 2cd67b2855e7

Merge branch 'ecceg_int'
2cd67b2855e7
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on Apr 16 2014, 14:42.

Description

Merge branch 'ecceg_int'

Details

Committed

Franck Youssef <franck.youssef@epfl.ch>

Apr 16 2014, 14:42

Pushed

raisaro

Apr 20 2017, 12:42

Parents

R3229:a46d2cf9b756: Refactor and remove hard coded links/paths.
R3229:0c547f762812: ignore files

Branches

Unknown

Tags

Unknown

Event Timeline

Franck Youssef <franck.youssef@epfl.ch> committed R3229:2cd67b2855e7: Merge branch 'ecceg_int' (authored by Franck Youssef <franck.youssef@epfl.ch>).Apr 16 2014, 14:42

Merged Changes

Commit	Author	Details	Committed
a46d2cf9b756	Franck Youssef	Refactor and remove hard coded links/paths.	Apr 16 2014
5595a8d46022	Franck Youssef	Common code moved to PPPCommons. Cleaned PPPClient up. Added properties file to…	Apr 13 2014
a849cce6c01a	Franck Youssef	Added libraries and ECCEG implementation into server code.	Apr 9 2014

Changes (178)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A	(dir)	documentation/development/
A		documentation/development/program configuration parameters.txt
M		project/PPPCertifiedInstitution/.classpath
A	(dir)	project/PPPCertifiedInstitution/config/
A		project/PPPCertifiedInstitution/config/config_CI.fry.properties
A		project/PPPCertifiedInstitution/config/config_CI.properties
A		project/PPPCertifiedInstitution/lib/bcpkix-jdk15on-150.jar
A	(dir)	project/PPPCertifiedInstitution/res/
V		project/PPPCertifiedInstitution/{res ← src/framework}/icon-with-question-mark-th.png
V		project/PPPCertifiedInstitution/{res ← src/framework}/shcs_logo2_small.gif
A		project/PPPCertifiedInstitution/src/CertifiedInstitutionApp.java
D		project/PPPCertifiedInstitution/src/bim_reader
V		project/PPPCertifiedInstitution/src/{bim_reader → io/bim}/Reader.java
D		project/PPPCertifiedInstitution/src/clinical_factor_reader
V		project/PPPCertifiedInstitution/src/{clinical_factor_reader → io/clinicalfactor}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/database/
V		project/PPPCertifiedInstitution/src/{database ← utils}/DBconnector_client.java
V		project/PPPCertifiedInstitution/src/{database ← utils}/DBconnector_server.java
D		project/PPPCertifiedInstitution/src/fam_reader
V		project/PPPCertifiedInstitution/src/{fam_reader → io/fam}/Reader.java
D		project/PPPCertifiedInstitution/src/framework
V		project/PPPCertifiedInstitution/src/{framework → ui}/GUI.java
V		project/PPPCertifiedInstitution/{src/framework → res}/icon-with-question-mark-th.png
V		project/PPPCertifiedInstitution/{src/framework → res}/shcs_logo2_small.gif
D		project/PPPCertifiedInstitution/src/hla_reader
V		project/PPPCertifiedInstitution/src/{hla_reader → io/hla}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/io/
A	(dir)	project/PPPCertifiedInstitution/src/io/bim/
V		project/PPPCertifiedInstitution/src/{io/bim ← bim_reader}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/io/clinicalfactor/
V		project/PPPCertifiedInstitution/src/{io/clinicalfactor ← clinical_factor_reader}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/io/fam/
V		project/PPPCertifiedInstitution/src/{io/fam ← fam_reader}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/io/hla/
V		project/PPPCertifiedInstitution/src/{io/hla ← hla_reader}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/io/raw/
V		project/PPPCertifiedInstitution/src/{io/raw ← raw_data_reader}/Reader.java
D		project/PPPCertifiedInstitution/src/paillier_crypto
V		project/{PPPCertifiedInstitution/src/paillier_crypto → PPPCommons/src/crypto}/CryptoException.java
V		project/{PPPCertifiedInstitution/src/paillier_crypto → PPPCommons/src/crypto/paillier}/KeyGenerator.java
D		project/PPPCertifiedInstitution/src/paillier_crypto/OffLineNumbers.java
D		project/PPPCertifiedInstitution/src/paillier_crypto/PrimeGenerator.java
V		project/{PPPCertifiedInstitution/src/paillier_crypto/Scheme.java → PPPCommons/src/crypto/paillier/PaillierScheme.java}
D		project/PPPCertifiedInstitution/src/paillier_crypto/Test.java
D		project/PPPCertifiedInstitution/src/raw_data_reader
V		project/PPPCertifiedInstitution/src/{raw_data_reader → io/raw}/Reader.java
A	(dir)	project/PPPCertifiedInstitution/src/ui/
V		project/PPPCertifiedInstitution/src/{ui ← framework}/GUI.java
A		project/PPPCertifiedInstitution/src/utils/CertifiedInstitutionProperties.java
V		project/PPPCertifiedInstitution/src/{utils → database}/DBconnector_client.java
V		project/PPPCertifiedInstitution/src/{utils → database}/DBconnector_server.java
M		project/PPPClient/.classpath
D		project/PPPClient/19632.pdf
D		project/PPPClient/30351.pdf
A	(dir)	project/PPPClient/config/
A		project/PPPClient/config/config_client.fry.properties
A		project/PPPClient/config/config_client.properties
A		project/PPPClient/lib/bcpkix-jdk15on-150.jar
V		project/PPPClient/{ → res}/lock.jpg
A	(dir)	project/PPPClient/res/
V		project/PPPClient/{res ← }/lock.jpg
V		project/PPPClient/{res ← }/shcs_logo2.gif
V		project/PPPClient/{res ← }/shcs_logo2_small.gif
V		project/PPPClient/{ → res}/shcs_logo2.gif
V		project/PPPClient/{ → res}/shcs_logo2_small.gif
A		project/PPPClient/src/ClientApp.java
V		project/PPPClient/src/{ClientTest.java ← framework/Main.java}
A	(dir)	project/PPPClient/src/database/
V		project/PPPClient/src/{database ← utils}/DBconnector_client.java
D		project/PPPClient/src/dgk_crypto
D		project/PPPClient/src/dgk_crypto/DGK_key_generator.java
V		project/{PPPClient/src/dgk_crypto → PPPCommons/src/crypto/dgk}/DGK_scheme.java
D		project/PPPClient/src/dgk_crypto/Test.java
V		project/PPPClient/src/{framework → ui}/GUI.java
V		project/PPPClient/src/{framework/Main.java → ClientTest.java}
M		project/PPPClient/src/framework/MedUnit.java
V		project/{PPPClient → PPPCommons}/src/framework/Request.java
D		project/PPPClient/src/framework/Type.java
M		project/PPPClient/src/framework/User.java
A	(dir)	project/PPPClient/src/io/
A		project/PPPClient/src/io/Reader.java
V		project/PPPClient/src/{io ← utils}/Writer.java
D		project/PPPClient/src/paillier_crypto
D		project/PPPClient/src/paillier_crypto/CryptoException.java
V		project/{PPPClient/src/paillier_crypto → PPPCommons/src/crypto/paillier}/OffLineNumbers.java
V		project/{PPPClient/src/paillier_crypto → PPPCommons/src/crypto}/PrimeGenerator.java
D		project/PPPClient/src/paillier_crypto/Scheme.java
V		project/{PPPClient/src/paillier_crypto → PPPCommons/src/crypto/paillier}/Test.java
D		project/PPPClient/src/reader
D		project/PPPClient/src/reader/Reader.java
A	(dir)	project/PPPClient/src/ui/
V		project/PPPClient/src/{ui ← utils}/BarPlotFrame.java
V		project/PPPClient/src/{ui ← framework}/GUI.java
V		project/PPPClient/src/{ui ← utils}/MyJDialog.java
V		project/PPPClient/src/{utils → ui}/BarPlotFrame.java
A		project/PPPClient/src/utils/ClientProperties.java
V		project/PPPClient/src/{utils → database}/DBconnector_client.java
V		project/PPPClient/src/{utils → ui}/MyJDialog.java
D		project/PPPClient/src/utils/ReadProperties.java
V		project/PPPClient/src/{utils → io}/Writer.java
A		project/PPPCommons/.classpath
A		project/PPPCommons/.project
A	(dir)	project/PPPCommons/.settings/
A		project/PPPCommons/.settings/org.eclipse.jdt.core.prefs
A	(dir)	project/PPPCommons/lib/
A		project/PPPCommons/lib/bcpkix-jdk15on-150.jar
A		project/PPPCommons/lib/commons-validator-1.4.0.jar
A		project/PPPCommons/lib/jce-ext-jdk13-150.jar
A		project/PPPCommons/lib/jce-jdk13-150.jar
A	(dir)	project/PPPCommons/src/
A	(dir)	project/PPPCommons/src/crypto/
V		project/{PPPCommons/src/crypto ← PPPCertifiedInstitution/src/paillier_crypto}/CryptoException.java
A		project/PPPCommons/src/crypto/CryptoScheme.java
V		project/{PPPCommons/src/crypto ← PPPClient/src/paillier_crypto}/PrimeGenerator.java
A		project/PPPCommons/src/crypto/Utils.java
A	(dir)	project/PPPCommons/src/crypto/dgk/
V		project/{PPPCommons/src/crypto/dgk ← PPPServer/src/dgk_crypto}/DGK_key_generator.java
V		project/{PPPCommons/src/crypto/dgk ← PPPClient/src/dgk_crypto}/DGK_scheme.java
V		project/{PPPCommons/src/crypto/dgk ← PPPServer/src/dgk_crypto}/Test.java
A	(dir)	project/PPPCommons/src/crypto/elgamal/
A		project/PPPCommons/src/crypto/elgamal/ECElGamal.java
A		project/PPPCommons/src/crypto/elgamal/ECElGamalTest.java
A		project/PPPCommons/src/crypto/elgamal/ElGamalScheme.java
A		project/PPPCommons/src/crypto/elgamal/EvalEC.java
A		project/PPPCommons/src/crypto/elgamal/FragmentEncoded.java
A		project/PPPCommons/src/crypto/elgamal/FragmentEncodedTest.java
A		project/PPPCommons/src/crypto/elgamal/FragmentEncrypted.java
A		project/PPPCommons/src/crypto/elgamal/FragmentEncryptedTest.java
A		project/PPPCommons/src/crypto/elgamal/FragmentPartial.java
A		project/PPPCommons/src/crypto/elgamal/LagrangeInterpolation.java
A		project/PPPCommons/src/crypto/elgamal/PartialSecret.java
A		project/PPPCommons/src/crypto/elgamal/RiskAnalyzer.java
A	(dir)	project/PPPCommons/src/crypto/paillier/
V		project/{PPPCommons/src/crypto/paillier ← PPPCertifiedInstitution/src/paillier_crypto}/KeyGenerator.java
V		project/{PPPCommons/src/crypto/paillier ← PPPClient/src/paillier_crypto}/OffLineNumbers.java
V		project/{PPPCommons/src/crypto/paillier/PaillierScheme.java ← PPPCertifiedInstitution/src/paillier_crypto/Scheme.java}
V		project/{PPPCommons/src/crypto/paillier ← PPPClient/src/paillier_crypto}/Test.java
A	(dir)	project/PPPCommons/src/database/
A		project/PPPCommons/src/database/DBConnection.java
A	(dir)	project/PPPCommons/src/framework/
V		project/{PPPCommons ← PPPClient}/src/framework/Request.java
V		project/{PPPCommons ← PPPServer}/src/framework/Type.java
A	(dir)	project/PPPCommons/src/utils/
A		project/PPPCommons/src/utils/ConfigProperties.java
M		project/PPPServer/.classpath
A	(dir)	project/PPPServer/bin/
A		project/PPPServer/bin/.gitignore
A	(dir)	project/PPPServer/config/
A		project/PPPServer/config/config_server.fry.properties
A		project/PPPServer/config/config_server.properties
A		project/PPPServer/lib/bcpkix-jdk15on-150.jar
A		project/PPPServer/src/ServerApp.java
A	(dir)	project/PPPServer/src/database/
V		project/PPPServer/src/{database ← utils}/DBconnector_server.java
D		project/PPPServer/src/dgk_crypto
V		project/{PPPServer/src/dgk_crypto → PPPCommons/src/crypto/dgk}/DGK_key_generator.java
D		project/PPPServer/src/dgk_crypto/DGK_scheme.java
V		project/{PPPServer/src/dgk_crypto → PPPCommons/src/crypto/dgk}/Test.java
D		project/PPPServer/src/framework/Request.java
M		project/PPPServer/src/framework/Server.java
V		project/PPPServer/src/{framework → ui}/ServerGUI.java
V		project/{PPPServer → PPPCommons}/src/framework/Type.java
M		project/PPPServer/src/framework/Worker.java
D		project/PPPServer/src/paillier_crypto
D		project/PPPServer/src/paillier_crypto/CryptoException.java
D		project/PPPServer/src/paillier_crypto/OffLineNumbers.java
D		project/PPPServer/src/paillier_crypto/PrimeGenerator.java
D		project/PPPServer/src/paillier_crypto/Scheme.java
D		project/PPPServer/src/paillier_crypto/Test.java
M		project/PPPServer/src/raw_reader_mapreduce/EncWritable.java
M		project/PPPServer/src/raw_reader_mapreduce/Reader_Job.java
M		project/PPPServer/src/raw_reader_mapreduce/Reader_Map.java
M		project/PPPServer/src/raw_reader_mapreduce/Reader_Reducer.java
A	(dir)	project/PPPServer/src/ui/
V		project/PPPServer/src/{ui ← framework}/ServerGUI.java
V		project/PPPServer/src/{utils → database}/DBconnector_server.java
D		project/PPPServer/src/utils/KeyGenerator.java
A		project/PPPServer/src/utils/ServerProperties.java