From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 29 Apr 2010 10:15:36 +0000 (+0000)
Subject: Remove old transition files
X-Git-Tag: argeo-slc-2.1.7~1334
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=3f7517acb8c3d2d5e90ddee64a7a2890be301468;p=gpl%2Fargeo-slc.git

Remove old transition files
Map JCR query views

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

diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index 6f5cf7248..a530e54e1 100644
--- a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Import-Package: net.sf.cglib.core,
  org.argeo.security.mvc;specification-version="0.1.3.SNAPSHOT-r3402",
  org.argeo.server,
  org.argeo.server.jcr.mvc;specification-version="0.1.3.SNAPSHOT-r3478",
+ org.argeo.server.json;specification-version="0.1.3.SNAPSHOT-r3371",
  org.argeo.server.mvc,
  org.argeo.slc.build,
  org.argeo.slc.core.attachment,
@@ -55,4 +56,5 @@ Import-Package: net.sf.cglib.core,
  org.springframework.web.filter,
  org.springframework.web.servlet,
  org.springframework.web.servlet.handler,
- org.springframework.web.servlet.mvc
+ org.springframework.web.servlet.mvc,
+ org.springframework.web.servlet.view;specification-version="2.5.6.SEC01"
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
index b3c51bc52..58dd6aac9 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
@@ -9,9 +9,25 @@
 
 	<context:component-scan base-package="org.argeo.server.jcr.mvc" />
 
-	<bean name="/*.jcr" class="org.argeo.server.jcr.mvc.JcrBrowserController">
+	<bean name="/*.jcr" class="org.argeo.server.jcr.mvc.JcrBrowserController" />
+
+	<!-- Views -->
+	<bean name="getJcrItem" class="org.argeo.server.mvc.SerializingView">
+		<property name="serializer">
+			<bean class="org.argeo.server.jcr.mvc.JcrXmlServerSerializer" />
+		</property>
+	</bean>
+
+	<bean name="queryJcrNodes" class="org.argeo.server.mvc.SerializingView">
+		<property name="serializer" ref="jsonSerializer" />
 	</bean>
 
+	<bean name="queryJcrTable" class="org.argeo.server.mvc.SerializingView">
+		<property name="serializer" ref="jsonSerializer" />
+	</bean>
+
+	<!-- Serializers -->
+	<bean id="jsonSerializer" class="org.argeo.server.json.JsonServerSerializer" />
 
 	<!-- MVC -->
 	<bean id="handlerMapping"
@@ -23,9 +39,6 @@
 		</property>
 	</bean>
 
-	<bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
-		<property name="serializer">
-			<bean class="org.argeo.server.jcr.mvc.JcrXmlServerSerializer" />
-		</property>
-	</bean>
+	<bean id="viewResolver"
+		class="org.springframework.web.servlet.view.BeanNameViewResolver" />
 </beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
index c381a31e3..7b9ea8e86 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
@@ -1,116 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-	<bean name="/isServerReady.service" class="org.argeo.slc.web.mvc.management.IsServerReady">
-	</bean>
-
-	<bean name="/getResult.service" class="org.argeo.slc.web.mvc.result.GetResultController">
-		<constructor-arg ref="testResultDao" />
-	</bean>
-
-	<bean name="/addResultToCollection.service"
-		class="org.argeo.slc.web.mvc.result.AddResultToCollectionController">
-		<constructor-arg ref="testManagerService" />
-	</bean>
-
-	<bean name="/removeResultFromCollection.service"
-		class="org.argeo.slc.web.mvc.result.RemoveResultFromCollectionController">
-		<constructor-arg ref="testResultCollectionDao" />
-		<constructor-arg ref="testManagerService" />
-	</bean>
-
-	<bean name="/listCollectionRefs.service"
-		class="org.argeo.slc.web.mvc.result.ResultCollectionReferencesController">
-		<constructor-arg ref="testResultCollectionDao" />
-	</bean>
-
-	<bean name="/listResultAttributes.service"
-		class="org.argeo.slc.web.mvc.result.ListResultAttributesController">
-		<constructor-arg ref="testResultCollectionDao" />
-	</bean>
-
-	<bean name="/listResults.service" class="org.argeo.slc.web.mvc.result.ListResultsController">
-		<constructor-arg ref="testResultCollectionDao" />
-	</bean>
+	<context:component-scan
+		base-package="org.argeo.slc.web.mvc, org.argeo.slc.web.mvc.process" />
 
