fix: adjust gluu coordinates #162

GluuFederation · Nov 9, 2021 · 57aedf1 · 57aedf1
1 parent 1632090
commit 57aedf1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -3,18 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>casa</artifactId>
-	<packaging>war</packaging>
+    <artifactId>casa</artifactId>
+    <packaging>war</packaging>
 
-	<parent>
-            <groupId>org.gluu</groupId>
-            <artifactId>casa-base</artifactId>
-            <version>5.0.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.gluu</groupId>
+        <artifactId>casa-base</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
+    </parent>
 
-	<dependencies>
+    <dependencies>
         <dependency>
             <groupId>org.gluu</groupId>
             <artifactId>casa-config</artifactId>
@@ -260,11 +260,18 @@
             <version>2.3.2</version>
         </dependency>
 
+        <!-- JACKSON -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>oauth2-oidc-sdk</artifactId>

diff --git a/app/src/main/java/org/gluu/casa/core/PersistenceService.java b/app/src/main/java/org/gluu/casa/core/PersistenceService.java
@@ -40,7 +40,7 @@ public class PersistenceService implements IPersistenceService {
 
     private static final int RETRIES = 15;
     private static final int RETRY_INTERVAL = 15;
-    private static final String DEFAULT_CONF_BASE = "/etc/gluu/conf";
+    private static final String DEFAULT_CONF_BASE = "/etc/jans/conf";
 
     @Inject
     private Logger logger;
@@ -386,7 +386,7 @@ private boolean setup(int retries, int retry_interval) throws Exception {
         entryManager = null;
         stringEncrypter = Utils.stringEncrypter();
 
-        //load the configuration using the oxcore-persistence-cdi API
+        //load the configuration using the jans-core-persistence-cdi API
         logger.debug("Obtaining PersistenceEntryManagerFactory from persistence API");
         PersistenceConfiguration persistenceConf = persistanceFactoryService.loadPersistenceConfiguration();
         FileConfiguration persistenceConfig = persistenceConf.getConfiguration();
@@ -418,14 +418,14 @@ private boolean setup(int retries, int retry_interval) throws Exception {
             logger.error("No EntryManager could be obtained");
         } else {
 
-            try (Reader f = new FileReader(String.format("%s/gluu.properties", DEFAULT_CONF_BASE))) {
+            try (Reader f = new FileReader(String.format("%s/jans.properties", DEFAULT_CONF_BASE))) {
 
                 Properties generalProps = new Properties();
                 generalProps.load(f);
                 //Initialize important class members
                 ret = loadApplianceSettings(generalProps);
             } catch (Exception e) {
-                logger.error("Fatal: gluu.properties not readable", e);
+                logger.error("Fatal: jans.properties not readable", e);
             }
         }
 

diff --git a/config/src/main/java/org/gluu/casa/conf/MainSettings.java b/config/src/main/java/org/gluu/casa/conf/MainSettings.java
@@ -8,9 +8,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author jgomer
- */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MainSettings {
 
@@ -30,7 +27,7 @@ public class MainSettings {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String extraCssSnippet;
 
-    @JsonProperty("oxd_config")
+    @JsonProperty("oidc_config")
     private OIDCSettings oidcSettings;
 
     @JsonProperty("allowed_cors_domains")
@@ -98,7 +95,7 @@ public void setExtraCssSnippet(String extraCssSnippet) {
         this.extraCssSnippet = extraCssSnippet;
     }
 
-    public void setOidcSettings(OIDCSettings oxdSettings) {
+    public void setOidcSettings(OIDCSettings oidcSettings) {
         this.oidcSettings = oidcSettings;
     }
 

diff --git a/shared/src/main/java/org/gluu/casa/misc/Utils.java b/shared/src/main/java/org/gluu/casa/misc/Utils.java
@@ -27,15 +27,15 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Provides miscelaneous utilities.
+ * Provides miscellaneous utilities.
  * @author jgomer
  */
 public final class Utils {
 
     private static Logger LOG = LoggerFactory.getLogger(Utils.class);
     private static ObjectMapper MAPPER = new ObjectMapper();
     private static Tika tika = new Tika();    
-    private static final String SALT_FILE_LOCATION = "/etc/gluu/conf/salt";
+    private static final String SALT_FILE_LOCATION = "/etc/jans/conf/salt";
 
     private Utils() { }