From 852675ffc952f796a3a397ddc64665fdc3a59897 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Apr 2009 20:16:50 +0000
Subject: [PATCH] RIA SLC as standalone web app

git-svn-id: https://svn.argeo.org/slc/trunk@2337 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 server/org.argeo.slc.ria/.project             |  16 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  12 --
 server/org.argeo.slc.ria/QooxdooReadme.txt    |  10 -
 server/org.argeo.slc.ria/assembly/ria-slc.xml |   2 +-
 server/org.argeo.slc.ria/assembly/ria.xml     |   2 +-
 server/org.argeo.slc.ria/config.json          |   8 +-
 .../jetty/jetty-test-local.xml.template       |   0
 .../main => doc}/config/jetty/jetty-test.xml  |   0
 .../main => doc}/config/jetty/webdefault.xml  |   0
 .../config/tomcat/org.argeo.slc.webapp.xml    |   0
 server/org.argeo.slc.ria/pom.xml              |  55 +-----
 .../src/META-INF/MANIFEST.MF                  |  12 +-
 server/org.argeo.slc.ria/src/WEB-INF/web.xml  |   7 +
 .../webapp/old/WEB-INF/applicationContext.xml |  21 ---
 .../old/WEB-INF/classes/log4j.properties      |  35 ----
 .../main/webapp/old/WEB-INF/doc-servlet.xml   |  10 -
 .../old/WEB-INF/slc-service-servlet.xml       |   9 -
 .../webapp/old/WEB-INF/slc-ws-servlet.xml     |   7 -
 .../src/main/webapp/old/WEB-INF/web-osgi.xml  | 142 --------------
 .../src/main/webapp/old/WEB-INF/web.xml       | 122 ------------
 .../main/webapp/old/WEB-INF/xslt-servlet.xml  |  29 ---
 .../webapp/old/WEB-INF/xslt/resultView.xsl    |  51 -----
 .../main/webapp/old/WEB-INF/xslt/viewXml.xsl  |  10 -
 .../src/main/webapp/old/style.css             | 174 ------------------
 .../src/main/webapp/old/test-amq/send.html    |   7 -
 .../src/main/webapp/old/test-amq/send.js      |   3 -
 26 files changed, 30 insertions(+), 714 deletions(-)
 delete mode 100644 server/org.argeo.slc.ria/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 server/org.argeo.slc.ria/QooxdooReadme.txt
 rename server/org.argeo.slc.ria/{src/main => doc}/config/jetty/jetty-test-local.xml.template (100%)
 rename server/org.argeo.slc.ria/{src/main => doc}/config/jetty/jetty-test.xml (100%)
 rename server/org.argeo.slc.ria/{src/main => doc}/config/jetty/webdefault.xml (100%)
 rename server/org.argeo.slc.ria/{src/main => doc}/config/tomcat/org.argeo.slc.webapp.xml (100%)
 create mode 100644 server/org.argeo.slc.ria/src/WEB-INF/web.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/applicationContext.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/classes/log4j.properties
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/doc-servlet.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-service-servlet.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web-osgi.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt-servlet.xml
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/resultView.xsl
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/style.css
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.html
 delete mode 100644 server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.js

diff --git a/server/org.argeo.slc.ria/.project b/server/org.argeo.slc.ria/.project
index d0138d1fd..b2565a441 100644
--- a/server/org.argeo.slc.ria/.project
+++ b/server/org.argeo.slc.ria/.project
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.slc.webapp</name>
+	<name>org.argeo.slc.ria</name>
 	<comment></comment>
 	<projects>
