Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
glegoux committed Sep 23, 2017
2 parents ea6c83d + 06cead2 commit ac5582d6a7790fa244c67faa2aba145ef942f8ec
Showing with 2,789 additions and 711 deletions.
  1. +6 −0 .ci/check-version.sh
  2. +19 −5 .ci/install.sh
  3. +3 −1 .env
  4. +61 −0 .github/coding-style/eclipse-java-cleanup-style.xml
  5. +337 −0 .github/coding-style/eclipse-java-formatter-style.xml
  6. +598 −0 .github/coding-style/intellij-java-style.xml
  7. +26 −13 .gitignore
  8. +4 −0 .travis.yml
  9. +12 −3 Makefile
  10. +36 −4 README.md
  11. +1 −0 VERSION
  12. +23 −0 dev-local/ubuntu/README.md
  13. +9 −0 dev-local/ubuntu/config.sh
  14. +87 −0 dev-local/ubuntu/init_dev_env.sh
  15. +0 −6 docker-compose.yml.template
  16. +5 −0 gssapi-java/README.md
  17. +2 −1 gssapi-java/gss-client/pom.xml
  18. +13 −0 gssapi-java/gss-client/script/client-gss-java.sh
  19. +155 −174 gssapi-java/gss-client/src/main/java/com/criteo/gssclient/GssClient.java
  20. +10 −29 gssapi-java/gss-client/src/test/java/com/criteo/gssclient/AppTest.java
  21. +2 −1 gssapi-java/gss-server/pom.xml
  22. +13 −0 gssapi-java/gss-server/script/server-gss-java.sh
  23. +152 −159 gssapi-java/gss-server/src/main/java/com/criteo/gssserver/GssServer.java
  24. +11 −30 gssapi-java/gss-server/src/test/java/com/criteo/gssserver/AppTest.java
  25. +96 −2 gssapi-java/gss-utils/pom.xml
  26. +0 −23 gssapi-java/gss-utils/src/main/java/com/criteo/gssutils/Helper.java
  27. +48 −47 gssapi-java/gss-utils/src/main/java/com/criteo/gssutils/Jaas.java
  28. +226 −0 gssapi-java/gss-utils/src/main/java/com/criteo/gssutils/KerberosTicketManager.java
  29. +38 −0 gssapi-java/gss-utils/src/main/java/com/criteo/gssutils/Utils.java
  30. +0 −34 gssapi-java/gss-utils/src/test/java/com/criteo/gssutils/AppTest.java
  31. +84 −0 gssapi-java/gss-utils/src/test/java/com/criteo/gssutils/KerberosTicketManagerTest.java
  32. +136 −134 gssapi-java/pom.xml
  33. +11 −0 gssapi-java/settings.xml
  34. +10 −0 krb5-ubuntu/Dockerfile
  35. +4 −4 krb5-ubuntu/kdc-server/Dockerfile
  36. +2 −1 krb5-ubuntu/kdc-server/index.html
  37. +28 −0 krb5-ubuntu/kdc-server/supervisord.conf
  38. +5 −3 krb5-ubuntu/machine/Dockerfile
  39. +2 −1 krb5-ubuntu/machine/index.html
  40. +18 −0 krb5-ubuntu/machine/supervisord.conf
  41. +5 −3 krb5-ubuntu/service/Dockerfile
  42. +3 −2 krb5-ubuntu/service/index.html
  43. +23 −0 krb5-ubuntu/service/supervisord.conf
  44. +10 −0 network-analyser/README.md
  45. +2 −2 script/clean.sh
  46. +13 −2 script/generate_docker_compose.py
  47. +23 −0 script/get-env.sh
  48. +3 −1 script/init.sh
  49. +1 −1 script/ssh.sh
  50. +2 −1 script/start.sh
  51. +11 −0 script/status.sh
  52. +14 −0 test/config.sh
  53. +14 −0 test/dev_local_test.sh
  54. +4 −2 test/gss_api_java_test.sh
  55. +15 −0 test/gss_api_java_unit_test.sh
  56. +20 −0 test/helper.sh
  57. +15 −0 test/kdestroy_test.sh
  58. +23 −0 test/kinit_test.sh
  59. +10 −0 test/make_test.sh
  60. +50 −0 test/restart_test.sh
  61. +23 −0 test/run_all_tests.sh
  62. +3 −3 test/ssh_test.sh
  63. +116 −19 test/test.bats
  64. +93 −0 test/wrapper_test.sh
