<artifactId>com.springsource.javax.activation</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Required in JDK 1.5 -->
+ <dependency>
+ <groupId>com.sun.xml</groupId>
+ <artifactId>
+ com.springsource.com.sun.xml.messaging.saaj
+ </artifactId>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
log4j.logger.org.argeo.slc=WARN\r
\r
# Spring\r
-log4j.logger.org.springframework=WARN\r
+log4j.logger.org.springframework=INFO\r
log4j.logger.org.springframework.transaction=WARN\r
log4j.logger.org.springframework.orm.hibernate3=WARN\r
log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN\r
--- /dev/null
+package org.argeo.slc.web.mvc.result;\r
+\r
+import java.util.List;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.argeo.slc.core.test.tree.ResultAttributes;\r
+import org.argeo.slc.core.test.tree.ResultAttributesList;\r
+import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
+import org.argeo.slc.web.mvc.AbstractServiceController;\r
+import org.springframework.web.servlet.ModelAndView;\r
+\r
+public class ListResultAttributesController extends AbstractServiceController {\r
+ private final TreeTestResultCollectionDao testResultCollectionDao;\r
+\r
+ public ListResultAttributesController(\r
+ TreeTestResultCollectionDao testResultCollectionDao) {\r
+ this.testResultCollectionDao = testResultCollectionDao;\r
+ }\r
+\r
+ @Override\r
+ protected void handleServiceRequest(HttpServletRequest request,\r
+ HttpServletResponse response, ModelAndView modelAndView)\r
+ throws Exception {\r
+ String collectionId = request.getParameter("id");\r
+\r
+ List<ResultAttributes> resultAttributes = testResultCollectionDao\r
+ .listResultAttributes(collectionId);\r
+\r
+ modelAndView.addObject("resultAttributesList",\r
+ new ResultAttributesList(resultAttributes));\r
+ }\r
+}\r
<constructor-arg ref="testResultCollectionDao" />
</bean>
-<!--
- <bean name="/resultList.service" class="org.argeo.slc.web.mvc.result.ResultListController">
- <constructor-arg ref="testResultDao" />
+ <bean name="/listResultAttributes.service"
+ class="org.argeo.slc.web.mvc.result.ListResultAttributesController">
+ <constructor-arg ref="testResultCollectionDao" />
</bean>
-
- <bean name="/resultCollectionView.service"
+ <!--
+ <bean name="/resultList.service"
+ class="org.argeo.slc.web.mvc.result.ResultListController">
+ <constructor-arg ref="testResultDao" /> </bean> <bean
+ name="/resultCollectionView.service"
class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">
- <constructor-arg ref="testResultCollectionDao" />
- </bean>
- -->
+ <constructor-arg ref="testResultCollectionDao" /> </bean>
+ -->
<bean id="handlerMapping"
class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
<property name="interceptors">
<mapping>
<description>Message objects XML mapping</description>
+ <!-- TODO: use XML entities to factorize patterns -->
+
<!-- BASIC -->
<class name="org.argeo.slc.msg.ExecutionAnswer">
<map-to ns-uri="http://argeo.org/projects/slc/schemas"
<class name="org.argeo.slc.msg.ReferenceList">
<map-to ns-uri="http://argeo.org/projects/slc/schemas"
ns-prefix="slc" />
- <field name="references" collection="vector" type="string">
+ <field name="references" collection="arraylist" type="string">
<bind-xml name="ref" />
</field>
</class>
</field>
</class>
+ <class name="org.argeo.slc.core.test.tree.ResultAttributesList">
+ <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+ ns-prefix="slc" />
+ <field name="list" collection="arraylist"
+ type="org.argeo.slc.core.test.tree.ResultAttributes">
+ <bind-xml auto-naming="deriveByClass" />
+ </field>
+ </class>
+
+ <class name="org.argeo.slc.core.test.tree.ResultAttributes">
+ <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+ ns-prefix="slc" />
+ <field name="uuid" />
+ <field name="attributes" collection="hashtable">
+ <bind-xml name="attribute" location="attributes">
+ <class name="org.exolab.castor.mapping.MapItem">
+ <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+ ns-prefix="slc" />
+ <field name="key" type="string">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="value" type="string">
+ <bind-xml node="text" />
+ </field>
+ </class>
+ </bind-xml>
+ </field>
+ </class>
+
<!-- PROCESS -->
<class name="org.argeo.slc.msg.process.SlcExecutionStepsRequest">
package org.argeo.slc.hibernate.test.tree;\r
\r
import java.sql.SQLException;\r
+import java.util.List;\r
import java.util.SortedSet;\r
import java.util.TreeSet;\r
\r
+import org.argeo.slc.core.test.tree.ResultAttributes;\r
import org.argeo.slc.core.test.tree.TreeTestResult;\r
import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
getHibernateTemplate().update(ttrCollection);\r
}\r
\r
+ @SuppressWarnings("unchecked")\r
public SortedSet<TreeTestResultCollection> listCollections() {\r
return new TreeSet<TreeTestResultCollection>(getHibernateTemplate()\r
.find("from TreeTestResultCollection"));\r
});\r
}\r
\r
+ @SuppressWarnings("unchecked")\r
+ public List<ResultAttributes> listResultAttributes(String collectionId) {\r
+ List<ResultAttributes> list;\r
+ if (collectionId == null)\r
+ list = getHibernateTemplate().find(\r
+ "select new org.argeo.slc.core.test.tree.ResultAttributes(ttr)"\r
+ + " from TreeTestResult ttr");\r
+ else\r
+ list = getHibernateTemplate()\r
+ .find(\r
+ "select new org.argeo.slc.core.test.tree.ResultAttributes(ttr) "\r
+ + " from TreeTestResult ttr, TreeTestResultCollection ttrc "\r
+ + " where ttr in elements(ttrc.results) and ttrc.id=?",\r
+ collectionId);\r
+\r
+ return list;\r
+ }\r
}\r
--- /dev/null
+package org.argeo.slc.core.test.tree;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+public class ResultAttributes {
+ private String uuid = null;
+ private Map<String, String> attributes = new Hashtable<String, String>();
+
+ public ResultAttributes() {
+ super();
+ }
+
+ public ResultAttributes(TreeTestResult ttr) {
+ super();
+ this.uuid = ttr.getUuid();
+ this.attributes = ttr.getAttributes();
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public Map<String, String> getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Map<String, String> attributes) {
+ this.attributes = attributes;
+ }
+
+}
--- /dev/null
+package org.argeo.slc.core.test.tree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ResultAttributesList {
+ private List<ResultAttributes> list = new ArrayList<ResultAttributes>();
+
+ public ResultAttributesList() {
+ super();
+ }
+
+ public ResultAttributesList(List<ResultAttributes> list) {
+ super();
+ this.list = list;
+ }
+
+ public List<ResultAttributes> getList() {
+ return list;
+ }
+
+ public void setList(List<ResultAttributes> list) {
+ this.list = list;
+ }
+
+}
package org.argeo.slc.dao.test.tree;\r
\r
+import java.util.List;\r
import java.util.SortedSet;\r
\r
+import org.argeo.slc.core.test.tree.ResultAttributes;\r
import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
\r
public interface TreeTestResultCollectionDao {\r
\r
public SortedSet<TreeTestResultCollection> listCollections();\r
\r
+ public List<ResultAttributes> listResultAttributes(String collectionId);\r
+\r
public void addResultToCollection(TreeTestResultCollection ttrc,\r
String resultUuid);\r
\r
package org.argeo.slc.msg;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
public class ReferenceList {
- private List<String> references = new Vector<String>();
+ private List<String> references = new ArrayList<String>();
public List<String> getReferences() {
return references;