From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Dec 2008 15:07:53 +0000 (+0000)
Subject: Change parameter from id to collectionId
X-Git-Tag: argeo-slc-2.1.7~2261
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=aae70775d889349d62850fcf163a88773633dadf;p=gpl%2Fargeo-slc.git

Change parameter from id to collectionId

git-svn-id: https://svn.argeo.org/slc/trunk@2003 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java
index a09abdf6d..c22cd7725 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java
@@ -26,7 +26,7 @@ public class ListResultsController extends AbstractServiceController {
 	protected void handleServiceRequest(HttpServletRequest request,
 			HttpServletResponse response, ModelAndView modelAndView)
 			throws Exception {
-		String collectionId = request.getParameter("id");
+		String collectionId = request.getParameter("collectionId");
 
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml
index 6082951ee..968e97373 100644
--- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml
+++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml
@@ -31,15 +31,15 @@
 		name="org.argeo.slc.core.test.tree.TreeTestResultCollection.results"
 		maxElementsInMemory="1000" />
 
-	<cache name="org.argeo.slc.core.process.SlcExecution"
+	<cache name="org.argeo.slc.process.SlcExecution"
 		maxElementsInMemory="1000" />
-	<cache name="org.argeo.slc.core.process.SlcExecution.attributes"
+	<cache name="org.argeo.slc.process.SlcExecution.attributes"
 		maxElementsInMemory="5000" />
-	<cache name="org.argeo.slc.core.process.SlcExecution.steps"
+	<cache name="org.argeo.slc.process.SlcExecution.steps"
 		maxElementsInMemory="10000" />
-	<cache name="org.argeo.slc.core.process.SlcExecutionStep"
+	<cache name="org.argeo.slc.process.SlcExecutionStep"
 		maxElementsInMemory="10000" />
-	<cache name="org.argeo.slc.core.process.SlcExecutionStep.logLines"
+	<cache name="org.argeo.slc.process.SlcExecutionStep.logLines"
 		maxElementsInMemory="100000" />
 
 	<cache name="org.argeo.slc.core.test.TestRunDescriptor"
diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
index f7fac780b..0bd1ba09e 100644
--- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
+++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
@@ -12,7 +12,7 @@
 			sort="natural">
 			<cache usage="read-write" />
 			<key column="PARENT_ID" />
-			<many-to-many class="TreeTestResult" />
+			<many-to-many class="TreeTestResult" column="TTR"/>
 		</set>
 	</class>
 </hibernate-mapping>
\ No newline at end of file