View
@@ -18,6 +18,12 @@ make --version
echo "=== bats version ==="
bats --version
echo "=== java version ==="
java -version
echo "=== maven version ==="
mvn --version
echo "=== python3 version ==="
python3 --version
View
@@ -10,18 +10,32 @@ set -e
cd "$(dirname "$0")"
cd ..
sudo apt-get update
echo "=== Install python environment for generating configuration ==="
sudo apt-get -y install python3-pip python3-dev
sudo pip3 install virtualenv
python3 --version
pip3 --version
pip3 freeze
echo "...OK"
echo "=== Install bats for bash unit test ==="
sudo add-apt-repository ppa:duggan/bats --yes
sudo apt-get update -qq
sudo apt-get install -qq bats
mkdir -p tmp/
cd tmp/
wget "https://github.com/sstephenson/bats/archive/v0.4.0.zip" -O "bats-0.4.0.zip"
unzip -o bats-0.4.0.zip
cd bats-0.4.0/
sudo ./install.sh /usr/local
bats --version
echo "...OK"
echo "=== Install Kerberos environment in docker containers ==="
make install
echo "=== Install java and maven ==="
sudo add-apt-repository ppa:webupd8team/java -y
sudo add-apt-repository ppa:andrei-pozolotin/maven3 -y
sudo apt-get update
echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
sudo apt-get -y install oracle-java8-installer
sudo apt-get -y install oracle-java8-set-default
sudo apt-get install maven3
echo TODO
View
4 .env
@@ -1,7 +1,9 @@
# Environment variables from shell
# Each image and container docker name will have suffix '${PREFIX_KRB5}-'
PREFIX_KRB5=krb5
# Choose operating system of each docker container
OS_CONTAINER=ubuntu
# Define shared folder on host with container docker machine /root/share
# (if not empty)
SHARED_FOLDER=
SHARED_FOLDER=${PWD}
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="2">
<profile kind="CleanUpProfile" name="JavaCleanUpStyle" version="2">
<setting id="cleanup.format_source_code" value="false"/>
<setting id="cleanup.convert_functional_interfaces" value="false"/>
<setting id="cleanup.add_missing_annotations" value="true"/>
<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
<setting id="cleanup.remove_unused_private_types" value="true"/>
<setting id="cleanup.insert_inferred_type_arguments" value="false"/>
<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
<setting id="cleanup.add_generated_serial_version_id" value="false"/>
<setting id="cleanup.make_variable_declarations_final" value="false"/>
<setting id="cleanup.add_missing_methods" value="false"/>
<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
<setting id="cleanup.correct_indentation" value="false"/>
<setting id="cleanup.never_use_parentheses_in_expressions" value="false"/>
<setting id="cleanup.add_serial_version_id" value="false"/>
<setting id="cleanup.remove_unused_private_methods" value="true"/>
<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
<setting id="cleanup.remove_unused_private_members" value="false"/>
<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
<setting id="cleanup.format_source_code_changes_only" value="false"/>
<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
<setting id="cleanup.add_missing_nls_tags" value="false"/>
<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
<setting id="cleanup.remove_unnecessary_casts" value="true"/>
<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
<setting id="cleanup.remove_unused_private_fields" value="true"/>
<setting id="cleanup.make_parameters_final" value="false"/>
<setting id="cleanup.remove_redundant_type_arguments" value="false"/>
<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
<setting id="cleanup.remove_unused_imports" value="true"/>
<setting id="cleanup.use_anonymous_class_creation" value="false"/>
<setting id="cleanup.organize_imports" value="false"/>
<setting id="cleanup.sort_members" value="false"/>
<setting id="cleanup.remove_private_constructors" value="true"/>
<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
<setting id="cleanup.always_use_blocks" value="true"/>
<setting id="cleanup.never_use_blocks" value="false"/>
<setting id="cleanup.use_lambda" value="true"/>
<setting id="cleanup.always_use_parentheses_in_expressions" value="true"/>
<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
<setting id="cleanup.remove_unused_local_variables" value="false"/>
<setting id="cleanup.make_private_fields_final" value="true"/>
<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
<setting id="cleanup.add_default_serial_version_id" value="true"/>
<setting id="cleanup.sort_members_all" value="false"/>
<setting id="cleanup.use_blocks" value="true"/>
<setting id="cleanup.add_missing_override_annotations" value="true"/>
<setting id="cleanup.make_local_variable_final" value="true"/>
</profile>
</profiles>
Oops, something went wrong.

0 comments on commit ac5582d

Please sign in to comment.