Merge branch 'master' of https://github.com/GluuFederation/oxTrust

GluuFederation · Sep 15, 2015 · f292e23 · f292e23
2 parents 6366bf0 + 867935e
commit f292e23
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 14 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/service/MetricService.java b/server/src/main/java/org/gluu/oxtrust/service/MetricService.java
@@ -18,6 +18,8 @@
 import org.gluu.oxtrust.ldap.service.ApplianceService;
 import org.gluu.oxtrust.ldap.service.OrganizationService;
 import org.gluu.oxtrust.model.AuthenticationChartDto;
+import org.gluu.oxtrust.model.GluuOrganization;
+import org.gluu.oxtrust.util.OxTrustConstants;
 import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
@@ -29,6 +31,7 @@
 import org.xdi.model.ApplicationType;
 import org.xdi.model.metric.MetricType;
 import org.xdi.model.metric.ldap.MetricEntry;
+import org.xdi.service.CacheService;
 
 /**
  * Store and retrieve metric
@@ -48,7 +51,10 @@ public class MetricService extends org.xdi.service.metric.MetricService {
 
 	@Logger
 	private Log log;
-
+
+	@In
+	private CacheService cacheService;
+
 	@In
 	private ApplianceService applianceService;
 
@@ -60,8 +66,12 @@ public class MetricService extends org.xdi.service.metric.MetricService {
 
 	public AuthenticationChartDto genereateAuthenticationChartDto(int countDays) {
 		AuthenticationChartDto authenticationChartDto = new AuthenticationChartDto();
-
-		Map<MetricType, List<MetricEntry>> entries = findAuthenticationMetrics(-countDays);
+		String key = OxTrustConstants.CACHE_METRICS_KEY;
+		Map<MetricType, List<MetricEntry>> entries = (Map<MetricType, List<MetricEntry>>) cacheService.get(OxTrustConstants.CACHE_METRICS_NAME, key);
+		if (entries== null) {
+			entries = findAuthenticationMetrics(-countDays);
+			cacheService.put(OxTrustConstants.CACHE_METRICS_NAME, key, entries);
+		}
 
 		String []labels = new String[countDays];
 		Map<String, Integer> successStats = calculateStatistics(countDays, entries.get(MetricType.OXAUTH_USER_AUTHENTICATION_SUCCESS));

diff --git a/server/src/main/resources/ehcache.xml b/server/src/main/resources/ehcache.xml
@@ -122,4 +122,11 @@
            timeToLiveSeconds="60"
            memoryStoreEvictionPolicy="LRU"/>
 
+ <cache name="metricsCache"
+           maxElementsInMemory="1000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="60"
+           timeToLiveSeconds="14400"
+           memoryStoreEvictionPolicy="LRU"/>
 </ehcache>
diff --git a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
@@ -121,7 +121,7 @@
 									</h:selectOneMenu>
 								</s:decorate>
 
-								<s:decorate template="/WEB-INF/incl/layout/edit.xhtml"
+<!-- 								<s:decorate template="/WEB-INF/incl/layout/edit.xhtml"
 									id="federationHosting">
 									<ui:define name="label">Federation Hosting</ui:define>
 									<h:selectOneMenu value="#{_appliance.federationHostingEnabled}" styleClass="form-control"
@@ -131,7 +131,7 @@
 											var="_type" label="#{_type.displayName}" />
 										<s:convertEnum />
 									</h:selectOneMenu>
-								</s:decorate>
+								</s:decorate> -->
 
 								<s:decorate template="/WEB-INF/incl/layout/edit.xhtml"
 									id="passwordReset">

diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml
@@ -55,8 +55,8 @@
             </h:panelGrid>
 
             <div id="filtersUpdate">
-                <a4j:commandButton value="Save" action="#{metadataFiltersAction.saveFilters}" oncomplete="#{rich:component('additionalTRParamsPanel')}.hide()" render="MetadataFilterMenu" />
-                <a4j:commandButton value="Back" onclick="#{rich:component('additionalTRParamsPanel')}.hide()" immediate="true" />
+                <a4j:commandButton styleClass="btn btn-primary" value="Save" action="#{metadataFiltersAction.saveFilters}" oncomplete="#{rich:component('additionalTRParamsPanel')}.hide()" render="MetadataFilterMenu" />
+                <a4j:commandButton styleClass="btn btn-primary" value="Back" onclick="#{rich:component('additionalTRParamsPanel')}.hide()" immediate="true" />
             </div>
         </h:form>
     </rich:popupPanel>

diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml
@@ -185,7 +185,7 @@
 								<h:panelGroup id="urlId">
 									<s:decorate template="/WEB-INF/incl/layout/edit.xhtml" id="url"
 										required="true"
-										rendered="#{((_trustRelationship.spMetaDataSourceType.value eq 'file') and (not empty _trustRelationship.url))}">
+										rendered="#{((_trustRelationship.spMetaDataSourceType.value eq 'file') and (not empty _trustRelationship.url) or (_trustRelationship.spMetaDataSourceType.value eq 'generate'))}">
 										<ui:define name="label">URL</ui:define>
 										<h:inputText styleClass="form-control"
 											value="#{_trustRelationship.url}" rows="3" size="40"
@@ -316,7 +316,7 @@
 							id="configureSpecific">
 							<ui:define name="label">Configure specific RelyingParty</ui:define>
 							<h:panelGrid columns="2" width="100%" id="RelyingPartyConfig"
-								rendered="#{not (_new or _trustRelationship.isFederation())}">
+								>
 								<h:panelGrid columns="2">
 
 									<h:selectBooleanCheckbox

diff --git a/server/src/main/webapp/attribute/attributeInventory.xhtml b/server/src/main/webapp/attribute/attributeInventory.xhtml
@@ -28,14 +28,15 @@
 		<div id="formArea">
 			<h:panelGroup columns="1" border="0" cellpadding="0" cellspacing="0"
 				width="100%">
+				<h:form id="attributesFormId">
 				<s:link view="/attribute/addAttribute.xhtml"
 					styleClass="label label-success" value="Add Attribute" propagation="none" style="padding:6px;" />
 
 
 				<s:fragment rendered="#{attributeInventoryAction.showInactive}">
 					<a4j:commandLink value="Show only Active Attributes"
 						action="#{attributeInventoryAction.toggleShowInactive}"
-						render="attributesFormId" />
+						styleClass="label label-success" render="attributesFormId" style="margin-left:5px;padding:6px;" />
 				</s:fragment>
 
 				<s:fragment rendered="#{not attributeInventoryAction.showInactive}">
@@ -45,7 +46,7 @@
 				</s:fragment>
 
 
-				<h:form id="attributesFormId">
+
 					<div class="row" style="padding-top:20px">
 						<div class="col-xs-12">
 							<div class="nav-tabs-custom" style="margin-bottom: 0px;">

diff --git a/server/src/main/webapp/resources/js/dashboard.js b/server/src/main/webapp/resources/js/dashboard.js
@@ -6,11 +6,13 @@ $(function () {
 //-----------------------
   //- Dashboard > Authentication Requests Chart -
   //-----------------------
+	try{
 
   // Get context with jQuery - using jQuery's .get() method.
   var authenticationRequestsChartCanvas = $("#authenticationRequestsChart").get(0).getContext("2d");
   // This will get the first returned node in the jQuery collection.
   var authenticationRequestsChart = new Chart(authenticationRequestsChartCanvas);
+
 
   var authChartData = JSON.parse($("#authenticationChartJson").val());  
   console.log("authentication chart data");
@@ -86,5 +88,8 @@ $(function () {
   //Create the line chart
   authenticationRequestsChart.Line(authenticationRequestsChartData, authenticationRequestsChartOptions);
 
-
+	}catch(error){
+		console.log(error);
+	}
+
 });
diff --git a/server/src/main/webapp/resources/ox/selectScopeDialog.xhtml b/server/src/main/webapp/resources/ox/selectScopeDialog.xhtml
@@ -32,15 +32,15 @@
 
         <h:form>
 
-            <h:panelGroup>
+            <h:panelGroup id = "scopePanelId">
 
                 <s:decorate template="/WEB-INF/incl/layout/edit.xhtml" id="searchPattern">
                     <ui:param name="_hideLabel" value="true" />
 
                     <h:inputText  value="#{cc.attrs.searchPattern}" size="20" maxlength="30" id="searchScopePatternId" styleClass="searchParameters form-control"
                         alt="Search parameters like iNum, Name, Display Name" />
 
-                    <a4j:commandButton style = "margin-top:5px;" styleClass = "btn btn-primary" value="Search" action="#{cc.attrs.searchMethod}" render="scopePanelId" />
+                    <a4j:commandButton style = "margin-top:5px;" styleClass = "btn btn-primary" value="Search" action="#{cc.attrs.searchMethod}" render="scopePanelId"  />
                 </s:decorate>
 
                 <h:panelGroup id="scopeNoResultId" rendered="#{cc.attrs.searchResult.size eq 0}">