-		<project>org.argeo.slc.server</project>
-		<project>org.argeo.slc.core</project>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/server/org.argeo.slc.ria/.settings/org.eclipse.jdt.core.prefs b/server/org.argeo.slc.ria/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3ee8bf0ec..000000000
--- a/server/org.argeo.slc.ria/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Aug 29 11:27:55 CEST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/server/org.argeo.slc.ria/QooxdooReadme.txt b/server/org.argeo.slc.ria/QooxdooReadme.txt
deleted file mode 100644
index 45d145023..000000000
--- a/server/org.argeo.slc.ria/QooxdooReadme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Using the build scripts
-=======================
-
-1/ The qooxdoo SDK must be located at 
-"src/main/webapp/qooxdoo-0.8-sdk" for these target to work.
-
-2/ Then Use the following targets : slc-source  / slc-build 
-
-generate.py slc-source : will compile the source file
-generate.py slc-build : will compile the build file
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/assembly/ria-slc.xml b/server/org.argeo.slc.ria/assembly/ria-slc.xml
index 57085d831..ef93915a6 100644
--- a/server/org.argeo.slc.ria/assembly/ria-slc.xml
+++ b/server/org.argeo.slc.ria/assembly/ria-slc.xml
@@ -7,7 +7,7 @@
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>src/main/webapp/argeo-ria-lib/slc</directory>
+			<directory>src/argeo-ria-lib/slc</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
 				<include>*/**</include>
diff --git a/server/org.argeo.slc.ria/assembly/ria.xml b/server/org.argeo.slc.ria/assembly/ria.xml
index eafd0701c..452e383be 100644
--- a/server/org.argeo.slc.ria/assembly/ria.xml
+++ b/server/org.argeo.slc.ria/assembly/ria.xml
@@ -7,7 +7,7 @@
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>src/main/webapp/argeo-ria-src</directory>
+			<directory>src/argeo-ria-src</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
 				<include>*/**</include>
diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 00f91d82d..04f6e9d93 100644
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -16,14 +16,14 @@
   "let" :
   {
     "APPLICATION"  : "org.argeo.ria",
-    "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-sdk",
+    "QOOXDOO_PATH" : "src/qooxdoo-sdk",
     "QXTHEME"      : "qx.theme.Modern",
 	"QXICONTHEME"  : ["Tango"],
     "API_EXCLUDE"  : ["qx.legacy.*"],
     "LOCALES"      : [ "en" ],
-    "ROOT"         : "src/main/webapp/argeo-ria-src",
-	"BUILD_PATH"   : "src/main/webapp/argeo-ria",
-	"RIA_LIB_PATH" : "src/main/webapp/argeo-ria-lib",
+    "ROOT"         : "src/argeo-ria-src",
+	"BUILD_PATH"   : "src/argeo-ria",
+	"RIA_LIB_PATH" : "src/argeo-ria-lib",
 	"RIA_LIB_URI"  : "../argeo-ria-lib",
 	"CACHE"		   : "cache" ,
 	"CUSTOM_PACKAGE" : "org.argeo.slc.web"
diff --git a/server/org.argeo.slc.ria/src/main/config/jetty/jetty-test-local.xml.template b/server/org.argeo.slc.ria/doc/config/jetty/jetty-test-local.xml.template
similarity index 100%
rename from server/org.argeo.slc.ria/src/main/config/jetty/jetty-test-local.xml.template
rename to server/org.argeo.slc.ria/doc/config/jetty/jetty-test-local.xml.template
diff --git a/server/org.argeo.slc.ria/src/main/config/jetty/jetty-test.xml b/server/org.argeo.slc.ria/doc/config/jetty/jetty-test.xml
similarity index 100%
rename from server/org.argeo.slc.ria/src/main/config/jetty/jetty-test.xml
rename to server/org.argeo.slc.ria/doc/config/jetty/jetty-test.xml
diff --git a/server/org.argeo.slc.ria/src/main/config/jetty/webdefault.xml b/server/org.argeo.slc.ria/doc/config/jetty/webdefault.xml
similarity index 100%
rename from server/org.argeo.slc.ria/src/main/config/jetty/webdefault.xml
rename to server/org.argeo.slc.ria/doc/config/jetty/webdefault.xml
diff --git a/server/org.argeo.slc.ria/src/main/config/tomcat/org.argeo.slc.webapp.xml b/server/org.argeo.slc.ria/doc/config/tomcat/org.argeo.slc.webapp.xml
similarity index 100%
rename from server/org.argeo.slc.ria/src/main/config/tomcat/org.argeo.slc.webapp.xml
rename to server/org.argeo.slc.ria/doc/config/tomcat/org.argeo.slc.webapp.xml
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index efaa2b502..136a47fc6 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -22,24 +22,20 @@
 				<configuration>
 					<archive>
 						<compress>false</compress>
-						<manifestFile>src/main/webapp/META-INF/MANIFEST.MF</manifestFile>
+						<manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
-					<classesDirectory>src/main/webapp</classesDirectory>
+					<classesDirectory>src/</classesDirectory>
 					<includes>
 						<include>index.jsp</include>
 						<include>argeo-ria/**</include>
+						<include>WEB-INF/*</include>
 					</includes>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <artifactId>maven-war-plugin</artifactId> <configuration>
-				<warSourceExcludes>qooxdoo-0.8-sdk/**,source/**</warSourceExcludes>
-				</configuration> </plugin>
-			-->
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-				<version>0.8.1.2</version>
+				<version>0.8.1.3</version>
 				<executions>
 					<execution>
 						<id>env</id>
@@ -97,7 +93,7 @@
 						</goals>
 						<configuration>
 							<descriptors>
-								<descriptor>src/assembly/ria.xml</descriptor>
+								<descriptor>assembly/ria.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
@@ -109,7 +105,7 @@
 						</goals>
 						<configuration>
 							<descriptors>
-								<descriptor>src/assembly/ria-slc.xml</descriptor>
+								<descriptor>assembly/ria-slc.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
@@ -117,43 +113,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<!--
-		<dependencies> <dependency> <groupId>org.argeo.slc.runtime</groupId>
-		<artifactId>org.argeo.slc.server</artifactId> </dependency>
-
-		<dependency> <groupId>org.springframework.osgi</groupId>
-		<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency> <dependency> <groupId>org.eclipse.osgi</groupId>
-		<artifactId>org.eclipse.osgi</artifactId> </dependency> <dependency>
-		<groupId>org.apache.catalina</groupId>
-		<artifactId>com.springsource.org.apache.catalina</artifactId>
-		</dependency> <dependency> <groupId>org.springframework.osgi</groupId>
-		<artifactId>org.springframework.osgi.web</artifactId> </dependency>
-		<dependency> <groupId>javax.annotation</groupId>
-		<artifactId>com.springsource.javax.annotation</artifactId>
-		</dependency> <dependency> <groupId>javax.persistence</groupId>
-		<artifactId>com.springsource.javax.persistence</artifactId>
-		</dependency> <dependency> <groupId>javax.xml.ws</groupId>
-		<artifactId>com.springsource.javax.xml.ws</artifactId> </dependency>
-		<dependency> <groupId>javax.xml.bind</groupId>
-		<artifactId>com.springsource.javax.xml.bind</artifactId> </dependency>
-		<dependency> <groupId>org.springframework.osgi</groupId>
-		<artifactId>org.springframework.osgi.extender</artifactId>
-		</dependency> <dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
-		<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-		</dependency> <dependency> <groupId>javax.servlet</groupId>
-		<artifactId>com.springsource.javax.servlet.jsp</artifactId>
-		</dependency> <dependency> <groupId>javax.el</groupId>
-		<artifactId>com.springsource.javax.el</artifactId> </dependency>
-		<dependency> <groupId>javax.servlet</groupId>
-		<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-		</dependency> <dependency> <groupId>org.apache.taglibs</groupId>
-		<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-		</dependency> <dependency> <groupId>org.hsqldb</groupId>
-		<artifactId>com.springsource.org.hsqldb</artifactId> </dependency>
-
-		<dependency> <groupId>com.sun.xml</groupId> <artifactId>
-		com.springsource.com.sun.xml.messaging.saaj </artifactId>
-		</dependency> </dependencies>
-	-->
 </project>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF b/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
index dcd1e6c23..66559baae 100644
--- a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
@@ -1,4 +1,12 @@
+Web-ContextPath: org.argeo.slc.ria
+Bundle-Classpath: .
 Bundle-Name: SLC RIA
-Fragment-Host: org.argeo.slc.webapp
 Bundle-SymbolicName: org.argeo.slc.ria
-Bundle-Version: 1.0.0
+Bundle-Version: 0.11.3.qualifier
+Import-Package: javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp,
+ javax.servlet.jsp.jstl.core,
+ javax.servlet.jsp.jstl.fmt,
+ javax.servlet.jsp.jstl.tlv,
+ javax.servlet.resources
diff --git a/server/org.argeo.slc.ria/src/WEB-INF/web.xml b/server/org.argeo.slc.ria/src/WEB-INF/web.xml
new file mode 100644
index 000000000..f46cd1782
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/WEB-INF/web.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
+
+	<display-name>SLC Web UI</display-name>
+</web-app>
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/applicationContext.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/applicationContext.xml
deleted file mode 100644
index 97ca54365..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,21 +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:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-	<import resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
-
-	<!--
-		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
-	-->
-
-	<!--
-	<bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="WEB-INF/activemq.xml" />
-		<property name="start" value="true" />
-	</bean>
--->
-</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/classes/log4j.properties b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/classes/log4j.properties
deleted file mode 100644
index 34f682a8a..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=WARN, console
-
-## Levels
-# Slc
-log4j.logger.org.argeo.slc=DEBUG
-
-# Spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.transaction=WARN
-log4j.logger.org.springframework.orm.hibernate3=WARN
-log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN
-
-# Hibernate
-log4j.logger.org.hibernate=WARN
-log4j.logger.org.hibernate.stat=INFO
-log4j.logger.org.hibernate.SQL=WARN
-log4j.logger.org.hibernate.transaction=WARN
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
-#log4j.logger.org.hibernate.type=TRACE
-
-# Active MQ
-log4j.logger.org.apache.activemq.web.MessageListenerServlet=WARN
-
-# EhCache
-log4j.logger.net.sf.ehcache=WARN
-
-## Appenders
-# A1 is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/doc-servlet.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/doc-servlet.xml
deleted file mode 100644
index 3b1714fcc..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/doc-servlet.xml
+++ /dev/null
@@ -1,10 +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"
-	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">
-
-	<import
-		resource="classpath:/org/argeo/slc/server/spring/slc-doc-servlet.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-service-servlet.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-service-servlet.xml
deleted file mode 100644
index 11ae5380d..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-service-servlet.xml
+++ /dev/null
@@ -1,9 +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"
-	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">
-
-	<import
-		resource="classpath:/org/argeo/slc/server/spring/slc-service-servlet.xml" />
-</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml
deleted file mode 100644
index 18dce9a8a..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml
+++ /dev/null
@@ -1,7 +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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import resource="classpath:/org/argeo/slc/server/spring/slc-ws-servlet.xml"/>
-</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web-osgi.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web-osgi.xml
deleted file mode 100644
index bd7bf353a..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web-osgi.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>SLC Web Application</display-name>
-
-	<!-- SERVICE servlet -->
-	<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>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-service</servlet-name>
-		<url-pattern>*.service</url-pattern>
-	</servlet-mapping>
-
-	<!-- WS servlet -->
-	<servlet>
-		<servlet-name>slc-ws</servlet-name>
-		<servlet-class>
-			org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextClass</param-name>
-			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-ws</servlet-name>
-		<url-pattern>/slcService/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- XSLT servlet -->
-	<servlet>
-		<servlet-name>xslt</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>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>xslt</servlet-name>
-		<url-pattern>*.xslt</url-pattern>
-	</servlet-mapping>
-
-	<!-- DOC servlet -->
-	<servlet>
-		<servlet-name>doc</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>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>doc</servlet-name>
-		<url-pattern>*.xls</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>doc</servlet-name>
-		<url-pattern>*.pdf</url-pattern>
-	</servlet-mapping>
-
-	<!-- General -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<display-name>Spring Context</display-name>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<context-param>
-		<param-name>contextClass</param-name>
-		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-	</context-param>
-
-	<!-- Env refs -->
-	<resource-env-ref>
-		<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
-		<resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
-	</resource-env-ref>
-
-	<!-- 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>
-
-
-	<!-- Active MQ -->
-	<!-- context config -->
-	<context-param>
-		<param-name>org.apache.activemq.brokerURL</param-name>
-		<param-value>vm://localhost</param-value>
-	</context-param>
-
-	<context-param>
-		<param-name>org.apache.activemq.embeddedBroker</param-name>
-		<param-value>false</param-value>
-	</context-param>
-
-	<!-- servlet mappings -->
-	<servlet>
-		<servlet-name>MessageListenerServlet</servlet-name>
-		<servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>MessageListenerServlet</servlet-name>
-		<url-pattern>/amq/*</url-pattern>
-	</servlet-mapping>
-
-	<filter>
-		<filter-name>session</filter-name>
-		<filter-class>org.apache.activemq.web.SessionFilter</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>session</filter-name>
-		<url-pattern>/amq/*</url-pattern>
-	</filter-mapping>
-</web-app>
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web.xml
deleted file mode 100644
index 9de9501a6..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/web.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>SLC Web Application</display-name>
-
-	<!-- SERVICE servlet -->
-	<servlet>
-		<servlet-name>slc-service</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-service</servlet-name>
-		<url-pattern>*.service</url-pattern>
-	</servlet-mapping>
-
-	<!-- WS servlet -->
-	<servlet>
-		<servlet-name>slc-ws</servlet-name>
-		<servlet-class>
-			org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-ws</servlet-name>
-		<url-pattern>/slcService/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- XSLT servlet -->
-	<servlet>
-		<servlet-name>xslt</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>xslt</servlet-name>
-		<url-pattern>*.xslt</url-pattern>
-	</servlet-mapping>
-
-	<!-- DOC servlet -->
-	<servlet>
-		<servlet-name>doc</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>doc</servlet-name>
-		<url-pattern>*.xls</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>doc</servlet-name>
-		<url-pattern>*.pdf</url-pattern>
-	</servlet-mapping>
-
-	<!-- General -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<display-name>Spring Context</display-name>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- Env refs -->
-	<resource-env-ref>
-		<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
-		<resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
-	</resource-env-ref>
-
-	<!-- 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>
-
-
-	<!-- Active MQ -->
-	    <!-- context config -->
-    <context-param>
-        <param-name>org.apache.activemq.brokerURL</param-name>
-        <param-value>vm://localhost</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.activemq.embeddedBroker</param-name>
-        <param-value>false</param-value>
-    </context-param>
-
-    <!-- servlet mappings -->
-    <servlet>
-        <servlet-name>MessageListenerServlet</servlet-name>
-        <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>MessageListenerServlet</servlet-name>
-        <url-pattern>/amq/*</url-pattern>
-    </servlet-mapping>
-    
-    <filter>
-      <filter-name>session</filter-name>
-      <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-      <filter-name>session</filter-name>
-      <url-pattern>/amq/*</url-pattern>
-    </filter-mapping>
-</web-app>
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt-servlet.xml b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt-servlet.xml
deleted file mode 100644
index ddfd925ce..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt-servlet.xml
+++ /dev/null
@@ -1,29 +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"
-	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">
-
-	<import
-		resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml" />
-
-	<bean name="/resultView.xslt"
-		class="org.argeo.slc.web.mvc.result.GetResultController">
-		<constructor-arg ref="testResultDao" />
-		<property name="viewName" value="resultView" />
-	</bean>
-
-	<bean name="/resultViewXml.xslt"
-		class="org.argeo.slc.web.mvc.result.GetResultController">
-		<constructor-arg ref="testResultDao" />
-		<property name="viewName" value="viewXml" />
-	</bean>
-
-	<bean name="/resultCollectionViewXml.xslt"
-		class="org.argeo.slc.web.mvc.result.GetResultCollectionController">
-		<constructor-arg ref="testResultCollectionDao" />
-		<property name="viewName" value="viewXml" />
-	</bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/resultView.xsl b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/resultView.xsl
deleted file mode 100644
index e9989bdbe..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/resultView.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:slc="http://argeo.org/projects/slc/schemas"
-	exclude-result-prefixes="slc">
-
-	<xsl:output method="html" omit-xml-declaration="yes" />
-	
-
-	<xsl:template match="/">
-		<html>
-			<head>
-				<title>Result</title>
-			</head>
-			<body style="font-family: sans-serif">
-				<h1>
-					Result
-					<xsl:value-of select="slc:tree-test-result/@uuid" />
-				</h1>
-				<xsl:for-each
-					select="slc:tree-test-result/slc:result-parts/slc:result-part">
-					<h2>
-						<xsl:value-of select="@path" />
-					</h2>
-					<table>
-						<xsl:for-each
-							select="slc:part-sub-list/slc:parts/slc:simple-result-part">
-							<tr>
-								<xsl:choose>
-									<xsl:when
-										test="slc:status = 'PASSED' ">
-										<td style="color:green">
-											<xsl:value-of
-												select="slc:message" />
-										</td>
-									</xsl:when>
-									<xsl:otherwise>
-										<td style="color:red">
-											<xsl:value-of
-												select="slc:message" />
-										</td>
-									</xsl:otherwise>
-								</xsl:choose>
-							</tr>
-						</xsl:for-each>
-					</table>
-				</xsl:for-each>
-			</body>
-		</html>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl b/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl
deleted file mode 100644
index 87d63716f..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:slc="http://argeo.org/projects/slc/schemas"
-	exclude-result-prefixes="slc">
-
-	<xsl:template match="/">
-		<xsl:copy-of select="*"/>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/style.css b/server/org.argeo.slc.ria/src/main/webapp/old/style.css
deleted file mode 100644
index 102b4eea1..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/style.css
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Generic Selectors */
-body {
-	font-family: sans-serif;
-	font-size: 12px;
-	color: black;
-	background-color: white;
-}
-
-li {
-	list-style-type: none;
-}
-
-h1 {
-	font-family: sans-serif;
-	font-size: 16px;
-	font-weight: bold;
-	color: #000000;
-	padding: 0px 0px 5px 0px;
-	margin: 0px;
-}
-
-h2 {
-	font-family: sans-serif;
-	font-size: 14px;
-	font-weight: bold;
-	color: #000000;
-	padding: 5px 0px 5px 0px;
-	margin: 0px;
-	margin-top: 5px;
-}
-
-/* Special titles */
-h3.executionStep{
-	font-family: sans-serif;
-	font-size: 10px;
-	font-style: italic;
-	color: #000000;
-	padding: 5px 0px 5px 0px;
-	margin: 0px;
-	margin-top: 5px;
-}
-
-table,form {
-	margin: 0px;
-}
-
-img {
-	border: none;
-}
-
-div {
-	font-size: 100%;
-}
-
-tr.list:hover {
-	background-color: lightgrey;
-}
-
-td.list {
-	border-top: 1px solid lighgrey;
-	padding: 2px 20px 2px 2px;
-	padding-right: 15px;
-}
-
-th {
-	font-size: 12px;
-	padding: 2px 20px 2px 2px;
-	vertical-align: top;
-	text-align: left;
-}
-
-td {
-	font-size: 12px;
-	padding: 1px;
-	vertical-align: middle;
-	text-align: left;
-}
-
-.passed {
-	color: green;
-}
-
-.failed {
-	color: red;
-}
-
-.error {
-	color: purple;
-}
-
-/**************** Navigation ****************/
-td.nav1 {
-	padding: 5px 0px 0px 0px;
-	font-size: 12px;
-	font-weight: bold;
-}
-
-td.nav2 {
-	padding: 0px 0px 0px 5px;
-	font-size: 12px;
-}
-
-/**************** Forms ****************/
-input.submit {
-	border: solid 1px grey;
-	background-color: lightgrey;
-	align: right;
-}
-
-input.submit:hover {
-	border: solid 1px #3399FF;
-	background-color: white;
-	color: #3399FF;
-}
-
-input.std {
-	border: solid 1px lightgrey;
-	padding: 1px;
-	margin: 2px;
-}
-
-.formError {
-	color: red;
-	padding: 1px;
-	margin: 2px;
-	font-weight: bold;
-}
-
-/**************** Pseudo classes ****************/
-a:link {
-	color: #0066CC;
-	text-decoration: none;
-}
-
-a:visited {
-	color: #0066CC;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #3399FF;
-	text-decoration: none;
-}
-
-/************************* ID's *************************/
-#main {
-	position: absolute;
-	margin-left: 120px;
-	padding-top: 110px;
-}
-
-#navigation {
-	position: absolute;
-	width: 100px;
-	height: 800px;
-	border-right: 1px solid #0066CC;
-	font-weight: normal;
-	margin-top: 110px;
-	margin-left: 10px;
-}
-
-#banner {
-	position: absolute;
-	width: 400px;
-	height: 100px;
-}
-
-#upperRight {
-	position: absolute;
-	top: 0;
-	right: 0;
-	margin-top: 20px;
-	margin-right: 10px;
-}
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.html b/server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.html
deleted file mode 100644
index 4449fcbc5..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-<script type="text/javascript" src="../amq/amq.js"></script>
-<script type="text/javascript">amq.uri='../amq';</script>
-<script type="text/javascript" src="send.js"></script>
-</head>
-</html>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.js b/server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.js
deleted file mode 100644
index 8210c6aef..000000000
--- a/server/org.argeo.slc.ria/src/main/webapp/old/test-amq/send.js
+++ /dev/null
@@ -1,3 +0,0 @@
-amq.sendMessage('topic://agent.c6fb85cc-200e-41f1-9b63-fade5cad0f14.newExecution','<slc:slc-execution uuid="b0b68669-b598-4518-8ae3-c9c3190e87b4"><slc:status>STARTED</slc:status><slc:type>slcAnt</slc:type><slc:host>localhost</slc:host><slc:user>user</slc:user><slc:attributes><slc:attribute name="ant.file">/test</slc:attribute></slc:attributes></slc:slc-execution>');
-alert('Message sent!');
-document.write('Message sent');
\ No newline at end of file
-- 
2.39.2