From da889d489da5d7fa8c71d9f21f24b1dc2e29d8e1 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 28 Jan 2015 08:53:21 +0000
Subject: [PATCH] #0 refactoring - Removing Google Guice by CDI standard
---
securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
index 737da7c..52a50f6 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
@@ -7,15 +7,13 @@
import java.util.List;
import java.util.Properties;
+import javax.enterprise.context.ApplicationScoped;
import javax.inject.Named;
-import javax.inject.Singleton;
-import javax.sql.DataSource;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriBuilderException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.h2.jdbcx.JdbcDataSource;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@@ -46,7 +44,7 @@
@Named("base-uri")
@Provides
- @Singleton
+ @ApplicationScoped
public URI getBaseURI() {
// TODO Read from configuration, where?
try {
@@ -81,7 +79,7 @@
@Named("temporary-dir")
@Provides
- @Singleton
+ @ApplicationScoped
public File getTemporaryDir() {
String tmp = getAppDir().getAbsolutePath();
tmp += File.separator + ".TEMP";
@@ -98,7 +96,7 @@
@Named("app-dir")
@Provides
- @Singleton
+ @ApplicationScoped
public File getAppDir() {
String appDir = System.getProperty("user.home", System.getProperty("user.dir"));
if (appDir == null) {
@@ -117,33 +115,21 @@
@Named("support-email")
@Provides
- @Singleton
+ @ApplicationScoped
public String getSupportEmail() {
- return "integrity@curistec.com";
+ return "support@curisit.net";
}
@Named("hash-logo")
@Provides
- @Singleton
+ @ApplicationScoped
public String getHashLogo() {
return "1b42616809d4cd8ccf109e3c30d0ab25067f160b30b7354a08ddd563de0096ba";
}
- @Provides
- @Singleton
- public DataSource getDataSource(@Named("app-dir") File appDir) {
-
- JdbcDataSource dataSource = new JdbcDataSource();
- dataSource.setURL(getUrl(appDir));
- dataSource.setUser("curis");
- dataSource.setPassword(getPassword());
- LOG.debug("JdbcDataSource: {}", dataSource);
- return dataSource;
- }
-
@Named("db-files")
@Provides
- @Singleton
+ @ApplicationScoped
public List<String> getDbFiles() {
return getAppDbFiles();
}
--
Gitblit v1.3.2