From 5d1d2ee98a4f95d099d6ae3fc0b040ac4800f2b5 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 11 Jan 2016 10:53:22 +0100
Subject: [PATCH] Refactoring: renamed 'security' to 'cryptography'

---
 build.gradle                                     |  2 +-
 .../bitmessage/server/JabitServerConfig.java     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0fe15a1..511372a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     compile 'ch.dissem.jabit:jabit-domain:0.2.1-SNAPSHOT'
     compile 'ch.dissem.jabit:jabit-networking:0.2.1-SNAPSHOT'
     compile 'ch.dissem.jabit:jabit-repositories:0.2.1-SNAPSHOT'
-    compile 'ch.dissem.jabit:jabit-security-bouncy:0.2.1-SNAPSHOT'
+    compile 'ch.dissem.jabit:jabit-cryptography-bouncy:0.2.1-SNAPSHOT'
     compile 'ch.dissem.jabit:jabit-extensions:0.2.1-SNAPSHOT'
 
     compile 'com.h2database:h2:1.4.187'
diff --git a/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java b/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java
index 7237e79..f234ef2 100644
--- a/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java
+++ b/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java
@@ -17,11 +17,11 @@
 package ch.dissem.bitmessage.server;
 
 import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.repository.*;
-import ch.dissem.bitmessage.security.bc.BouncySecurity;
 import ch.dissem.bitmessage.server.repository.ServerProofOfWorkRepository;
 import ch.dissem.bitmessage.utils.Singleton;
 import org.springframework.beans.factory.annotation.Value;
@@ -82,10 +82,10 @@ public class JabitServerConfig {
     }
 
     @Bean
-    public Security security() {
-        BouncySecurity security = new BouncySecurity();
-        Singleton.initialize(security); // needed for admins and clients
-        return security;
+    public Cryptography cryptography() {
+        BouncyCryptography cryptography = new BouncyCryptography();
+        Singleton.initialize(cryptography); // needed for admins and clients
+        return cryptography;
     }
 
     @Bean
@@ -113,7 +113,7 @@ public class JabitServerConfig {
                 .networkHandler(networkHandler())
                 .listener(serverListener())
                 .customCommandHandler(commandHandler())
-                .security(security())
+                .cryptography(cryptography())
                 .port(port)
                 .connectionLimit(connectionLimit)
                 .connectionTTL(connectionTTL)
@@ -122,7 +122,7 @@ public class JabitServerConfig {
 
     @Bean
     public Set<BitmessageAddress> admins() {
-        security();
+        cryptography();
         return Utils.readOrCreateList(
                 ADMIN_LIST,
                 "# Admins can send commands to the server.\n"
@@ -131,7 +131,7 @@ public class JabitServerConfig {
 
     @Bean
     public Set<BitmessageAddress> clients() {
-        security();
+        cryptography();
         return Utils.readOrCreateList(
                 CLIENT_LIST,
                 "# Clients may send incomplete objects for proof of work.\n"