add missing files from svn

SpagoBILabs · May 5, 2016 · d1836c2 · d1836c2
1 parent e0e3fc7
commit d1836c2
Show file tree

Hide file tree

Showing 81 changed files with 404,505 additions and 514 deletions.
diff --git a/ChefCookbooks/spagobi/templates/default/sbi_hibernate.cfg.xml.erb b/ChefCookbooks/spagobi/templates/default/sbi_hibernate.cfg.xml.erb
@@ -174,10 +174,6 @@
         <mapping resource="it/eng/spagobi/community/mapping/SbiCommunity.hbm.xml" />
         <mapping resource="it/eng/spagobi/community/mapping/SbiCommunityUsers.hbm.xml" />
 
-            <!-- CACHE -->
-        <mapping resource="it/eng/spagobi/cache/metadata/mapping/SbiCacheItem.hbm.xml" />
-        <mapping resource="it/eng/spagobi/cache/metadata/mapping/SbiCacheJoinedItem.hbm.xml" />
-
         <!-- end mapping -->
 
         <class-cache class="it.eng.spagobi.commons.metadata.SbiDomains" usage="read-only"/>

diff --git a/SpagoBIDAO/src/main/java/it/eng/spagobi/behaviouralmodel/lov/bo/FixedListDetail.java b/SpagoBIDAO/src/main/java/it/eng/spagobi/behaviouralmodel/lov/bo/FixedListDetail.java
@@ -24,8 +24,6 @@
 import it.eng.spagobi.utilities.assertion.Assert;
 import it.eng.spagobi.utilities.exceptions.SpagoBIRuntimeException;
 import it.eng.spagobi.utilities.objects.Couple;
-<<<<<<<
-=======
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,16 +36,6 @@
 
 import org.apache.log4j.Logger;
 
->>>>>>>
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.log4j.Logger;
-
 /**
  * Defines method to manage lov of fixed list type
  */
@@ -280,8 +268,6 @@ public String getLovResult(IEngUserProfile profile, List<ObjParuse> dependencies
 			String value = lov.getValue();
 			String description = lov.getDescription();
 			lovResult += "<ROW" + " VALUE=\"" + value + "\"" + " DESCRIPTION=\"" + description + "\"" + "/>";
-<<<<<<<
-=======
 		}
 		lovResult += "</ROWS>";
 		lovResult = StringUtilities.substituteProfileAttributesInString(lovResult, profile);
@@ -294,13 +280,6 @@ public String getLovResult(IEngUserProfile profile, List<ObjParuse> dependencies
 		return lovResult;
 	}
 
->>>>>>>
-		}
-		lovResult += "</ROWS>";
-		lovResult = StringUtilities.substituteProfileAttributesInString(lovResult, profile);
-		return lovResult;
-	}
-
 	/**
 	 * Method returns result of the defined LOV of type fixed list as data store.
 	 * */
@@ -402,8 +381,6 @@ public List getProfileAttributeNames() throws Exception {
 			lovResult = lovResult.substring(endind);
 		}
 		return names;
-<<<<<<<
-=======
 	}
 
 	/**
@@ -434,13 +411,6 @@ public Set<String> getParameterNames() throws Exception {
 		return names;
 	}
 
-	/**
-	 * Checks if the lov requires one or more profile attributes.
-	 *
-	 * @return true if the lov require one or more profile attributes, false otherwise
->>>>>>>
-	}
-
 	/**
 	 * Checks if the lov requires one or more profile attributes.
 	 *

diff --git a/SpagoBIProject/web-content/WEB-INF/jsp/engines/chart/highchart.jsp.ori b/SpagoBIProject/web-content/WEB-INF/jsp/engines/chart/highchart.jsp.ori