Formatted project
Change-Id: I6993ddfab02e06541b4138040280a4777c719562
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java b/full/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
index 88dfe2e..4b1c17e 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
@@ -15,36 +15,56 @@
public class EmbeddedLdapServer {
static InMemoryDirectoryServer server;
- public static void startIfNotRunning(LDAPConfig ldapConfig) throws LDAPException, GeneralSecurityException, UnknownHostException {
+ public static void startIfNotRunning (LDAPConfig ldapConfig)
+ throws LDAPException, GeneralSecurityException,
+ UnknownHostException {
if (server != null) {
return;
}
- InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(ldapConfig.searchBase);
+ InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(
+ ldapConfig.searchBase);
final MessageDigest sha1Digest = CryptoHelper.getMessageDigest("SHA1");
- final MessageDigest sha256Digest = CryptoHelper.getMessageDigest("SHA-256");
- config.setPasswordEncoders(new ClearInMemoryPasswordEncoder("{CLEAR}", null), new ClearInMemoryPasswordEncoder("{HEX}", HexPasswordEncoderOutputFormatter.getLowercaseInstance()), new ClearInMemoryPasswordEncoder("{BASE64}", Base64PasswordEncoderOutputFormatter.getInstance()), new UnsaltedMessageDigestInMemoryPasswordEncoder("{SHA}", Base64PasswordEncoderOutputFormatter.getInstance(), sha1Digest), new UnsaltedMessageDigestInMemoryPasswordEncoder("{SHA256}", Base64PasswordEncoderOutputFormatter.getInstance(), sha256Digest));
- config.addAdditionalBindCredentials(ldapConfig.sLoginDN, ldapConfig.sPwd);
+ final MessageDigest sha256Digest = CryptoHelper
+ .getMessageDigest("SHA-256");
+ config.setPasswordEncoders(
+ new ClearInMemoryPasswordEncoder("{CLEAR}", null),
+ new ClearInMemoryPasswordEncoder("{HEX}",
+ HexPasswordEncoderOutputFormatter
+ .getLowercaseInstance()),
+ new ClearInMemoryPasswordEncoder("{BASE64}",
+ Base64PasswordEncoderOutputFormatter.getInstance()),
+ new UnsaltedMessageDigestInMemoryPasswordEncoder("{SHA}",
+ Base64PasswordEncoderOutputFormatter.getInstance(),
+ sha1Digest),
+ new UnsaltedMessageDigestInMemoryPasswordEncoder("{SHA256}",
+ Base64PasswordEncoderOutputFormatter.getInstance(),
+ sha256Digest));
+ config.addAdditionalBindCredentials(ldapConfig.sLoginDN,
+ ldapConfig.sPwd);
config.setSchema(null);
final SSLUtil clientSslUtil = new SSLUtil(new TrustAllTrustManager());
- config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("LDAP", // Listener name
- InetAddress.getByName("localhost"), // Listen address. (null = listen on all interfaces)
- ldapConfig.port, // Listen port (0 = automatically choose an available port)
- clientSslUtil.createSSLSocketFactory()));
+ config.setListenerConfigs(
+ InMemoryListenerConfig.createLDAPConfig("LDAP", // Listener name
+ InetAddress.getByName("localhost"), // Listen address. (null = listen on all interfaces)
+ ldapConfig.port, // Listen port (0 = automatically choose an available port)
+ clientSslUtil.createSSLSocketFactory()));
server = new InMemoryDirectoryServer(config);
server.importFromLDIF(true, ldapConfig.ldif);
server.startListening();
}
- public static void startIfNotRunning(String ldapConfigFilename) throws LDAPException, GeneralSecurityException, UnknownHostException {
+ public static void startIfNotRunning (String ldapConfigFilename)
+ throws LDAPException, GeneralSecurityException,
+ UnknownHostException {
LDAPConfig ldapConfig = new LDAPConfig(ldapConfigFilename);
startIfNotRunning(ldapConfig);
}
- public static void stop() {
+ public static void stop () {
if (server != null) {
server.shutDown(true);
server = null;
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
index ecd1ac9..db6b7c3 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
@@ -43,7 +43,7 @@
rootPackages = "de.ids_mannheim.korap.core.web; "
+ "de.ids_mannheim.korap.web; "
+ "com.fasterxml.jackson.jaxrs.json;";
-
+
File d = new File(KustvaktConfiguration.DATA_FOLDER);
if (!d.exists()) {
d.mkdir();
@@ -63,8 +63,8 @@
case "--help":
StringBuffer b = new StringBuffer();
- b.append("Parameter description: \n")
- .append("--spring-config <Spring XML configuration>\n")
+ b.append("Parameter description: \n").append(
+ "--spring-config <Spring XML configuration>\n")
.append("--port <Server port number>\n")
.append("--help : This help menu\n");
System.out.println(b.toString());
@@ -82,14 +82,14 @@
kargs.setPort(config.getPort());
}
- String adminToken="";
+ String adminToken = "";
File f = new File("adminToken");
if (!f.exists()) {
RandomCodeGenerator random = new RandomCodeGenerator();
adminToken = random.createRandomCode(config);
FileOutputStream fos = new FileOutputStream(new File("adminToken"));
- OutputStreamWriter writer =
- new OutputStreamWriter(fos, StandardCharsets.UTF_8.name());
+ OutputStreamWriter writer = new OutputStreamWriter(fos,
+ StandardCharsets.UTF_8.name());
writer.append("token=");
writer.append(adminToken);
writer.flush();
@@ -103,11 +103,11 @@
Server server = new Server();
- ServletContextHandler contextHandler =
- new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
+ ServletContextHandler contextHandler = new ServletContextHandler(
+ ServletContextHandler.NO_SESSIONS);
contextHandler.setContextPath("/");
-
- if (kargs.getSpringConfig()!=null) {
+
+ if (kargs.getSpringConfig() != null) {
contextHandler.setInitParameter("contextConfigLocation",
"file:" + kargs.getSpringConfig());
}
@@ -115,14 +115,14 @@
contextHandler.setInitParameter("contextConfigLocation",
"classpath:" + this.springConfig);
}
-
+
ServletContextListener listener = new ContextLoaderListener();
contextHandler.addEventListener(listener);
contextHandler.setInitParameter("adminToken", adminToken);
ServletHolder servletHolder = new ServletHolder(new ServletContainer());
- servletHolder.setInitParameter(
- ServerProperties.PROVIDER_PACKAGES, rootPackages);
+ servletHolder.setInitParameter(ServerProperties.PROVIDER_PACKAGES,
+ rootPackages);
servletHolder.setInitOrder(1);
contextHandler.addServlet(servletHolder, config.getBaseURL());
@@ -130,9 +130,10 @@
connector.setPort(kargs.port);
connector.setIdleTimeout(60000);
connector.getConnectionFactory(HttpConnectionFactory.class)
- .getHttpConfiguration().setRequestHeaderSize(64000);
+ .getHttpConfiguration().setRequestHeaderSize(64000);
- ShutdownHandler shutdownHandler = new ShutdownHandler(adminToken,true,true);
+ ShutdownHandler shutdownHandler = new ShutdownHandler(adminToken, true,
+ true);
HandlerList handlers = new HandlerList();
handlers.addHandler(shutdownHandler);
@@ -152,7 +153,7 @@
System.exit(-1);
}
}
-
+
@Setter
public static class KustvaktArgs {
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
index e229cfe..d6b1c80 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
@@ -13,7 +13,8 @@
KustvaktLiteServer server = new KustvaktLiteServer();
kargs = server.readAttributes(args);
- if (kargs == null) System.exit(0);
+ if (kargs == null)
+ System.exit(0);
File f = new File("kustvakt-lite.conf");
Properties properties = new Properties();
@@ -32,8 +33,8 @@
config = new KustvaktConfiguration();
config.loadBasicProperties(properties);
- springConfig = "default-lite-config.xml";
-
+ springConfig = "default-lite-config.xml";
+
rootPackages = "de.ids_mannheim.korap.core.web; "
+ "de.ids_mannheim.korap.web.filter; "
+ "de.ids_mannheim.korap.web.utils; "
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
index 098d68c..392190e 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
@@ -18,26 +18,27 @@
public static void main (String[] args) throws Exception {
KustvaktServer server = new KustvaktServer();
kargs = server.readAttributes(args);
-
+
File f = new File("kustvakt.conf");
Properties properties = new Properties();
-
+
InputStream in = null;
- if (!f.exists()){
- in = KustvaktServer.class.getClassLoader().getResourceAsStream("kustvakt.conf");
+ if (!f.exists()) {
+ in = KustvaktServer.class.getClassLoader()
+ .getResourceAsStream("kustvakt.conf");
}
- else{
+ else {
in = new FileInputStream(f);
}
-
+
properties.load(in);
in.close();
-
+
config = new FullConfiguration();
config.loadBasicProperties(properties);
- if (kargs == null)
- System.exit(0);
+ if (kargs == null)
+ System.exit(0);
server.start();
}