adaptive-caching-framework

diff --git a/aplcache/src/main/java/br/ufrgs/inf/prosoft/adaptivecaching/AdaptiveCachingCoordinator.java b/aplcache/src/main/java/br/ufrgs/inf/prosoft/adaptivecaching/AdaptiveCachingCoordinator.java
index 410fa8c..c11cf08 100644
--- a/aplcache/src/main/java/br/ufrgs/inf/prosoft/adaptivecaching/AdaptiveCachingCoordinator.java
+++ b/aplcache/src/main/java/br/ufrgs/inf/prosoft/adaptivecaching/AdaptiveCachingCoordinator.java
@@ -14,7 +14,7 @@ import br.ufrgs.inf.prosoft.tigris.monitoring.metadata.LogTrace;
 import br.ufrgs.inf.prosoft.tigris.monitoring.storage.Repository;
 import br.ufrgs.inf.prosoft.tigris.monitoring.usersession.UserGetter;
 import br.ufrgs.inf.prosoft.tigris.monitoring.usersession.UserGetterFactory;
-import br.ufrgs.inf.prosoft.utils.ConfigurationUtils;
+import br.ufrgs.inf.prosoft.tigris.utils.ConfigurationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/aplcache/src/main/resources/logback.xml b/aplcache/src/main/resources/logback.xml
index 5b2d1ad..0e2b5b8 100644
--- a/aplcache/src/main/resources/logback.xml
+++ b/aplcache/src/main/resources/logback.xml
@@ -7,12 +7,7 @@
         </encoder>
     </appender>
 
-    <logger name="br.ufrgs.inf.prosoft.adaptivecaching.cachemanager" level="info" additivity="false">
-        <appender-ref ref="STDOUT" />
-        <!--<appender-ref ref="FILE" />-->
-    </logger>
-
-    <logger name="br.ufrgs.inf.prosoft.adaptivecaching.analysis" level="debug" additivity="false">
+    <logger name="br.ufrgs.inf.prosoft.adaptivecaching" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
         <!--<appender-ref ref="FILE" />-->
     </logger>

diff --git a/app-example/pom.xml b/app-example/pom.xml
index 90b1485..15c1740 100644
--- a/app-example/pom.xml
+++ b/app-example/pom.xml
@@ -126,16 +126,6 @@
             <artifactId>spring-oxm</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.aspectj</groupId>-->
-            <!--<artifactId>aspectjrt</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.aspectj</groupId>-->
-            <!--<artifactId>aspectjweaver</artifactId>-->
-            <!--<scope>runtime</scope>-->
-        <!--</dependency>-->
-
         <!-- Database connection pool
         See here for more details on commons-dbcp versus tomcat-jdbc:
         http://blog.ippon.fr/2013/03/13/improving-the-performance-of-the-spring-petclinic-sample-application-part-3-of-5/
@@ -344,7 +334,6 @@
                         <phase>process-sources</phase>
                         <goals>
                             <goal>compile</goal>
-                            <goal>test-compile</goal>
                         </goals>
                     </execution>
                 </executions>

diff --git a/app-example/src/main/java/org/springframework/samples/petclinic/Configuration.java b/app-example/src/main/java/org/springframework/samples/petclinic/Configuration.java
index 0df278e..bc91045 100644
--- a/app-example/src/main/java/org/springframework/samples/petclinic/Configuration.java
+++ b/app-example/src/main/java/org/springframework/samples/petclinic/Configuration.java
@@ -3,17 +3,24 @@ package org.springframework.samples.petclinic;
 import br.ufrgs.inf.prosoft.adaptivecaching.configuration.annotation.AdaptiveCaching;
 import br.ufrgs.inf.prosoft.adaptivecaching.configuration.types.CacheProviderType;
 import br.ufrgs.inf.prosoft.tigris.configuration.annotation.ComponentScan;
+import br.ufrgs.inf.prosoft.tigris.configuration.annotation.Metrics;
 import br.ufrgs.inf.prosoft.tigris.configuration.annotation.TigrisConfiguration;
+import br.ufrgs.inf.prosoft.tigris.configuration.annotation.TigrisCriteria;
 import br.ufrgs.inf.prosoft.tigris.configuration.types.Modelling;
 import br.ufrgs.inf.prosoft.tigris.configuration.types.RepositoryType;
 import br.ufrgs.inf.prosoft.tigris.sampling.GranularityType;
-import br.ufrgs.inf.prosoft.tigris.sampling.SamplingConfiguration;
 
 @TigrisConfiguration(
     logRepository = RepositoryType.MEMORY,
     staticMetricFile = "petclinic.csv",
-    criteria = "more frequent OR more expensive")
-@SamplingConfiguration(granularity = GranularityType.METHOD, samplingPercentage = 50)
+    samplingPercentage = 0.5)
+@TigrisCriteria(
+    criteria = "more frequent '∪' more expensive",
+    granularity = GranularityType.METHOD,
+    frequencyMetric = Metrics.INVOCATION_FREQUENCY,
+    expensivenessMetric = Metrics.EXECUTION_TIME,
+    changeabilityMetric = Metrics.COMPUTATION_PATTERN
+)
 @AdaptiveCaching(cacheProvider = CacheProviderType.EHCACHE,
     modelling = Modelling.FULLEXPLORATION, disableMonitoringAfterAnalysis = false,
     analyzeOnce = true, expiryInterval = 60)