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 a09abdf6d7a5a287906a95b1c90c755f8c706ddb..c22cd7725d5ed06498decfcd16085e8b0b33ec8a 100644 (file)
--- 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,\r
                        HttpServletResponse response, ModelAndView modelAndView)\r
                        throws Exception {\r
-               String collectionId = request.getParameter("id");\r
+               String collectionId = request.getParameter("collectionId");\r
 \r
                Map<String, String[]> parameterMap = request.getParameterMap();\r
 \r

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 6082951ee349757e8a13a559db8d3b5c5a8f79f9..968e97373aceefc705f57f124f55bc0f738ed1ac 100644 (file)
--- 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 f7fac780b7a6ae1595c76f8e9c559122208c73c8..0bd1ba09eca1809f8b26242f1fd718f4392864a3 100644 (file)
--- 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