-	<bean name="/copyCollectionToCollection.service"
-		class="org.argeo.slc.web.mvc.result.CopyCollectionToCollectionController">
-		<constructor-arg ref="testResultCollectionDao" />
-		<constructor-arg ref="testManagerService" />
-	</bean>
-
-	<bean name="/listAgents.service" class="org.argeo.slc.web.mvc.runtime.ListAgentsController">
-		<constructor-arg ref="slcAgentDescriptorDao" />
-	</bean>
-
-	<bean name="/cleanAgents.service" class="org.argeo.slc.web.mvc.runtime.CleanAgentsController">
-		<constructor-arg ref="slcAgentDescriptorDao" />
-	</bean>
-
-	<bean name="/listSlcExecutions.service"
-		class="org.argeo.slc.web.mvc.process.ListSlcExecutionsController">
-		<constructor-arg ref="slcExecutionDao" />
-	</bean>
-
-	<bean name="/getSlcExecution.service" class="org.argeo.slc.web.mvc.process.GetSlcExecution">
-		<property name="slcExecutionDao" ref="slcExecutionDao" />
-		<property name="unmarshaller" ref="unmarshaller" />
-		<property name="attachmentsStorage" ref="attachmentsStorage" />
-	</bean>
-
-	<bean name="/newSlcExecution.service"
-		class="org.argeo.slc.web.mvc.process.NewSlcExecutionController">
+	<!--  Execution  -->
+	<bean name="/*Execution*.service, /*Modules*.service"
+		class="org.argeo.slc.web.mvc.process.ExecutionServiceController">
 		<property name="agentFactory" ref="agentFactory" />
-		<property name="unmarshaller" ref="unmarshaller" />
-		<property name="marshaller" ref="marshaller" />
+		<property name="slcExecutionDao" ref="slcExecutionDao" />
 		<property name="slcExecutionService" ref="slcExecutionService" />
+		<property name="marshaller" ref="marshaller" />
+		<property name="unmarshaller" ref="unmarshaller" />
 		<property name="attachmentsStorage" ref="attachmentsStorage" />
 	</bean>
 
-	<bean name="/getExecutionDescriptor.service" class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">
-		<property name="agentFactory" ref="agentFactory" />
-	</bean>
-
-	<bean name="/listModulesDescriptors.service"
-		class="org.argeo.slc.web.mvc.execution.ListModulesDescriptors">
-		<property name="agentFactory" ref="agentFactory" />
-	</bean>
-
-	<!-- Events -->
-	<bean name="/addEventListener.service"
-		class="org.argeo.slc.web.mvc.event.AddEventListenerController">
-		<property name="eventListenerRegister" ref="eventListenerRegister" />
-	</bean>
-
-	<bean name="/removeEventListener.service"
-		class="org.argeo.slc.web.mvc.event.RemoveEventListenerController">
-		<property name="eventListenerRegister" ref="eventListenerRegister" />
-	</bean>
-
-	<bean name="/pollEvent.service" class="org.argeo.slc.web.mvc.event.PollEventController">
+	<!--  Events  -->
+	<bean name="/*Event*.service" class="org.argeo.slc.web.mvc.EventController">
 		<property name="eventListenerRegister" ref="eventListenerRegister" />
 		<property name="eventListener" ref="eventListener" />
 	</bean>
 
-	<bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
-		scope="session">
-		<aop:scoped-proxy />
-	</bean>
-
-	<!-- Attachements -->
-	<bean name="/getAttachment.service" class="org.argeo.slc.web.mvc.attachment.GetAttachmentHandler">
-		<property name="attachmentsStorage" ref="attachmentsStorage" />
-	</bean>
-
-	<!-- Management -->
-	<bean name="/shutdownRuntime.service" class="org.argeo.slc.web.mvc.management.ShutdownRuntime">
-		<property name="dynamicRuntime" ref="dynamicRuntime" />
-	</bean>
-
 	<!-- Provisioning -->
 	<bean name="/listModularDistributions.service"
 		class="org.argeo.slc.web.mvc.provisioning.ListModularDistributions">
@@ -125,6 +41,21 @@
 		<property name="dynamicRuntime" ref="dynamicRuntime" />
 	</bean>
 
+	<!--  All that remains -->
+	<bean name="/*.service" class="org.argeo.slc.web.mvc.ServiceController">
+		<constructor-arg ref="testResultDao" />
+		<constructor-arg ref="testResultCollectionDao" />
+		<constructor-arg ref="testManagerService" />
+		<constructor-arg ref="slcAgentDescriptorDao" />
+		<property name="dynamicRuntime" ref="dynamicRuntime" />
+		<property name="attachmentsStorage" ref="attachmentsStorage" />
+	</bean>
+
+	<bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
+		scope="session">
+		<aop:scoped-proxy />
+	</bean>
+
 	<!-- MVC -->
 	<bean id="handlerMapping"
 		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
