Merge pull request #604 from jpkrohling/HAWKULAR-733-RemoveHostSynonyms

HAWKULAR-733 - Fixed auth server URL.
hawkular · Oct 27, 2015 · 4bc85ba · 4bc85ba
2 parents 627d90a + fd2f6c9
commit 4bc85ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/console/src/main/webapp/keycloak.json b/console/src/main/webapp/keycloak.json
@@ -1,6 +1,6 @@
 {
   "realm": "hawkular",
-  "auth-server-url": "/auth",
+  "auth-server-url": "http://localhost:8080/auth",
   "ssl-required": "none",
   "resource": "hawkular-ui",
   "public-client": true

diff --git a/dist/src/main/resources/configuration/hawkular-realm-for-dev.json b/dist/src/main/resources/configuration/hawkular-realm-for-dev.json
@@ -87,8 +87,8 @@
       "enabled": true,
       "bearerOnly" : false,
       "publicClient": false,
-      "redirectUris": ["/*", "http://localhost:2772/*"],
-      "webOrigins": ["http://localhost:2772", "http://localhost:8080", "http://127.0.0.1:8080", "http://localhost:9876", "http://127.0.0.1:9876"],
+      "redirectUris": ["/*", "http://localhost:8080/*", "http://127.0.0.1:8080/*"],
+      "webOrigins": ["http://localhost:2772", "http://localhost:8080", "http://127.0.0.1:8080"],
       "secret" : "${uuid.hawkular.accounts.backend}"
     },
     {
@@ -98,8 +98,8 @@
       "publicClient": true,
       "secret": "${uuid.hawkular.ui}",
       "fullScopeAllowed" : false,
-      "redirectUris": ["/*"],
-      "webOrigins": ["http://localhost:8080", "http://127.0.0.1:8080"],
+      "redirectUris": ["/*", "http://localhost:8080/*", "http://127.0.0.1:8080/*"],
+      "webOrigins": ["http://localhost:2772", "http://localhost:8080", "http://127.0.0.1:8080"],
       "claims": {
         "username": true,
         "name": true,

diff --git a/dist/src/main/resources/configuration/hawkular-realm.json b/dist/src/main/resources/configuration/hawkular-realm.json
@@ -65,8 +65,8 @@
       "enabled": true,
       "bearerOnly" : false,
       "publicClient": false,
-      "redirectUris": ["/*", "http://localhost:2772/*"],
-      "webOrigins": ["http://localhost:2772"],
+      "redirectUris": ["/*", "http://localhost:8080/*", "http://127.0.0.1:8080/*"],
+      "webOrigins": ["http://localhost:2772", "http://localhost:8080", "http://127.0.0.1:8080"],
       "secret" : "${uuid.hawkular.accounts.backend}"
     },
     {
@@ -76,8 +76,8 @@
       "publicClient": true,
       "secret": "${uuid.hawkular.ui}",
       "fullScopeAllowed" : false,
-      "redirectUris": ["/*"],
-      "webOrigins": [],
+      "redirectUris": ["/*", "http://localhost:8080/*", "http://127.0.0.1:8080/*"],
+      "webOrigins": ["http://localhost:2772", "http://localhost:8080", "http://127.0.0.1:8080"],
       "claims": {
         "username": true,
         "name": true,

diff --git a/dist/src/main/resources/wildfly/patches/standalone.xsl b/dist/src/main/resources/wildfly/patches/standalone.xsl
@@ -987,7 +987,7 @@
       </subsystem>
       <subsystem xmlns="urn:jboss:domain:keycloak:1.1">
         <realm name="hawkular">
-          <auth-server-url>/auth</auth-server-url>
+          <auth-server-url>http://localhost:8080/auth</auth-server-url>
           <ssl-required>none</ssl-required>
         </realm>
         <secure-deployment name="hawkular-accounts.war">

diff --git a/pom.xml b/pom.xml
@@ -83,12 +83,12 @@
     <version.com.google.guava>16.0.1</version.com.google.guava>
     <version.commons.io>2.4</version.commons.io>
     <version.gnu.getopt>1.0.13</version.gnu.getopt>
-    <version.org.hawkular.accounts>1.0.16.Final</version.org.hawkular.accounts>
-    <version.org.hawkular.agent>0.11.1.Final</version.org.hawkular.agent>
+    <version.org.hawkular.accounts>1.0.17.Final-SRC-revision-11f18166ce41b211fd54314a8720e27cda80185f</version.org.hawkular.accounts>
+    <version.org.hawkular.agent>0.11.2.Final-SRC-revision-59b912b9ba203d510b35177bde1bde9fc7975a1d</version.org.hawkular.agent>
     <version.org.hawkular.alerts>0.5.0.Final</version.org.hawkular.alerts>
     <version.org.hawkular.bus>0.7.1.Final</version.org.hawkular.bus>
     <version.org.hawkular.commons>0.2.2.Final</version.org.hawkular.commons>
-    <version.org.hawkular.cmdgw>0.10.1.Final</version.org.hawkular.cmdgw>
+    <version.org.hawkular.cmdgw>0.10.2.Final-SRC-revision-06aa579bd1b9658cf82af6cfedef6365ecf03e8c</version.org.hawkular.cmdgw>
     <version.org.hawkular.metrics>0.9.0.Final-SRC-revision-9080fcfbe40a66ce8143c477b5d6f8fbadeecf3a</version.org.hawkular.metrics>
     <version.org.hawkular.inventory>0.7.0.Final</version.org.hawkular.inventory>
     <version.org.hawkular.nest>${version.org.hawkular.bus}</version.org.hawkular.nest>