@@ -135,8 +66,11 @@
 		</property>
 	</bean>
 
-	<bean id="viewResolver" class="org.argeo.slc.web.mvc.MarshallerViewResolver">
-		<constructor-arg ref="marshaller" />
+	<bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
+		<property name="serializer">
+			<bean class="org.argeo.server.MarshallerServerSerializer">
+				<property name="marshaller" ref="marshaller" />
+			</bean>
+		</property>
 	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml
deleted file mode 100644
index 7b9ea8e86..000000000
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
-	<context:component-scan
-		base-package="org.argeo.slc.web.mvc, org.argeo.slc.web.mvc.process" />
-
-	<!--  Execution  -->
-	<bean name="/*Execution*.service, /*Modules*.service"
-		class="org.argeo.slc.web.mvc.process.ExecutionServiceController">
-		<property name="agentFactory" ref="agentFactory" />
-		<property name="slcExecutionDao" ref="slcExecutionDao" />
-		<property name="slcExecutionService" ref="slcExecutionService" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="unmarshaller" />
-		<property name="attachmentsStorage" ref="attachmentsStorage" />
-	</bean>
-
-	<!--  Events  -->
-	<bean name="/*Event*.service" class="org.argeo.slc.web.mvc.EventController">
-		<property name="eventListenerRegister" ref="eventListenerRegister" />
-		<property name="eventListener" ref="eventListener" />
-	</bean>
-
-	<!-- Provisioning -->
-	<bean name="/listModularDistributions.service"
-		class="org.argeo.slc.web.mvc.provisioning.ListModularDistributions">
-		<property name="modularDistributions" ref="modularDistributions" />
-	</bean>
-
-	<bean name="/installModule.service" class="org.argeo.slc.web.mvc.management.InstallModule">
-		<property name="dynamicRuntime" ref="dynamicRuntime" />
-	</bean>
-
-	<bean name="/uninstallModule.service" class="org.argeo.slc.web.mvc.management.UninstallModule">
-		<property name="dynamicRuntime" ref="dynamicRuntime" />
-	</bean>
-
-	<!--  All that remains -->
-	<bean name="/*.service" class="org.argeo.slc.web.mvc.ServiceController">
-		<constructor-arg ref="testResultDao" />
-		<constructor-arg ref="testResultCollectionDao" />
-		<constructor-arg ref="testManagerService" />
-		<constructor-arg ref="slcAgentDescriptorDao" />
-		<property name="dynamicRuntime" ref="dynamicRuntime" />
-		<property name="attachmentsStorage" ref="attachmentsStorage" />
-	</bean>
-
-	<bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
-		scope="session">
-		<aop:scoped-proxy />
-	</bean>
-
-	<!-- MVC -->
-	<bean id="handlerMapping"
-		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-		<property name="interceptors">
-			<list>
-				<ref bean="osivInterceptor" />
-			</list>
-		</property>
-	</bean>
-
-	<bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
-		<property name="serializer">
-			<bean class="org.argeo.server.MarshallerServerSerializer">
-				<property name="marshaller" ref="marshaller" />
-			</bean>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
index bf49c0964..06d6b4867 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -6,20 +6,8 @@
 	<display-name>SLC Web Application</display-name>
 
 	<!-- SERVICE servlet -->
-
-	<!--
-		refactoring with annotation <servlet>
-		<servlet-name>slc-service</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param> <param-name>contextClass</param-name>
-		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-		</init-param> <load-on-startup>1</load-on-startup> </servlet>
-
-		<servlet-mapping> <servlet-name>slc-service</servlet-name>
-		<url-pattern>*.service</url-pattern> </servlet-mapping>
-	-->
 	<servlet>
-		<servlet-name>slcservice</servlet-name>
+		<servlet-name>slc-service</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
@@ -28,7 +16,7 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>slcservice</servlet-name>
+		<servlet-name>slc-service</servlet-name>
 		<url-pattern>*.service</url-pattern>
 	</servlet-mapping>
 
@@ -126,16 +114,4 @@
 		<param-name>argeo.security.systemKey</param-name>
 		<param-value>argeo</param-value>
 	</context-param>
-
-	<!--
-		Log4j configContext loader config <listener>
-		<display-name>Log4j</display-name>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-		</listener> <context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/classes/log4j.properties</param-value>
-		</context-param> <context-param>
-		<param-name>log4jRefreshInterval</param-name>
-		<param-value>5000</param-value> </context-param>
-	-->
 </web-app>