Remove unused directories
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 24 Nov 2014 12:47:08 +0000 (12:47 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 24 Nov 2014 12:47:08 +0000 (12:47 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@7495 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

128 files changed:
base/plugins/pom.xml [deleted file]
base/pom.xml [deleted file]
base/runtime/pom.xml [deleted file]
doc/files/etc/yum.repos.d/argeo-staging.repo [deleted file]
doc/pom.xml [deleted file]
doc/reference/commons-gettingStarted.xml [deleted file]
doc/reference/css/style.css [deleted file]
doc/site/apt/index.apt [deleted file]
doc/site/site.xml [deleted file]
security/dep/pom.xml [deleted file]
security/modules/org.argeo.security.webapp/.project [deleted file]
security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml [deleted file]
security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml [deleted file]
security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml [deleted file]
security/modules/org.argeo.security.webapp/WEB-INF/security.xml [deleted file]
security/modules/org.argeo.security.webapp/WEB-INF/web.xml [deleted file]
security/modules/org.argeo.security.webapp/pom.xml [deleted file]
security/modules/pom.xml [deleted file]
security/plugins/pom.xml [deleted file]
security/pom.xml [deleted file]
security/runtime/org.argeo.security.activemq/.classpath [deleted file]
security/runtime/org.argeo.security.activemq/.project [deleted file]
security/runtime/org.argeo.security.activemq/.settings/org.eclipse.jdt.core.prefs [deleted file]
security/runtime/org.argeo.security.activemq/.settings/org.eclipse.pde.core.prefs [deleted file]
security/runtime/org.argeo.security.activemq/build.properties [deleted file]
security/runtime/org.argeo.security.activemq/pom.xml [deleted file]
security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java [deleted file]
security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java [deleted file]
security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java [deleted file]
security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java [deleted file]
security/runtime/org.argeo.security.activemq/src/main/resources/org/argeo/security/activemq/osLogin.conf [deleted file]
security/runtime/pom.xml [deleted file]
server/dep/org.argeo.server.dep.activemq/pom.xml [deleted file]
server/dep/org.argeo.server.dep.hibernate/pom.xml [deleted file]
server/dep/org.argeo.server.dep.tomcat/pom.xml [deleted file]
server/dep/pom.xml [deleted file]
server/modules/org.argeo.ext.bsf/pom.xml [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/.project [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/.settings/org.eclipse.pde.core.prefs [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/build.properties [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/fs/db/sybase.ddl [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/journal/sybase.ddl [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/persistence/bundle/sybase.ddl [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/persistence/db/sybase.ddl [deleted file]
server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml [deleted file]
server/modules/org.argeo.node.repofactory.jackrabbit/.project [deleted file]
server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml [deleted file]
server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory.xml [deleted file]
server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml [deleted file]
server/modules/org.argeo.server.activemq.broker/.project [deleted file]
server/modules/org.argeo.server.activemq.broker/.settings/org.eclipse.pde.core.prefs [deleted file]
server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml [deleted file]
server/modules/org.argeo.server.activemq.broker/activemq.properties [deleted file]
server/modules/org.argeo.server.activemq.broker/build.properties [deleted file]
server/modules/org.argeo.server.activemq.broker/pom.xml [deleted file]
server/modules/org.argeo.server.catalina/conf/catalina.policy [deleted file]
server/modules/org.argeo.server.catalina/conf/catalina.properties [deleted file]
server/modules/org.argeo.server.catalina/conf/context.xml [deleted file]
server/modules/org.argeo.server.catalina/conf/web.xml [deleted file]
server/modules/org.argeo.server.catalina/pom.xml [deleted file]
server/modules/org.argeo.server.jdbc/.project [deleted file]
server/modules/org.argeo.server.jdbc/.settings/org.eclipse.pde.core.prefs [deleted file]
server/modules/org.argeo.server.jdbc/build.properties [deleted file]
server/modules/org.argeo.server.jdbc/pom.xml [deleted file]
server/modules/pom.xml [deleted file]
server/plugins/pom.xml [deleted file]
server/pom.xml [deleted file]
server/runtime/org.argeo.server.catalina.start/.classpath [deleted file]
server/runtime/org.argeo.server.catalina.start/.project [deleted file]
server/runtime/org.argeo.server.catalina.start/.settings/org.eclipse.jdt.core.prefs [deleted file]
server/runtime/org.argeo.server.catalina.start/build.properties [deleted file]
server/runtime/org.argeo.server.catalina.start/pom.xml [deleted file]
server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java [deleted file]
server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java [deleted file]
server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/OsgiCatalina.java [deleted file]
server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server-ssl.xml [deleted file]
server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml [deleted file]
server/runtime/org.argeo.server.catalina.start/tomcat.properties [deleted file]
server/runtime/org.argeo.server.hibernate/.classpath [deleted file]
server/runtime/org.argeo.server.hibernate/.project [deleted file]
server/runtime/org.argeo.server.hibernate/.settings/org.eclipse.jdt.core.prefs [deleted file]
server/runtime/org.argeo.server.hibernate/.settings/org.maven.ide.eclipse.prefs [deleted file]
server/runtime/org.argeo.server.hibernate/build.properties [deleted file]
server/runtime/org.argeo.server.hibernate/pom.xml [deleted file]
server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/HibernateLightDaoSync.java [deleted file]
server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java [deleted file]
server/runtime/org.argeo.server.json/.classpath [deleted file]
server/runtime/org.argeo.server.json/.project [deleted file]
server/runtime/org.argeo.server.json/.settings/org.eclipse.jdt.core.prefs [deleted file]
server/runtime/org.argeo.server.json/.settings/org.maven.ide.eclipse.prefs [deleted file]
server/runtime/org.argeo.server.json/build.properties [deleted file]
server/runtime/org.argeo.server.json/pom.xml [deleted file]
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java [deleted file]
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactory.java [deleted file]
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java [deleted file]
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java [deleted file]
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java [deleted file]
server/runtime/org.argeo.server.jxl/.classpath [deleted file]
server/runtime/org.argeo.server.jxl/.project [deleted file]
server/runtime/org.argeo.server.jxl/.settings/org.eclipse.jdt.core.prefs [deleted file]
server/runtime/org.argeo.server.jxl/.settings/org.maven.ide.eclipse.prefs [deleted file]
server/runtime/org.argeo.server.jxl/build.properties [deleted file]
server/runtime/org.argeo.server.jxl/pom.xml [deleted file]
server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java [deleted file]
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/CollectionsObject.java [deleted file]
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java [deleted file]
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/OtherObject.java [deleted file]
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/SimpleObject.java [deleted file]
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/SimpleObjectEditor.java [deleted file]
server/runtime/org.argeo.server.jxl/src/test/resources/dao/simple.xls [deleted file]
server/runtime/org.argeo.server.jxl/src/test/resources/log4j.properties [deleted file]
server/runtime/org.argeo.server.modeshape/.classpath [deleted file]
server/runtime/org.argeo.server.modeshape/.project [deleted file]
server/runtime/org.argeo.server.modeshape/.settings/org.eclipse.jdt.core.prefs [deleted file]
server/runtime/org.argeo.server.modeshape/.settings/org.eclipse.pde.core.prefs [deleted file]
server/runtime/org.argeo.server.modeshape/build.properties [deleted file]
server/runtime/org.argeo.server.modeshape/pom.xml [deleted file]
server/runtime/org.argeo.server.modeshape/src/main/java/org/argeo/modeshape/FileSystemRepository.java [deleted file]
server/runtime/org.argeo.server.webextender/.classpath [deleted file]
server/runtime/org.argeo.server.webextender/.project [deleted file]
server/runtime/org.argeo.server.webextender/.settings/org.eclipse.jdt.core.prefs [deleted file]
server/runtime/org.argeo.server.webextender/.settings/org.eclipse.pde.core.prefs [deleted file]
server/runtime/org.argeo.server.webextender/META-INF/spring/extender/extender.properties [deleted file]
server/runtime/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml [deleted file]
server/runtime/org.argeo.server.webextender/build.properties [deleted file]
server/runtime/org.argeo.server.webextender/pom.xml [deleted file]
server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java [deleted file]
server/runtime/pom.xml [deleted file]

diff --git a/base/plugins/pom.xml b/base/plugins/pom.xml
deleted file mode 100644 (file)
index 4eb1ec8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>base</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <name>Commons OSGi Eclipse Plugins</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.osgi.ui.explorer</module>
-       </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                               <configuration>
-                                       <!-- Prevents source jars to contain misleading data -->
-                                       <excludes>
-                                               <exclude>plugin.xml</exclude>
-                                               <exclude>META-INF/MANIFEST.MF</exclude>
-                                       </excludes>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
diff --git a/base/pom.xml b/base/pom.xml
deleted file mode 100644 (file)
index 8aa1c28..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>base</artifactId>
-       <name>Commons Base</name>
-       <description>Standalone building blocks, extending Java or some libraries</description>
-       <packaging>pom</packaging>
-       <modules>
-               <module>dep</module>
-               <module>runtime</module>
-               <module>plugins</module>
-               <module>dist</module>
-       </modules>
-</project>
\ No newline at end of file
diff --git a/base/runtime/pom.xml b/base/runtime/pom.xml
deleted file mode 100644 (file)
index c3ec597..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>base</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <name>Commons Base Runtime</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.util</module>
-               <module>org.argeo.support.junit</module>
-               <module>org.argeo.osgi.boot</module>
-               <module>org.argeo.eclipse.ui</module>
-               <module>org.argeo.eclipse.ui.rap</module>
-               <module>org.argeo.eclipse.ui.rcp</module>
-               <module>org.argeo.eclipse.ui.jcr</module>
-       </modules>
-</project>
diff --git a/doc/files/etc/yum.repos.d/argeo-staging.repo b/doc/files/etc/yum.repos.d/argeo-staging.repo
deleted file mode 100644 (file)
index f15e34d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[argeo-osgi-staging]
-name=Argeo OSGi Staging
-baseurl=file:///srv/rpmfactory/argeo-osgi-1-staging/6/x86_64
-gpgcheck=0
-http_caching=none
-metadata_expire=0
diff --git a/doc/pom.xml b/doc/pom.xml
deleted file mode 100644 (file)
index 5bf01e7..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>1.1.8-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>doc</artifactId>
-       <name>Commons Doc</name>
-       <packaging>pom</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>com.agilejava.docbkx</groupId>
-                               <artifactId>docbkx-maven-plugin</artifactId>
-                               <configuration>
-                                       <htmlStylesheet>css/style.css</htmlStylesheet>
-                                       <postProcess>
-                                               <!-- See https://fisheye.springframework.org/rdiff/spring-ldap?csid=439&u&N -->
-                                               <copy todir="target/docbkx/html">
-                                                       <fileset dir="src/docbkx">
-                                                               <include name="*/*.css" />
-                                                       </fileset>
-                                               </copy>
-                                       </postProcess>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>generate-html</goal>
-                                                       <goal>generate-pdf</goal>
-                                               </goals>
-                                               <phase>pre-site</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
diff --git a/doc/reference/commons-gettingStarted.xml b/doc/reference/commons-gettingStarted.xml
deleted file mode 100644 (file)
index 2b680e1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-                 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-
-<chapter label="1" id="gettingStarted">
-       <title>Getting started</title>
-
-       <section label="1.1" id="deveptEnvironment">
-               <title>Development environment</title>\r
-               <para>The following instructions are about setting up an Argeo\r
-                       development environment.</para>
-
-               <section label="1.1.1" id="softwareRequirements">
-                       <title>Software requirements</title>\r
-                       <para>\r
-                               The following elements are required to install the development\r
-                               environment:\r
-                               <itemizedlist spacing="compact">\r
-                                       <listitem>\r
-                                               <para>Java</para>\r
-                                       </listitem>\r
-                                       <listitem>\r
-                                               <para>Eclipse</para>\r
-                                       </listitem>\r
-                               </itemizedlist>\r
-                       </para>\r
-               </section>\r
-\r
-               <section label="1.1.2" id="clientInstallation">\r
-                       <title>Client installation</title>
-
-                       <para></para>\r
-               </section>\r
-       </section>
-</chapter>
diff --git a/doc/reference/css/style.css b/doc/reference/css/style.css
deleted file mode 100644 (file)
index 0f446b9..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-body {
-   text-align: justify;
-   margin-right: 2em;
-   margin-left: 2em;
-}
-
-a,
-a[accesskey^="h"],
-a[accesskey^="n"],
-a[accesskey^="u"],
-a[accesskey^="p"] {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-       color: #003399;
-}
-
-a:active {
-    color: #003399;
-}
-
-a:visited {
-    color: #888888;
-}
-
-p {
-       font-family: Verdana, Arial, sans-serif;
-}
-
-dt {
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 12px;
-}
-
-p, dl, dt, dd, blockquote {
-    color: #000000;
-    margin-bottom: 3px;
-    margin-top: 3px;
-    padding-top: 0;
-}
-
-ol, ul, p {
-    margin-top: 6px;
-    margin-bottom: 6px;
-}
-
-p, blockquote {
-    font-size: 90%;
-}
-
-p.releaseinfo {
-    font-size: 100%;
-    font-weight: bold;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    padding-top: 10px;
-}
-
-p.pubdate {
-    font-size: 120%;
-    font-weight: bold; 
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-td {
-    font-size: 80%;
-}
-
-td, th, span {
-    color: #000000;
-}
-
-td[width^="40%"] {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-       color: #003399;
-}
-
-table[summary^="Navigation header"] tbody tr th[colspan^="3"] {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-blockquote {
-    margin-right: 0;
-}
-
-h1, h2, h3, h4, h6 {
-    color: #000000;
-    font-weight: 500;
-    margin-top: 0;
-    padding-top: 14px;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    margin-bottom: 0;
-}
-
-h2.title {
-    font-weight: 800;
-    margin-bottom: 8px;
-}
-
-h2.subtitle {
-    font-weight: 800;
-    margin-bottom: 20px;
-}
-
-.firstname, .surname {
-       font-size: 12px;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 1px black;
-    empty-cells: hide;
-    margin: 10px 0 30px 50px;
-    width: 90%;
-}
-
-div.table {
-       margin: 30px 0 10px 0;
-       border: 1px dashed gray;
-       padding: 10px;
-}
-
-div .table-contents table {
-       border: 1px solid black;
-}
-
-div.table > p.title {
-       padding-left: 10px;
-}
-
-table[summary^="Navigation footer"] {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 1px black;
-    empty-cells: hide;    
-    margin: 0px;
-    width: 100%;
-}
-
-table[summary^="Note"],
-table[summary^="Warning"],
-table[summary^="Tip"] {
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 1px black;
-    empty-cells: hide;    
-    margin: 10px 0px 10px -20px;
-    width: 100%;
-}
-
-td {
-    padding: 4pt;
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-div.warning TD {
-       text-align: justify;
-}
-
-h1 { 
-    font-size: 150%; 
-}
-
-h2 { 
-    font-size: 110%; 
-}
-
-h3 {
-    font-size: 100%; font-weight: bold; 
-}
-
-h4 { 
-    font-size: 90%; font-weight: bold;
-}
-
-h5 {
-    font-size: 90%; font-style: italic; 
-}
-
-h6 { 
-    font-size: 100%; font-style: italic; 
-}
-
-tt {
-    font-size: 110%;
-    font-family: "Courier New", Courier, monospace;
-    color: #000000;
-}
-
-.navheader, .navfooter {
-       border: none;
-}
-
-div.navfooter table {
-       border-style: dashed;
-       border-color: gray;
-       border-width: 1px 1px 1px 1px;
-       background-color: #cde48d;
-}
-
-pre {
-    font-size: 110%;
-    padding: 5px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #CCCCCC;
-    background-color: #f3f5e9;
-}
-
-ul, ol, li {
-    list-style: disc;
-}
-
-hr {
-    width: 100%;
-    height: 1px;
-    background-color: #CCCCCC;
-    border-width: 0;
-    padding: 0;
-}
-
-.variablelist { 
-    padding-top: 10px; 
-    padding-bottom: 10px; 
-    margin: 0;
-}
-
-.term { 
-    font-weight:bold;
-}
-
-.mediaobject {
-    padding-top: 30px; 
-    padding-bottom: 30px; 
-}
-
-.legalnotice {
-    font-family: Verdana, Arial, helvetica, sans-serif;
-    font-size: 12px;
-    font-style: italic;
-}
-
-.sidebar {
-    float: right;
-    margin: 10px 0 10px 30px;
-    padding: 10px 20px 20px 20px;
-    width: 33%;
-    border: 1px solid black;
-    background-color: #F4F4F4;
-    font-size: 14px;
-}
-
-.property {
-       font-family: "Courier New", Courier, monospace;
-}
-
-a code {
-       font-family: Verdana, Arial, monospace;
-       font-size: 12px;
-}
-
-td code {
-    font-size: 110%;
-}
-
-div.note * td,
-div.tip * td,
-div.warning * td,
-div.calloutlist * td {
-       text-align: justify;
-       font-size: 100%;
-}
-
-.programlisting {
-   clear: both;
-}
-
-.programlisting .interfacename,
-.programlisting .literal,
-.programlisting .classname {
-    font-size: 95%;
-}
-
-.title .interfacename,
-.title .literal,
-.title .classname {
-    font-size: 130%;
-}
-
-/* everything in a <lineannotation/> is displayed in a coloured, comment-like font */
-.programlisting * .lineannotation,
-.programlisting * .lineannotation * {
-       color: green;
-}
-
-.question * p {
-    font-size: 100%;
-}
-
-.answer * p {
-    font-size: 100%;
-}
\ No newline at end of file
diff --git a/doc/site/apt/index.apt b/doc/site/apt/index.apt
deleted file mode 100644 (file)
index 3753a3e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Argeo Commons
-
-  Commons groups the generic layers developed and maintained by Argeo. They factorize complex but generic logic in fields like security, default configurations, etc.
diff --git a/doc/site/site.xml b/doc/site/site.xml
deleted file mode 100644 (file)
index af6484f..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
-       <version />
-       <publishDate format="yyyy-MM-dd HH:mm" />
-       <body>
-               <menu name="Overview">
-                       <item name="Home" href="index.html" />
-                       <!--<item name="Reference Documentation" href="reference/index.html" />-->
-                       <item name="API (Javadoc)" href="apidocs/index.html" target="argeo_commons_javadoc" />
-                       <item name="Browse Code" href="xref/index.html" target="argeo_commons_code" />
-                       <item name="FIXMEs / TODOs" href="taglist.html" />
-               </menu>
-               <menu ref="reports" />
-       </body>
-       <skin>
-               <groupId>org.apache.maven.skins</groupId>
-               <artifactId>maven-default-skin</artifactId>
-               <version>1.0</version>
-       </skin>
-</project>
-
diff --git a/security/dep/pom.xml b/security/dep/pom.xml
deleted file mode 100644 (file)
index 21884a0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>security</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>dep</artifactId>
-       <name>Commons Security Features</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.security.dep.node</module>
-               <module>org.argeo.security.dep.node.eclipse</module>
-               <module>org.argeo.security.dep.node.rap</module>
-               <module>org.argeo.security.dep.node.rcp</module>
-       </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <profiles>
-               <profile>
-                       <id>rpmbuild</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <phase>install</phase>
-                                                               <goals>
-                                                                       <goal>run</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.webapp/.project b/security/modules/org.argeo.security.webapp/.project
deleted file mode 100644 (file)
index f28005e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.security.webapp</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml b/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
deleted file mode 100644 (file)
index 899afa3..0000000
+++ /dev/null
@@ -1,19 +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="security.xml" />
-       <import resource="osgi.xml" />
-
-       <!--  Properties -->
-       <bean
-               class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
-               lazy-init="false">
-               <property name="contextOverride" value="true" />
-       </bean>
-</beans>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml b/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml
deleted file mode 100644 (file)
index 39c74c8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <reference id="_authenticationManager"\r
-               interface="org.springframework.security.AuthenticationManager" />\r
-       <reference id="userDetailsService"\r
-               interface="org.springframework.security.userdetails.UserDetailsService" />\r
-\r
-       <reference id="securityService" interface="org.argeo.security.ArgeoSecurityService" />\r
-\r
-       <list id="objectFactories" interface="org.argeo.server.json.JsonObjectFactory"\r
-               cardinality="0..N" />\r
-\r
-       <!--\r
-               <service ref="authenticationProcessingFilterEntryPoint"\r
-               interface="org.springframework.security.ui.AuthenticationEntryPoint"\r
-               />\r
-       -->\r
-</beans:beans>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml b/security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml
deleted file mode 100644 (file)
index bab0a82..0000000
+++ /dev/null
@@ -1,41 +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.security.mvc" />
-
-       <bean id="controller" class="org.argeo.security.mvc.UsersRolesController">
-               <property name="securityService" ref="securityService" />
-               <property name="userDeserializer" ref="userDeserializer">
-               </property>
-       </bean>
-
-       <bean id="userDeserializer" class="org.argeo.server.json.JsonServerMapper">
-               <property name="targetClass" value="org.argeo.security.SimpleArgeoUser" />
-               <property name="deserializers">
-                       <map>
-                               <entry key="org.argeo.security.UserNature">
-                                       <bean class="org.argeo.server.json.GenericJsonDeserializer">
-                                               <property name="objectFactories" ref="objectFactories" />
-                                       </bean>
-                               </entry>
-                       </map>
-               </property>
-       </bean>
-
-
-       <bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
-               <property name="serializer" ref="serverMapper" />
-       </bean>
-
-       <bean id="serverMapper" class="org.argeo.server.json.JsonServerMapper">
-       </bean>
-
-       <bean class="org.argeo.server.mvc.DefaultHandlerExceptionResolver" />
-
-</beans>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/security.xml b/security/modules/org.argeo.security.webapp/WEB-INF/security.xml
deleted file mode 100644 (file)
index 66e62cf..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:security="http://www.springframework.org/schema/security"
-       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
-       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-
-       <bean id="authenticationProcessingFilterEntryPoint"
-               class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
-               <property name="loginFormUrl" value="/getCredentials.ria" />
-               <property name="forceHttps" value="false" />
-       </bean>
-
-       <security:http entry-point-ref="authenticationProcessingFilterEntryPoint">
-               <security:intercept-url pattern="/*.security"
-                       access="ROLE_USER,ROLE_ADMIN" />
-               <security:intercept-url pattern="/*.ria"
-                       access="ROLE_ANONYMOUS,ROLE_USER" />
-               <security:logout logout-url="/logout.ria"
-                       logout-success-url="/getCredentials.ria" />
-               <security:anonymous username="anonymous"
-                       granted-authority="ROLE_ANONYMOUS" />
-               <security:remember-me key="argeo" services-ref="rememberMeServices" />
-       </security:http>
-
-       <bean id="rememberMeServices" class="org.argeo.security.mvc.ArgeoRememberMeServices">
-               <property name="alwaysRemember" value="true" />
-               <property name="userDetailsService" ref="userDetailsService" />
-               <property name="key" value="${argeo.security.systemKey}" />
-       </bean>
-
-
-       <bean id="authenticationProcessingFilter"
-               class="org.springframework.security.ui.webapp.AuthenticationProcessingFilter">
-               <security:custom-filter position="AUTHENTICATION_PROCESSING_FILTER" />
-               <property name="authenticationManager" ref="_authenticationManager" />
-               <property name="authenticationFailureUrl" value="/getCredentials.ria" />
-               <property name="defaultTargetUrl" value="/getCredentials.ria" />
-               <property name="filterProcessesUrl" value="/login.ria" />
-               <property name="usernameParameter" value="username" />
-               <property name="passwordParameter" value="password" />
-       </bean>
-</beans>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/web.xml b/security/modules/org.argeo.security.webapp/WEB-INF/web.xml
deleted file mode 100644 (file)
index 2331287..0000000
+++ /dev/null
@@ -1,57 +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>Argeo Security Web Application</display-name>
-
-       <!-- SECURITY servlet -->
-       <servlet>
-               <servlet-name>security</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>security</servlet-name>
-               <url-pattern>*.security</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>security</servlet-name>
-               <url-pattern>*.ria</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>
-
-       <!--  Security -->
-       <filter>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-       </filter>
-
-       <filter-mapping>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <url-pattern>/*</url-pattern>
-       </filter-mapping>
-
-       <context-param>
-               <param-name>argeo.security.systemKey</param-name>
-               <param-value>argeo</param-value>
-       </context-param>
-</web-app>
diff --git a/security/modules/org.argeo.security.webapp/pom.xml b/security/modules/org.argeo.security.webapp/pom.xml
deleted file mode 100644 (file)
index 1f5cc2f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.security.webapp</artifactId>
-       <name>Commons Security Webapp</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Web-ContextPath>org.argeo.security.webapp</Web-ContextPath>
-                                               <Import-Package>
-                                                       *,
-                                                       javax.servlet,
-                                                       javax.servlet.http,
-                                                       javax.servlet.resources,
-                                                       org.argeo.security,
-                                                       org.argeo.security.mvc,
-                                                       org.argeo.server.mvc,
-                                                       org.springframework.ldap.core.support,
-                                                       org.springframework.osgi.web.context.support,
-                                                       org.springframework.security,
-                                                       org.springframework.security.config,
-                                                       org.springframework.security.ui,
-                                                       org.springframework.security.ui.rememberme,
-                                                       org.springframework.security.ui.webapp,
-                                                       org.springframework.security.userdetails,
-                                                       org.springframework.web.context,
-                                                       org.springframework.web.context.support,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.web.servlet
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/security/modules/pom.xml b/security/modules/pom.xml
deleted file mode 100644 (file)
index 129e5b7..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>security</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons Security Modules</name>
-       <modules>
-               <module>org.argeo.security.dao.cli</module>
-               <module>org.argeo.security.dao.os</module>
-               <module>org.argeo.security.dao.jackrabbit</module>
-               <module>org.argeo.security.dao.ldap</module>
-               <module>org.argeo.security.auth.ldap</module>
-               <module>org.argeo.security.webapp</module>
-       </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>**</include>
-                               </includes>
-                               <excludes>
-                                       <exclude>.*</exclude>
-                                       <exclude>.*/**</exclude>
-                                       <exclude>pom.xml</exclude>
-                                       <exclude>build.properties</exclude>
-                               </excludes>
-                       </resource>
-               </resources>
-       </build>
-</project>
\ No newline at end of file
diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
deleted file mode 100644 (file)
index ad5bc11..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>security</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <name>Commons Security Eclipse Plugins</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.security.equinox</module>
-               <module>org.argeo.security.ui</module>
-               <module>org.argeo.security.ui.admin</module>
-               <module>org.argeo.security.ui.rcp</module>
-               <module>org.argeo.security.ui.rap</module>
-       </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                               <configuration>
-                                       <!-- Prevents source jars to contain misleading data -->
-                                       <excludes>
-                                               <exclude>plugin.xml</exclude>
-                                               <exclude>META-INF/MANIFEST.MF</exclude>
-                                       </excludes>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/security/pom.xml b/security/pom.xml
deleted file mode 100644 (file)
index 67a93c2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>security</artifactId>
-       <name>Commons Security</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>runtime</module>
-               <module>modules</module>
-               <module>plugins</module>
-               <module>dep</module>
-       </modules>
-</project>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.activemq/.classpath b/security/runtime/org.argeo.security.activemq/.classpath
deleted file mode 100644 (file)
index c0bbc0a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/security/runtime/org.argeo.security.activemq/.project b/security/runtime/org.argeo.security.activemq/.project
deleted file mode 100644 (file)
index cdc841c..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.security.activemq</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/security/runtime/org.argeo.security.activemq/.settings/org.eclipse.jdt.core.prefs b/security/runtime/org.argeo.security.activemq/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 312bbe1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Feb 16 10:40:27 CET 2011
-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.compliance=1.5
-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/security/runtime/org.argeo.security.activemq/.settings/org.eclipse.pde.core.prefs b/security/runtime/org.argeo.security.activemq/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index 85f2008..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Feb 16 10:40:27 CET 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/security/runtime/org.argeo.security.activemq/build.properties b/security/runtime/org.argeo.security.activemq/build.properties
deleted file mode 100644 (file)
index 2c65f86..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/main/java/,\
-           src/main/resources/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml
deleted file mode 100644 (file)
index bcbec02..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.security.activemq</artifactId>
-       <name>Commons Security ActiveMQ</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.argeo.security.activemq.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.util</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.core</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.transaction</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.security.core</artifactId>
-               </dependency>
-
-               <!-- Logging -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-
-               <!-- JMS -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.activemq</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.jms</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.jms</artifactId>
-               </dependency>
-
-               <!-- TEST -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java
deleted file mode 100644 (file)
index 5ecab67..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.security.activemq;
-
-import org.apache.activemq.broker.BrokerPluginSupport;
-import org.apache.activemq.broker.ConnectionContext;
-import org.apache.activemq.command.ConnectionInfo;
-import org.argeo.ArgeoException;
-import org.argeo.security.core.InternalAuthentication;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationManager;
-import org.springframework.security.context.SecurityContext;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-
-@SuppressWarnings("unchecked")
-/** Integrates Spring Security with ActiveMQ security.*/
-public class ActiveMqSecurityBrokerPlugin extends BrokerPluginSupport {
-       // private final static Log log = LogFactory
-       // .getLog(ActiveMqSecurityBrokerPlugin.class);
-
-       private AuthenticationManager authenticationManager;
-       private String systemUsername = InternalAuthentication.DEFAULT_SYSTEM_USERNAME;
-       private String systemRole = InternalAuthentication.DEFAULT_SYSTEM_ROLE;
-
-       @Override
-       public void addConnection(ConnectionContext context, ConnectionInfo info)
-                       throws Exception {
-               String username = info.getUserName();
-               if (username == null)
-                       throw new ArgeoException("No user name provided");
-               String password = info.getPassword();
-               if (password == null) {
-                       password = context.getConnection().getRemoteAddress().substring(1);
-                       password = password.substring(0, password.lastIndexOf(':'));
-               }
-
-               SecurityContext securityContext = SecurityContextHolder.getContext();
-
-               final Authentication authRequest;
-               if (username.equals(systemUsername))
-                       authRequest = new InternalAuthentication(password, username,
-                                       systemRole);
-               else
-                       authRequest = new UsernamePasswordAuthenticationToken(username,
-                                       password);
-
-               final Authentication auth = authenticationManager
-                               .authenticate(authRequest);
-               securityContext.setAuthentication(auth);
-               context.setSecurityContext(new ActiveMqSpringSecurityContext(
-                               securityContext));
-
-               super.addConnection(context, info);
-       }
-
-       public void setAuthenticationManager(
-                       AuthenticationManager authenticationManager) {
-               this.authenticationManager = authenticationManager;
-       }
-
-       public void setSystemUsername(String systemUsername) {
-               this.systemUsername = systemUsername;
-       }
-
-       public void setSystemRole(String systemRole) {
-               this.systemRole = systemRole;
-       }
-
-}
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java
deleted file mode 100644 (file)
index f9ba038..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.security.activemq;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.context.SecurityContext;
-
-/** An ActiveMQ security context compatible with Spring Security. */
-public class ActiveMqSpringSecurityContext extends
-               org.apache.activemq.security.SecurityContext {
-
-       private final SecurityContext springSecurityContext;
-
-       public ActiveMqSpringSecurityContext(SecurityContext springSecurityContext) {
-               super(springSecurityContext.getAuthentication().getName());
-               this.springSecurityContext = springSecurityContext;
-       }
-
-       @Override
-       public Set<?> getPrincipals() {
-               return new HashSet<GrantedAuthority>(
-                               Arrays.asList(springSecurityContext.getAuthentication()
-                                               .getAuthorities()));
-       }
-
-       public SecurityContext getSpringSecurityContext() {
-               return springSecurityContext;
-       }
-
-}
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
deleted file mode 100644 (file)
index 4597dd5..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.security.activemq;
-
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-
-import org.apache.activemq.ActiveMQSslConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.io.Resource;
-import org.springframework.jms.connection.CachingConnectionFactory;
-import org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter;
-
-/** An ActiveMQ connection factory managing secure connections. */
-public class SecuredActiveMqConnectionFactory implements ConnectionFactory,
-               InitializingBean, DisposableBean {
-
-       public final static String AUTHMODE_UI = "ui";
-       public final static String AUTHMODE_OS = "os";
-       public final static String AUTHMODE_DEFAULT = AUTHMODE_OS;
-       // private final static String LOGIN_CONFIG_PROPERTY =
-       // "java.security.auth.login.config";
-
-       private final static Log log = LogFactory
-                       .getLog(SecuredActiveMqConnectionFactory.class);
-
-       private String keyStorePassword;
-       private Resource keyStore;
-       private String keyStoreType = "JKS";// "PKCS12"
-       private String brokerURL;
-
-       private String authenticationMode;
-
-       private CachingConnectionFactory cachingConnectionFactory;
-
-       public Connection createConnection() throws JMSException {
-               return cachingConnectionFactory.createConnection();
-       }
-
-       public Connection createConnection(String userName, String password)
-                       throws JMSException {
-               throw new UnsupportedOperationException();
-       }
-
-       public void afterPropertiesSet() throws Exception {
-               ActiveMQSslConnectionFactory activeMQSslConnectionFactory = new ActiveMQSslConnectionFactory();
-               prepareActiveMqSslConnectionFactory(activeMQSslConnectionFactory);
-               activeMQSslConnectionFactory.setBrokerURL(brokerURL);
-               UserCredentialsConnectionFactoryAdapter uccfa = new UserCredentialsConnectionFactoryAdapter();
-               uccfa.setTargetConnectionFactory(activeMQSslConnectionFactory);
-               cachingConnectionFactory = new CachingConnectionFactory();
-               cachingConnectionFactory.setTargetConnectionFactory(uccfa);
-               cachingConnectionFactory.setCacheConsumers(false);
-
-               initConnectionFactoryCredentials(uccfa);
-               cachingConnectionFactory.initConnection();
-               log.info("Connected to " + brokerURL);
-               uccfa.setUsername(null);
-               uccfa.setPassword(null);
-
-       }
-
-       protected void initConnectionFactoryCredentials(
-                       final UserCredentialsConnectionFactoryAdapter uccfa) {
-               if (authenticationMode == null)
-                       authenticationMode = AUTHMODE_DEFAULT;
-
-               if (AUTHMODE_OS.equals(authenticationMode)) {
-                       // if (false) {
-                       // // Cache previous value of login conf location
-                       // String oldLoginConfLocation = System
-                       // .getProperty(LOGIN_CONFIG_PROPERTY);
-                       // // Find OS family
-                       // String osName = System.getProperty("os.name");
-                       // final String auth;
-                       // if (osName.startsWith("Windows"))
-                       // auth = "Windows";
-                       // else if (osName.startsWith("SunOS")
-                       // || osName.startsWith("Solaris"))
-                       // auth = "Solaris";
-                       // else
-                       // auth = "Unix";
-                       //
-                       // Subject subject;
-                       // // see http://old.nabble.com/osgi-and-jaas-td23485885.html
-                       // ClassLoader ccl = Thread.currentThread()
-                       // .getContextClassLoader();
-                       // try {
-                       // Thread.currentThread().setContextClassLoader(
-                       // getClass().getClassLoader());
-                       // URL url = getClass().getResource(
-                       // "/org/argeo/security/activemq/osLogin.conf");
-                       //
-                       // System.setProperty(LOGIN_CONFIG_PROPERTY, url.toString());
-                       // LoginContext lc = new LoginContext(auth);
-                       // lc.login();
-                       // subject = lc.getSubject();
-                       // } catch (LoginException le) {
-                       // throw new ArgeoException("OS authentication failed", le);
-                       // } finally {
-                       // if (oldLoginConfLocation != null)
-                       // System.setProperty(LOGIN_CONFIG_PROPERTY,
-                       // oldLoginConfLocation);
-                       // Thread.currentThread().setContextClassLoader(ccl);
-                       // }
-                       // // Extract user name
-                       // String osUsername = null;
-                       // for (Principal principal : subject.getPrincipals()) {
-                       // String className = principal.getClass().getName();
-                       // if ("Unix".equals(auth)
-                       // && "com.sun.security.auth.UnixPrincipal"
-                       // .equals(className))
-                       // osUsername = principal.getName();
-                       // else if ("Windows".equals(auth)
-                       // && "com.sun.security.auth.NTUserPrincipal"
-                       // .equals(className))
-                       // osUsername = principal.getName();
-                       // else if ("Solaris".equals(auth)
-                       // && "com.sun.security.auth.SolarisPrincipal"
-                       // .equals(className))
-                       // osUsername = principal.getName();
-                       // }
-                       //
-                       // if (osUsername == null)
-                       // throw new ArgeoException("Could not find OS user name");
-                       // }
-
-                       uccfa.setUsername(System.getProperty("user.name"));
-                       uccfa.setPassword(null);
-
-               } else if (AUTHMODE_UI.equals(authenticationMode)) {
-                       try {
-                               UIManager.setLookAndFeel(new MetalLookAndFeel());
-                       } catch (UnsupportedLookAndFeelException e) {
-                               throw new ArgeoException("Cannot load look and feel", e);
-                       }
-                       UIManager.put("ClassLoader", getClass().getClassLoader());
-                       UserPasswordDialog dialog = new UserPasswordDialog() {
-                               private static final long serialVersionUID = -891646559691412088L;
-
-                               protected void useCredentials(String username, char[] password) {
-                                       uccfa.setUsername(username);
-                                       uccfa.setPassword(new String(password));
-                               }
-                       };
-                       dialog.setVisible(true);
-               } else {
-                       throw new ArgeoException("Authentication mode '"
-                                       + authenticationMode + "' is not supported");
-               }
-
-       }
-
-       protected void prepareActiveMqSslConnectionFactory(
-                       ActiveMQSslConnectionFactory connectionFactory) {
-               try {
-                       KeyStore keyStoreKs = KeyStore.getInstance(keyStoreType);
-
-                       InputStream keyInput = keyStore.getInputStream();
-                       keyStoreKs.load(keyInput,
-                                       keyStorePassword != null ? keyStorePassword.toCharArray()
-                                                       : null);
-                       keyInput.close();
-
-                       TrustManagerFactory tmf = TrustManagerFactory
-                                       .getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                       tmf.init(keyStoreKs);
-
-                       KeyManagerFactory keyManagerFactory = KeyManagerFactory
-                                       .getInstance(KeyManagerFactory.getDefaultAlgorithm());
-                       keyManagerFactory.init(keyStoreKs, keyStorePassword.toCharArray());
-
-                       connectionFactory.setKeyAndTrustManagers(
-                                       keyManagerFactory.getKeyManagers(), tmf.getTrustManagers(),
-                                       new SecureRandom());
-               } catch (Exception e) {
-                       throw new ArgeoException(
-                                       "Cannot initialize JMS connection factory", e);
-               }
-
-       }
-
-       public void destroy() throws Exception {
-               if (cachingConnectionFactory != null)
-                       cachingConnectionFactory.destroy();
-       }
-
-       public void setKeyStorePassword(String keyStorePassword) {
-               this.keyStorePassword = keyStorePassword;
-       }
-
-       public void setKeyStore(Resource keyStore) {
-               this.keyStore = keyStore;
-       }
-
-       public void setKeyStoreType(String keyStoreType) {
-               this.keyStoreType = keyStoreType;
-       }
-
-       public void setBrokerURL(String brokerUrl) {
-               this.brokerURL = brokerUrl;
-       }
-
-       public void setAuthenticationMode(String authenticationMode) {
-               this.authenticationMode = authenticationMode;
-       }
-
-}
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java
deleted file mode 100644 (file)
index 747ccb1..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.security.activemq;
-
-import java.awt.Container;
-import java.awt.GridLayout;
-import java.awt.Panel;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-
-/**
- * Small Swing-based UI to pass user/name and password. TODO better integrate
- * with JAAS callbacks.
- */
-public class UserPasswordDialog extends JDialog implements ActionListener {
-       private static final long serialVersionUID = -9052993072210981198L;
-       private static String OK = "ok";
-
-       private JTextField username = new JTextField("", 10);
-       private JPasswordField password = new JPasswordField("", 10);
-
-       private JButton okButton;
-       private JButton cancelButton;
-
-       public UserPasswordDialog() {
-               setTitle("Credentials");
-               setModal(true);
-               setLocationRelativeTo(null);
-               setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-               JPanel p1 = new JPanel(new GridLayout(2, 2, 3, 3));
-               p1.add(new JLabel("User"));
-               p1.add(username);
-               p1.add(new JLabel("Password"));
-               password.setActionCommand(OK);
-               password.addActionListener(this);
-               p1.add(password);
-               add("Center", p1);
-
-               Panel p2 = new Panel();
-               okButton = addButton(p2, "OK");
-               okButton.setActionCommand(OK);
-               cancelButton = addButton(p2, "Cancel");
-               add("South", p2);
-               setSize(240, 120);
-
-               pack();
-       }
-
-       /** To be overridden */
-       protected void useCredentials(String username, char[] password) {
-               // does nothing
-       }
-
-       private JButton addButton(Container c, String name) {
-               JButton button = new JButton(name);
-               button.addActionListener(this);
-               c.add(button);
-               return button;
-       }
-
-       public final void actionPerformed(ActionEvent evt) {
-               Object source = evt.getSource();
-               if (source == okButton || evt.getActionCommand().equals(OK)) {
-                       char[] p = password.getPassword();
-                       useCredentials(username.getText(), p);
-                       Arrays.fill(p, '0');
-                       cleanUp();
-               } else if (source == cancelButton)
-                       cleanUp();
-       }
-
-       private void cleanUp() {
-               password.setText("");
-               dispose();
-       }
-
-       public static void main(String[] args) {
-               UserPasswordDialog dialog = new UserPasswordDialog() {
-                       private static final long serialVersionUID = -891646559691412088L;
-
-                       protected void useCredentials(String username, char[] password) {
-                               System.out.println(username + "/" + new String(password));
-                       }
-               };
-               dialog.setVisible(true);
-               System.out.println("After show");
-       }
-}
diff --git a/security/runtime/org.argeo.security.activemq/src/main/resources/org/argeo/security/activemq/osLogin.conf b/security/runtime/org.argeo.security.activemq/src/main/resources/org/argeo/security/activemq/osLogin.conf
deleted file mode 100644 (file)
index 17df63c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Unix {
-  com.sun.security.auth.module.UnixLoginModule required;
-};
-
-Solaris {
-  com.sun.security.auth.module.SolarisLoginModule required;
-};
-
-Windows {
-  com.sun.security.auth.module.NTLoginModule required;
-};
-
diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
deleted file mode 100644 (file)
index c3fa23e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>security</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <name>Commons Security Runtime</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.security.core</module>
-               <module>org.argeo.security.ldap</module>
-               <module>org.argeo.security.activemq</module>
-               <module>org.argeo.security.jackrabbit</module>
-               <module>org.argeo.security.mvc</module>
-       </modules>
-</project>
\ No newline at end of file
diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml
deleted file mode 100644 (file)
index e9272c4..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.dep.activemq</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons Active MQ Dependencies</name>
-       <dependencies>
-               <!-- Commons Dep -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- JMS / ActiveMQ -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.jms</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.activemq</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.commons.pool</artifactId>
-               </dependency>
-
-               <!-- Required by ActiveMQ bundles -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.commons.net</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.management.j2ee</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.ejb</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.xml.rpc</artifactId>
-               </dependency>
-
-               <!-- Test OSGi -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.commons</groupId> -->
-<!--                   <artifactId>org.argeo.server.dep.javax</artifactId> -->
-<!--                   <version>1.1.1-SNAPSHOT</version> -->
-<!--                   <type>pom</type> -->
-<!--                   <scope>test</scope> -->
-<!--           </dependency> -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.xmlcommons</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.xalan</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.beans</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.context</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-               <!-- For Active MQ optional -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.dep.osgi</groupId> -->
-<!--                   <artifactId>org.argeo.dep.osgi.activemq.optional</artifactId> -->
-<!--           </dependency> -->
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/dep/org.argeo.server.dep.hibernate/pom.xml b/server/dep/org.argeo.server.dep.hibernate/pom.xml
deleted file mode 100644 (file)
index 0f2e047..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.dep.hibernate</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons Hibernate Dependencies</name>
-       <dependencies>
-               <!--  Commons Dep -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Hibernate -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.hibernate</artifactId>
-               </dependency>
-
-               <!-- JEE -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>edu.emory.mathcs.backport</artifactId>
-               </dependency>
-
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
deleted file mode 100644 (file)
index 6f0ae7e..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.dep.tomcat</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons Tomcat Dependencies</name>
-       <dependencies>
-               <!-- Commons Dep -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Modules -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.catalina</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.catalina.start</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- JEE -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet.jsp</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.persistence</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.management.j2ee</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.ejb</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.xml.rpc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet.jsp.jstl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.el</artifactId>
-               </dependency>
-
-               <!-- Taglibs -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.taglibs.standard</artifactId>
-               </dependency>
-
-               <!-- Tomcat -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.coyote</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.jasper</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.el</artifactId>
-               </dependency>
-
-               <!-- Test with Javax -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.xmlcommons</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-               <!-- OSGi test -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/dep/pom.xml b/server/dep/pom.xml
deleted file mode 100644 (file)
index 008fc2f..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>server</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>dep</artifactId>
-       <name>Commons Server Dependencies</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.server.dep.tomcat</module>
-               <module>org.argeo.server.dep.ads</module>
-               <module>org.argeo.server.dep.hibernate</module>
-               <module>org.argeo.server.dep.jackrabbit.server</module>
-               <module>org.argeo.server.dep.activemq</module>
-       </modules>
-       <profiles>
-               <profile>
-                       <id>check-osgi</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>check-osgi</id>
-                                                               <phase>test</phase>
-                                                               <goals>
-                                                                       <goal>equinox</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <onlyCheck>true</onlyCheck>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-                       <dependencies>
-                               <!-- OSGi test -->
-                               <dependency>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.osgi.boot</artifactId>
-                                       <version>2.1.12-SNAPSHOT</version>
-                                       <scope>test</scope>
-                               </dependency>
-                       </dependencies>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.ext.bsf/pom.xml b/server/modules/org.argeo.ext.bsf/pom.xml
deleted file mode 100644 (file)
index d590791..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.ext.bsf</artifactId>
-       <name>Commons Server BSF Extension</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Fragment-Host>org.apache.bsf</Fragment-Host>
-                                               <Import-Package>
-                                                       *,
-                                                       bsh.util;resolution:=optional,
-                                                       org.codehaus.groovy.bsf;resolution:=optional
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/.project b/server/modules/org.argeo.ext.jackrabbit.sybase/.project
deleted file mode 100644 (file)
index 6511be8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.ext.jackrabbit.sybase</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.ext.jackrabbit.sybase/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index 32c9e3f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Jun 15 19:05:36 CEST 2010
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/build.properties b/server/modules/org.argeo.ext.jackrabbit.sybase/build.properties
deleted file mode 100644 (file)
index 5f22cdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/fs/db/sybase.ddl b/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/fs/db/sybase.ddl
deleted file mode 100644 (file)
index fb8a0e8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-create table ${schemaObjectPrefix}FSENTRY (FSENTRY_PATH varchar(2048) not null, FSENTRY_NAME varchar(255) not null, FSENTRY_DATA image null, FSENTRY_LASTMOD decimal(19,0) not null, FSENTRY_LENGTH decimal(19,0) not null)
-#create unique index ${schemaObjectPrefix}FSENTRY_IDX on ${schemaObjectPrefix}FSENTRY (FSENTRY_PATH, FSENTRY_NAME)
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/journal/sybase.ddl b/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/journal/sybase.ddl
deleted file mode 100644 (file)
index d0f6242..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more\r
-#  contributor license agreements.  See the NOTICE file distributed with\r
-#  this work for additional information regarding copyright ownership.\r
-#  The ASF licenses this file to You under the Apache License, Version 2.0\r
-#  (the "License"); you may not use this file except in compliance with\r
-#  the License.  You may obtain a copy of the License at\r
-#\r
-#      http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#  Unless required by applicable law or agreed to in writing, software\r
-#  distributed under the License is distributed on an "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#  See the License for the specific language governing permissions and\r
-#  limitations under the License.\r
-\r
-create table ${schemaObjectPrefix}JOURNAL (REVISION_ID decimal(19,0) NOT NULL, JOURNAL_ID varchar(255), PRODUCER_ID varchar(255), REVISION_DATA IMAGE)\r
-create unique index ${schemaObjectPrefix}JOURNAL_IDX on ${schemaObjectPrefix}JOURNAL (REVISION_ID)\r
-create table ${schemaObjectPrefix}GLOBAL_REVISION (REVISION_ID decimal(19,0) NOT NULL)\r
-create unique index ${schemaObjectPrefix}GLOBAL_REVISION_IDX on ${schemaObjectPrefix}GLOBAL_REVISION (REVISION_ID)\r
-\r
-# Inserting the one and only revision counter record now helps avoiding race conditions\r
-insert into ${schemaObjectPrefix}GLOBAL_REVISION VALUES(0)\r
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/persistence/bundle/sybase.ddl b/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/persistence/bundle/sybase.ddl
deleted file mode 100644 (file)
index 47c6b71..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-create table ${schemaObjectPrefix}BUNDLE (NODE_ID binary(16) not null, BUNDLE_DATA image not null)
-create unique index ${schemaObjectPrefix}BUNDLE_IDX on ${schemaObjectPrefix}BUNDLE (NODE_ID)
-create table ${schemaObjectPrefix}REFS (NODE_ID binary(16) not null, REFS_DATA image not null)
-create unique index ${schemaObjectPrefix}REFS_IDX on ${schemaObjectPrefix}REFS (NODE_ID)
-create table ${schemaObjectPrefix}BINVAL (BINVAL_ID varchar(64) not null, BINVAL_DATA image not null)
-create unique index ${schemaObjectPrefix}BINVAL_IDX on ${schemaObjectPrefix}BINVAL (BINVAL_ID)
-#create table ${schemaObjectPrefix}NAMES (ID INTEGER IDENTITY(1,1) PRIMARY KEY, NAME varchar(255) COLLATE Latin1_General_CS_AS not null)
-create table ${schemaObjectPrefix}NAMES (ID INTEGER IDENTITY PRIMARY KEY, NAME varchar(255))
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/persistence/db/sybase.ddl b/server/modules/org.argeo.ext.jackrabbit.sybase/org/apache/jackrabbit/core/persistence/db/sybase.ddl
deleted file mode 100644 (file)
index 2bde323..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-create table ${schemaObjectPrefix}NODE (NODE_ID char(36) not null, NODE_DATA image not null)
-create unique index ${schemaObjectPrefix}NODE_IDX on ${schemaObjectPrefix}NODE (NODE_ID)
-create table ${schemaObjectPrefix}PROP (PROP_ID varchar(1024) not null, PROP_DATA image not null)
-create unique index ${schemaObjectPrefix}PROP_IDX on ${schemaObjectPrefix}PROP (PROP_ID)
-create table ${schemaObjectPrefix}REFS (NODE_ID char(36) not null, REFS_DATA image not null)
-create unique index ${schemaObjectPrefix}REFS_IDX on ${schemaObjectPrefix}REFS (NODE_ID)
-create table ${schemaObjectPrefix}BINVAL (BINVAL_ID varchar(1024) not null, BINVAL_DATA image not null)
-create unique index ${schemaObjectPrefix}BINVAL_IDX on ${schemaObjectPrefix}BINVAL (BINVAL_ID)
diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml
deleted file mode 100644 (file)
index 14cff8f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.ext.jackrabbit.sybase</artifactId>
-       <name>Commons Server Jackrabbit Sybase Extension</name>
-       <description>Provides experimental support to Sybase in Jackrabbit</description>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Fragment-Host>org.apache.jackrabbit</Fragment-Host>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/.project b/server/modules/org.argeo.node.repofactory.jackrabbit/.project
deleted file mode 100644 (file)
index cff24eb..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.node.repofactory.jackrabbit</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
deleted file mode 100644 (file)
index b7c82c1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xmlns:util="http://www.springframework.org/schema/util"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/util\r
-       http://www.springframework.org/schema/util/spring-util-2.5.xsd">\r
-\r
-       <!-- REFERENCE -->\r
-<!--   <list id="repositories" interface="javax.jcr.Repository" -->\r
-<!--           cardinality="0..N"> -->\r
-<!--           <listener ref="repositoryFactory" bind-method="register" -->\r
-<!--                   unbind-method="unregister" /> -->\r
-<!--   </list> -->\r
-\r
-       <!-- SERVICES -->\r
-<!--   <service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" /> -->\r
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory.xml
deleted file mode 100644 (file)
index a00c9b0..0000000
+++ /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"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <bean id="repositoryFactory" class="org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory">
-               <property name="bundleContext" ref="bundleContext" />
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml
deleted file mode 100644 (file)
index 42e02ed..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons.server</groupId>
-               <version>1.1.5-SNAPSHOT</version>
-               <artifactId>modules</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-       <name>Commons Server Node Repository Factory Jackrabbit</name>
-       <description>Default JCR repository factory based on Jackrabbit. It provides access to aliased and remote repositories.</description>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                                               <!-- Import-Package needs to be specified explicitly since BND doesn't 
-                                                       deal with custom Spring-Context instructions -->
-                                               <Spring-Context>META-INF/spring/*.xml;create-asynchronously:=false</Spring-Context>
-                                               <Import-Package>
-                                                       *,
-                                                       javax.jcr,
-                                                       org.argeo.jackrabbit,
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.activemq.broker/.project b/server/modules/org.argeo.server.activemq.broker/.project
deleted file mode 100644 (file)
index 0dd1ba1..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.activemq.broker</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/modules/org.argeo.server.activemq.broker/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.activemq.broker/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index c84159a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Apr 13 20:39:49 CEST 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml b/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
deleted file mode 100644 (file)
index eae474b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:amq="http://activemq.apache.org/schema/core" 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
-       http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-       <bean
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
-               <property name="locations">
-                       <value>osgibundle:activemq.properties
-                       </value>
-               </property>
-       </bean>
-
-       <!-- Embedded broker -->
-       <amq:broker id="broker" useJmx="false" persistent="false">
-               <amq:transportConnectors>
-                       <amq:transportConnector uri="${argeo.server.jms.url}" />
-                       <!-- <amq:transportConnector uri="xmpp://localhost:61222" /> -->
-               </amq:transportConnectors>
-       </amq:broker>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.activemq.broker/activemq.properties b/server/modules/org.argeo.server.activemq.broker/activemq.properties
deleted file mode 100644 (file)
index 56fc24c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-argeo.server.jms.url=tcp://localhost:61616
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.activemq.broker/build.properties b/server/modules/org.argeo.server.activemq.broker/build.properties
deleted file mode 100644 (file)
index 5f22cdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/
diff --git a/server/modules/org.argeo.server.activemq.broker/pom.xml b/server/modules/org.argeo.server.activemq.broker/pom.xml
deleted file mode 100644 (file)
index f62ae25..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.activemq.broker</artifactId>
-       <name>Commons Server Default Active MQ Broker</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>
-                                                       *,
-                                                       ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
-                                                       ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,
-                                                       ietf.params.xml.ns.xmpp_streams;resolution:=optional,
-                                                       ietf.params.xml.ns.xmpp_tls;resolution:=optional,
-                                                       jabber.client;resolution:=optional,
-                                                       jabber.iq._private;resolution:=optional,
-                                                       jabber.iq.auth;resolution:=optional,
-                                                       jabber.iq.roster;resolution:=optional,
-                                                       org.apache.activemq.broker,
-                                                       org.apache.activemq.command;resolution:=optional,
-                                                       org.apache.activemq.store.amq,
-                                                       org.apache.activemq.transport.http;resolution:=optional,
-                                                       org.apache.activemq.util,
-                                                       org.apache.activemq.xbean,
-                                                       org.jabber.etherx.streams;resolution:=optional,
-                                                       org.jabber.protocol.disco_info;resolution:=optional,
-                                                       org.jabber.protocol.disco_items;resolution:=optional,
-                                                       org.jabber.protocol.muc;resolution:=optional,
-                                                       org.jabber.protocol.muc_user;resolution:=optional,
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.catalina/conf/catalina.policy b/server/modules/org.argeo.server.catalina/conf/catalina.policy
deleted file mode 100644 (file)
index 5a6426e..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements.  See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// ============================================================================
-// catalina.corepolicy - Security Policy Permissions for Tomcat 6
-//
-// This file contains a default set of security policies to be enforced (by the
-// JVM) when Catalina is executed with the "-security" option.  In addition
-// to the permissions granted here, the following additional permissions are
-// granted to the codebase specific to each web application:
-//
-// * Read access to the document root directory
-//
-// $Id: catalina.policy 648343 2008-04-15 17:21:29Z markt $
-// ============================================================================
-
-
-// ========== SYSTEM CODE PERMISSIONS =========================================
-
-
-// These permissions apply to javac
-grant codeBase "file:${java.home}/lib/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to all shared system extensions
-grant codeBase "file:${java.home}/jre/lib/ext/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
-grant codeBase "file:${java.home}/../lib/-" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to all shared system extensions when
-// ${java.home} points at $JAVA_HOME/jre
-grant codeBase "file:${java.home}/lib/ext/-" {
-        permission java.security.AllPermission;
-};
-
-
-// ========== CATALINA CODE PERMISSIONS =======================================
-
-
-// These permissions apply to the daemon code
-grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the logging API
-grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-        permission java.util.PropertyPermission "java.util.logging.config.class", "read";
-        permission java.util.PropertyPermission "java.util.logging.config.file", "read";
-        permission java.io.FilePermission "${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
-        permission java.lang.RuntimePermission "shutdownHooks";
-        permission java.io.FilePermission "${catalina.base}${file.separator}conf${file.separator}logging.properties", "read";
-        permission java.util.PropertyPermission "catalina.base", "read";
-        permission java.util.logging.LoggingPermission "control";
-        permission java.io.FilePermission "${catalina.base}${file.separator}logs", "read, write";
-        permission java.io.FilePermission "${catalina.base}${file.separator}logs${file.separator}*", "read, write";
-        permission java.lang.RuntimePermission "getClassLoader";
-        // To enable per context logging configuration, permit read access to the appropriate file.
-        // Be sure that the logging configuration is secure before enabling such access
-        // eg for the examples web application:
-        // permission java.io.FilePermission "${catalina.base}${file.separator}webapps${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties", "read";
-};
-
-// These permissions apply to the server startup code
-grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the servlet API classes
-// and those that are shared across all class loaders
-// located in the "lib" directory
-grant codeBase "file:${catalina.home}/lib/-" {
-        permission java.security.AllPermission;
-};
-
-
-// ========== WEB APPLICATION PERMISSIONS =====================================
-
-
-// These permissions are granted by default to all web applications
-// In addition, a web application will be given a read FilePermission
-// and JndiPermission for all files and directories in its document root.
-grant { 
-    // Required for JNDI lookup of named JDBC DataSource's and
-    // javamail named MimePart DataSource used to send mail
-    permission java.util.PropertyPermission "java.home", "read";
-    permission java.util.PropertyPermission "java.naming.*", "read";
-    permission java.util.PropertyPermission "javax.sql.*", "read";
-
-    // OS Specific properties to allow read access
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "line.separator", "read";
-
-    // JVM properties to allow read access
-    permission java.util.PropertyPermission "java.version", "read";
-    permission java.util.PropertyPermission "java.vendor", "read";
-    permission java.util.PropertyPermission "java.vendor.url", "read";
-    permission java.util.PropertyPermission "java.class.version", "read";
-    permission java.util.PropertyPermission "java.specification.version", "read";
-    permission java.util.PropertyPermission "java.specification.vendor", "read";
-    permission java.util.PropertyPermission "java.specification.name", "read";
-
-    permission java.util.PropertyPermission "java.vm.specification.version", "read";
-    permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-    permission java.util.PropertyPermission "java.vm.specification.name", "read";
-    permission java.util.PropertyPermission "java.vm.version", "read";
-    permission java.util.PropertyPermission "java.vm.vendor", "read";
-    permission java.util.PropertyPermission "java.vm.name", "read";
-
-    // Required for OpenJMX
-    permission java.lang.RuntimePermission "getAttribute";
-
-    // Allow read of JAXP compliant XML parser debug
-    permission java.util.PropertyPermission "jaxp.debug", "read";
-
-    // Precompiled JSPs need access to this package.
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";
-    
-    // Precompiled JSPs need access to this system property.
-    permission java.util.PropertyPermission "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
-
-};
-
-
-// You can assign additional permissions to particular web applications by
-// adding additional "grant" entries here, based on the code base for that
-// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
-//
-// Different permissions can be granted to JSP pages, classes loaded from
-// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/
-// directory, or even to individual jar files in the /WEB-INF/lib/ directory.
-//
-// For instance, assume that the standard "examples" application
-// included a JDBC driver that needed to establish a network connection to the
-// corresponding database and used the scrape taglib to get the weather from
-// the NOAA web server.  You might create a "grant" entries like this:
-//
-// The permissions granted to the context root directory apply to JSP pages.
-// grant codeBase "file:${catalina.home}/webapps/examples/-" {
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
-// };
-//
-// The permissions granted to the context WEB-INF/classes directory
-// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" {
-// };
-//
-// The permission granted to your JDBC driver
-// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" {
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";
-// };
-// The permission granted to the scrape taglib
-// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
-// };
-
diff --git a/server/modules/org.argeo.server.catalina/conf/catalina.properties b/server/modules/org.argeo.server.catalina/conf/catalina.properties
deleted file mode 100644 (file)
index 00d758a..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common" 
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common" 
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class 
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar
-
-#
-# List of comma-separated paths defining the contents of the "server" 
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server" 
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class 
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared" 
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class 
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository 
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-shared.loader=
-
-#
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/server/modules/org.argeo.server.catalina/conf/context.xml b/server/modules/org.argeo.server.catalina/conf/context.xml
deleted file mode 100644 (file)
index 8eb2d2b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- The contents of this file will be loaded for each web application -->
-<Context>
-
-    <!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-       
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <!--
-    <Manager pathname="" />
-    -->
-
-    <!-- Uncomment this to enable Comet connection tacking (provides events
-         on session expiration as well as webapp lifecycle) -->
-    <!--
-    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-    -->
-
-</Context>
diff --git a/server/modules/org.argeo.server.catalina/conf/web.xml b/server/modules/org.argeo.server.catalina/conf/web.xml
deleted file mode 100644 (file)
index 88e9f49..0000000
+++ /dev/null
@@ -1,1186 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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">
-
-  <!-- ======================== Introduction ============================== -->
-  <!-- This document defines default values for *all* web applications      -->
-  <!-- loaded into this instance of Tomcat.  As each application is         -->
-  <!-- deployed, this file is processed, followed by the                    -->
-  <!-- "/WEB-INF/web.xml" deployment descriptor from your own               -->
-  <!-- applications.                                                        -->
-  <!--                                                                      -->
-  <!-- WARNING:  Do not configure application-specific resources here!      -->
-  <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->
-
-
-  <!-- ================== Built In Servlet Definitions ==================== -->
-
-
-  <!-- The default servlet for all web applications, that serves static     -->
-  <!-- resources.  It processes all requests that are not mapped to other   -->
-  <!-- servlets with servlet mappings (defined either here or in your own   -->
-  <!-- web.xml file.  This servlet supports the following initialization    -->
-  <!-- parameters (default values are in square brackets):                  -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   fileEncoding        Encoding to be used to read static resources   -->
-  <!--                       [platform default]                             -->
-  <!--                                                                      -->
-  <!--   input               Input buffer size (in bytes) when reading      -->
-  <!--                       resources to be served.  [2048]                -->
-  <!--                                                                      -->
-  <!--   listings            Should directory listings be produced if there -->
-  <!--                       is no welcome file in this directory?  [false] -->
-  <!--                       WARNING: Listings for directories with many    -->
-  <!--                       entries can be slow and may consume            -->
-  <!--                       significant proportions of server resources.   -->
-  <!--                                                                      -->
-  <!--   output              Output buffer size (in bytes) when writing     -->
-  <!--                       resources to be served.  [2048]                -->
-  <!--                                                                      -->
-  <!--   readonly            Is this context "read only", so HTTP           -->
-  <!--                       commands like PUT and DELETE are               -->
-  <!--                       rejected?  [true]                              -->
-  <!--                                                                      -->
-  <!--   readmeFile          File name to display with the directory        -->
-  <!--                       contents. [null]                               -->
-  <!--                                                                      -->
-  <!--   sendfileSize        If the connector used supports sendfile, this  -->
-  <!--                       represents the minimal file size in KB for     -->
-  <!--                       which sendfile will be used. Use a negative    -->
-  <!--                       value to always disable sendfile.  [48]        -->
-  <!--                                                                      -->
-  <!--  For directory listing customization. Checks localXsltFile, then     -->
-  <!--  globalXsltFile, then defaults to original behavior.                 -->
-  <!--                                                                      -->
-  <!--   localXsltFile       Make directory listings an XML doc and         -->
-  <!--                       pass the result to this style sheet residing   -->
-  <!--                       in that directory. This overrides              -->
-  <!--                        globalXsltFile[null]                          -->
-  <!--                                                                      -->
-  <!--   globalXsltFile      Site wide configuration version of             -->
-  <!--                       localXsltFile This argument is expected        -->
-  <!--                       to be a physical file. [null]                  -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-
-    <servlet>
-        <servlet-name>default</servlet-name>
-        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-        </init-param>
-        <init-param>
-            <param-name>listings</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-
-  <!-- The "invoker" servlet, which executes anonymous servlet classes      -->
-  <!-- that have not been defined in a web.xml file.  Traditionally, this   -->
-  <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map   -->
-  <!-- it to other patterns as well.  The extra path info portion of such a -->
-  <!-- request must be the fully qualified class name of a Java class that  -->
-  <!-- implements Servlet (or extends HttpServlet), or the servlet name     -->
-  <!-- of an existing servlet definition.     This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-
-<!--
-    <servlet>
-        <servlet-name>invoker</servlet-name>
-        <servlet-class>
-          org.apache.catalina.servlets.InvokerServlet
-        </servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-        </init-param>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
--->
-
-
-  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-  <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
-  <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   checkInterval       If development is false and checkInterval is   -->
-  <!--                       greater than zero, background compilations are -->
-  <!--                       enabled. checkInterval is the time in seconds  -->
-  <!--                       between checks to see if a JSP page (and its   -->
-  <!--                       dependent files) needs to  be recompiled. [0]  -->
-  <!--                                                                      -->
-  <!--   classdebuginfo      Should the class file be compiled with         -->
-  <!--                       debugging information?  [true]                 -->
-  <!--                                                                      -->
-  <!--   classpath           What class path should I use while compiling   -->
-  <!--                       generated servlets?  [Created dynamically      -->
-  <!--                       based on the current web application]          -->
-  <!--                                                                      -->
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->
-  <!--                       pages.  See the jasper documentation for more  -->
-  <!--                       information.                                   -->
-  <!--                                                                      -->
-  <!--   compilerSourceVM    Compiler source VM                             -->
-  <!--                       default is System.properties                   -->
-  <!--                        java.specification.version > 1.4              -->
-  <!--                        [1.5] else [1.4]                              -->
-  <!--                                                                      -->
-  <!--   compilerTargetVM    Compiler target VM                             -->  
-  <!--                       default is System.properties                   -->
-  <!--                        java.specification.version > 1.4              -->
-  <!--                        [1.5] else [1.4]                              -->
-  <!--                                                                      -->
-  <!--   development         Is Jasper used in development mode? If true,   -->
-  <!--                       the frequency at which JSPs are checked for    -->
-  <!--                       modification may be specified via the          -->
-  <!--                       modificationTestInterval parameter. [true]     -->
-  <!--                                                                      -->
-  <!--   displaySourceFragment                                              -->
-  <!--                       Should a source fragment be included in        -->
-  <!--                       exception messages? [true]                     -->
-  <!--                                                                      -->
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-  <!--                       dumped to a file? [false]                      -->
-  <!--                       False if suppressSmap is true                  -->
-  <!--                                                                      -->
-  <!--   enablePooling       Determines whether tag handler pooling is      -->
-  <!--                       enabled  [true]                                -->
-  <!--                                                                      -->
-  <!--   engineOptionsClass  Allows specifying the Options class used to    -->
-  <!--                       configure Jasper. If not present, the default  -->
-  <!--                       EmbeddedServletOptions will be used.           -->
-  <!--                                                                      -->
-  <!--   errorOnUseBeanInvalidClassAttribute                                -->
-  <!--                       Should Jasper issue an error when the value of -->
-  <!--                       the class attribute in an useBean action is    -->
-  <!--                       not a valid bean class?  [true]                -->
-  <!--                                                                      -->
-  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
-  <!--                       a separate JVM is used for JSP page compiles   -->
-  <!--                       from the one Tomcat is running in. [true]      -->
-  <!--                                                                      -->
-  <!--   genStrAsCharArray   Should text strings be generated as char       -->
-  <!--                       arrays, to improve performance in some cases?  -->
-  <!--                       [false]                                        -->
-  <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
-  <!--   javaEncoding        Java file encoding to use for generating java  -->
-  <!--                       source files. [UTF8]                           -->
-  <!--                                                                      -->
-  <!--   keepgenerated       Should we keep the generated Java source code  -->
-  <!--                       for each page instead of deleting it? [true]   -->
-  <!--                                                                      -->
-  <!--   mappedfile          Should we generate static content with one     -->
-  <!--                       print statement per input line, to ease        -->
-  <!--                       debugging?  [true]                             -->
-  <!--                                                                      -->
-  <!--   modificationTestInterval                                           -->
-  <!--                       Causes a JSP (and its dependent files) to not  -->
-  <!--                       be checked for modification during the         -->
-  <!--                       specified time interval (in seconds) from the  -->
-  <!--                       last time the JSP was checked for              -->
-  <!--                       modification. A value of 0 will cause the JSP  -->
-  <!--                       to be checked on every access.                 -->
-  <!--                       Used in development mode only. [4]             -->
-  <!--                                                                      -->
-  <!--   scratchdir          What scratch directory should we use when      -->
-  <!--                       compiling JSP pages?  [default work directory  -->
-  <!--                       for the current web application]               -->
-  <!--                                                                      -->
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-  <!--                       debugging be suppressed?  [false]              -->
-  <!--                                                                      -->
-  <!--   trimSpaces          Should white spaces in template text between   -->
-  <!--                       actions or directives be trimmed?  [false]     -->
-  <!--                                                                      -->
-  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-  <!--                       header is added by generated servlet  [false]  -->
-  <!--                                                                      -->
-  <!-- If you wish to use Jikes to compile JSP pages:                       -->
-  <!--   Please see the "Using Jikes" section of the Jasper-HowTo           -->
-  <!--   page in the Tomcat documentation.                                  -->
-
-    <servlet>
-        <servlet-name>jsp</servlet-name>
-        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-        <init-param>
-            <param-name>fork</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <init-param>
-            <param-name>xpoweredBy</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>3</load-on-startup>
-    </servlet>
-
-
-  <!-- NOTE: An SSI Filter is also available as an alternative SSI          -->
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-  <!--                                                                      -->
-  <!-- Server Side Includes processing servlet, which processes SSI         -->
-  <!-- directives in HTML pages consistent with similar support in web      -->
-  <!-- servers like Apache.  Traditionally, this servlet is mapped to the   -->
-  <!-- URL pattern "*.shtml".  This servlet supports the following          -->
-  <!-- initialization parameters (default values are in square brackets):   -->
-  <!--                                                                      -->
-  <!--   buffered            Should output from this servlet be buffered?   -->
-  <!--                       (0=false, 1=true)  [0]                         -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   expires             The number of seconds before a page with SSI   -->
-  <!--                       directives will expire.  [No default]          -->
-  <!--                                                                      -->
-  <!--   isVirtualWebappRelative                                            -->
-  <!--                       Should "virtual" paths be interpreted as       -->
-  <!--                       relative to the context root, instead of       -->
-  <!--                       the server root?  (0=false, 1=true) [0]        -->
-  <!--                                                                      -->
-  <!--   inputEncoding       The encoding to assume for SSI resources if    -->
-  <!--                       one is not available from the resource.        -->
-  <!--                       [Platform default]                             -->
-  <!--                                                                      -->
-  <!--   outputEncoding      The encoding to use for the page that results  -->
-  <!--                       from the SSI processing. [UTF-8]               -->
-
-<!--
-    <servlet>
-        <servlet-name>ssi</servlet-name>
-        <servlet-class>
-          org.apache.catalina.ssi.SSIServlet
-        </servlet-class>
-        <init-param>
-          <param-name>buffered</param-name>
-          <param-value>1</param-value>
-        </init-param>
-        <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <init-param>
-          <param-name>expires</param-name>
-          <param-value>666</param-value>
-        </init-param>
-        <init-param>
-          <param-name>isVirtualWebappRelative</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <load-on-startup>4</load-on-startup>
-    </servlet>
--->
-
-
-  <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->
-  <!-- execution of external applications that conform to the CGI spec      -->
-  <!-- requirements.  Typically, this servlet is mapped to the URL pattern  -->
-  <!-- "/cgi-bin/*", which means that any CGI applications that are         -->
-  <!-- executed must be present within the web application.  This servlet   -->
-  <!-- supports the following initialization parameters (default values     -->
-  <!-- are in square brackets):                                             -->
-  <!--                                                                      -->
-  <!--   cgiPathPrefix        The CGI search path will start at             -->
-  <!--                        webAppRootDir + File.separator + this prefix. -->
-  <!--                        [WEB-INF/cgi]                                 -->
-  <!--                                                                      -->
-  <!--   debug                Debugging detail level for messages logged    -->
-  <!--                        by this servlet.  [0]                         -->
-  <!--                                                                      -->
-  <!--   executable           Name of the exectuable used to run the        -->
-  <!--                        script. [perl]                                -->
-  <!--                                                                      -->
-  <!--   parameterEncoding    Name of parameter encoding to be used with    -->
-  <!--                        CGI servlet.                                  -->
-  <!--                        [System.getProperty("file.encoding","UTF-8")] -->
-  <!--                                                                      -->
-  <!--   passShellEnvironment Should the shell environment variables (if    -->
-  <!--                        any) be passed to the CGI script? [false]     -->
-
-<!--
-    <servlet>
-        <servlet-name>cgi</servlet-name>
-        <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
-        <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <init-param>
-          <param-name>cgiPathPrefix</param-name>
-          <param-value>WEB-INF/cgi</param-value>
-        </init-param>
-         <load-on-startup>5</load-on-startup>
-    </servlet>
--->
-
-
-  <!-- ================ Built In Servlet Mappings ========================= -->
-
-
-  <!-- The servlet mappings for the built in servlets defined above.  Note  -->
-  <!-- that, by default, the CGI and SSI servlets are *not* mapped.  You    -->
-  <!-- must uncomment these mappings (or add them to your application's own -->
-  <!-- web.xml deployment descriptor) to enable these services              -->
-
-    <!-- The mapping for the default servlet -->
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <!-- The mapping for the invoker servlet -->
-<!--
-    <servlet-mapping>
-        <servlet-name>invoker</servlet-name>
-        <url-pattern>/servlet/*</url-pattern>
-    </servlet-mapping>
--->
-
-    <!-- The mapping for the JSP servlet -->
-    <servlet-mapping>
-        <servlet-name>jsp</servlet-name>
-        <url-pattern>*.jsp</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>jsp</servlet-name>
-        <url-pattern>*.jspx</url-pattern>
-    </servlet-mapping>
-
-    <!-- The mapping for the SSI servlet -->
-<!--
-    <servlet-mapping>
-        <servlet-name>ssi</servlet-name>
-        <url-pattern>*.shtml</url-pattern>
-    </servlet-mapping>
--->
-
-    <!-- The mapping for the CGI Gateway servlet -->
-
-<!--
-    <servlet-mapping>
-        <servlet-name>cgi</servlet-name>
-        <url-pattern>/cgi-bin/*</url-pattern>
-    </servlet-mapping>
--->
-
-
-  <!-- ================== Built In Filter Definitions ===================== -->
-
-  <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-  <!--                                                                      -->
-  <!-- Server Side Includes processing filter, which processes SSI          -->
-  <!-- directives in HTML pages consistent with similar support in web      -->
-  <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
-  <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
-  <!-- selectively enable/disable SSI processing based on mime types. For   -->
-  <!-- this to work you will need to uncomment the .shtml mime type         -->
-  <!-- definition towards the bottom of this file.                          -->
-  <!-- The contentType init param allows you to apply SSI processing to JSP -->
-  <!-- pages, javascript, or any other content you wish.  This filter       -->
-  <!-- supports the following initialization parameters (default values are -->
-  <!-- in square brackets):                                                 -->
-  <!--                                                                      -->
-  <!--   contentType         A regex pattern that must be matched before    -->
-  <!--                       SSI processing is applied.                     -->
-  <!--                       [text/x-server-parsed-html(;.*)?]              -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   expires             The number of seconds before a page with SSI   -->
-  <!--                       directives will expire.  [No default]          -->
-  <!--                                                                      -->
-  <!--   isVirtualWebappRelative                                            -->
-  <!--                       Should "virtual" paths be interpreted as       -->
-  <!--                       relative to the context root, instead of       -->
-  <!--                       the server root?  (0=false, 1=true) [0]        -->
-
-<!--
-    <filter>
-        <filter-name>ssi</filter-name>
-        <filter-class>
-          org.apache.catalina.ssi.SSIFilter
-        </filter-class>
-        <init-param>
-          <param-name>contentType</param-name>
-          <param-value>text/x-server-parsed-html(;.*)?</param-value>
-        </init-param>
-        <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
-        </init-param>
-        <init-param>
-          <param-name>expires</param-name>
-          <param-value>666</param-value>
-        </init-param>
-        <init-param>
-          <param-name>isVirtualWebappRelative</param-name>
-          <param-value>0</param-value>
-        </init-param>
-    </filter>
--->
-
-
-  <!-- ==================== Built In Filter Mappings ====================== -->
-
-  <!-- The mapping for the SSI Filter -->
-<!--
-    <filter-mapping>
-        <filter-name>ssi</filter-name>
-        <url-pattern>*.shtml</url-pattern>
-    </filter-mapping>
--->
-
-
-  <!-- ==================== Default Session Configuration ================= -->
-  <!-- You can set the default session timeout (in minutes) for all newly   -->
-  <!-- created sessions by modifying the value below.                       -->
-
-    <session-config>
-        <session-timeout>30</session-timeout>
-    </session-config>
-
-
-  <!-- ===================== Default MIME Type Mappings =================== -->
-  <!-- When serving static resources, Tomcat will automatically generate    -->
-  <!-- a "Content-Type" header based on the resource's filename extension,  -->
-  <!-- based on these mappings.  Additional mappings can be added here (to  -->
-  <!-- apply to all web applications), or in your own application's web.xml -->
-  <!-- deployment descriptor.                                               -->
-
-    <mime-mapping>
-        <extension>abs</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ai</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aif</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aifc</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aiff</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aim</extension>
-        <mime-type>application/x-aim</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>art</extension>
-        <mime-type>image/x-jg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asf</extension>
-        <mime-type>video/x-ms-asf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asx</extension>
-        <mime-type>video/x-ms-asf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>au</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>avi</extension>
-        <mime-type>video/x-msvideo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>avx</extension>
-        <mime-type>video/x-rad-screenplay</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bcpio</extension>
-        <mime-type>application/x-bcpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bin</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bmp</extension>
-        <mime-type>image/bmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>body</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdf</extension>
-        <mime-type>application/x-cdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cer</extension>
-        <mime-type>application/x-x509-ca-cert</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>class</extension>
-        <mime-type>application/java</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cpio</extension>
-        <mime-type>application/x-cpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>csh</extension>
-        <mime-type>application/x-csh</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>css</extension>
-        <mime-type>text/css</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dib</extension>
-        <mime-type>image/bmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>doc</extension>
-        <mime-type>application/msword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dtd</extension>
-        <mime-type>application/xml-dtd</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dv</extension>
-        <mime-type>video/x-dv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dvi</extension>
-        <mime-type>application/x-dvi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eps</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>etx</extension>
-        <mime-type>text/x-setext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>exe</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gif</extension>
-        <mime-type>image/gif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gtar</extension>
-        <mime-type>application/x-gtar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gz</extension>
-        <mime-type>application/x-gzip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hdf</extension>
-        <mime-type>application/x-hdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hqx</extension>
-        <mime-type>application/mac-binhex40</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htc</extension>
-        <mime-type>text/x-component</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htm</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>html</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hqx</extension>
-        <mime-type>application/mac-binhex40</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ief</extension>
-        <mime-type>image/ief</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jad</extension>
-        <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jar</extension>
-        <mime-type>application/java-archive</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>java</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jnlp</extension>
-        <mime-type>application/x-java-jnlp-file</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpe</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpeg</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpg</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>js</extension>
-        <mime-type>text/javascript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jsf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jspf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kar</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>latex</extension>
-        <mime-type>application/x-latex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m3u</extension>
-        <mime-type>audio/x-mpegurl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mac</extension>
-        <mime-type>image/x-macpaint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>man</extension>
-        <mime-type>application/x-troff-man</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mathml</extension>
-        <mime-type>application/mathml+xml</mime-type> 
-    </mime-mapping>
-    <mime-mapping>
-        <extension>me</extension>
-        <mime-type>application/x-troff-me</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mid</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>midi</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mif</extension>
-        <mime-type>application/x-mif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mov</extension>
-        <mime-type>video/quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>movie</extension>
-        <mime-type>video/x-sgi-movie</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp1</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp2</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp3</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp4</extension>
-        <mime-type>video/mp4</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpa</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpe</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpeg</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpega</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpg</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpv2</extension>
-        <mime-type>video/mpeg2</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ms</extension>
-        <mime-type>application/x-wais-source</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>nc</extension>
-        <mime-type>application/x-netcdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>oda</extension>
-        <mime-type>application/oda</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Database -->
-        <extension>odb</extension>
-        <mime-type>application/vnd.oasis.opendocument.database</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Chart -->
-        <extension>odc</extension>
-        <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Formula -->
-        <extension>odf</extension>
-        <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Drawing -->
-        <extension>odg</extension>
-        <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Image -->
-        <extension>odi</extension>
-        <mime-type>application/vnd.oasis.opendocument.image</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Master Document -->
-        <extension>odm</extension>
-        <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Presentation -->
-        <extension>odp</extension>
-        <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Spreadsheet -->
-        <extension>ods</extension>
-        <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Text -->
-        <extension>odt</extension>
-        <mime-type>application/vnd.oasis.opendocument.text</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ogg</extension>
-        <mime-type>application/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Drawing Template -->
-        <extension>otg </extension>
-        <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- HTML Document Template -->
-        <extension>oth</extension>
-        <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Presentation Template -->
-        <extension>otp</extension>
-        <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Spreadsheet Template -->
-        <extension>ots</extension>
-        <mime-type>application/vnd.oasis.opendocument.spreadsheet-template </mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Text Template -->
-        <extension>ott</extension>
-        <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pbm</extension>
-        <mime-type>image/x-portable-bitmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pct</extension>
-        <mime-type>image/pict</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pdf</extension>
-        <mime-type>application/pdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pgm</extension>
-        <mime-type>image/x-portable-graymap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pic</extension>
-        <mime-type>image/pict</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pict</extension>
-        <mime-type>image/pict</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pls</extension>
-        <mime-type>audio/x-scpls</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>png</extension>
-        <mime-type>image/png</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pnm</extension>
-        <mime-type>image/x-portable-anymap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pnt</extension>
-        <mime-type>image/x-macpaint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ppm</extension>
-        <mime-type>image/x-portable-pixmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ppt</extension>
-        <mime-type>application/powerpoint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ps</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>psd</extension>
-        <mime-type>image/x-photoshop</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>qt</extension>
-        <mime-type>video/quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>qti</extension>
-        <mime-type>image/x-quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>qtif</extension>
-        <mime-type>image/x-quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ras</extension>
-        <mime-type>image/x-cmu-raster</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rdf</extension>
-        <mime-type>application/rdf+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rgb</extension>
-        <mime-type>image/x-rgb</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rm</extension>
-        <mime-type>application/vnd.rn-realmedia</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>roff</extension>
-        <mime-type>application/x-troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rtf</extension>
-        <mime-type>application/rtf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rtx</extension>
-        <mime-type>text/richtext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sh</extension>
-        <mime-type>application/x-sh</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>shar</extension>
-        <mime-type>application/x-shar</mime-type>
-    </mime-mapping>
-<!--
-    <mime-mapping>
-        <extension>shtml</extension>
-        <mime-type>text/x-server-parsed-html</mime-type>
-    </mime-mapping>
--->
-    <mime-mapping>
-        <extension>smf</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sit</extension>
-        <mime-type>application/x-stuffit</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>snd</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>src</extension>
-        <mime-type>application/x-wais-source</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sv4cpio</extension>
-        <mime-type>application/x-sv4cpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sv4crc</extension>
-        <mime-type>application/x-sv4crc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>swf</extension>
-        <mime-type>application/x-shockwave-flash</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>t</extension>
-        <mime-type>application/x-troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tar</extension>
-        <mime-type>application/x-tar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tcl</extension>
-        <mime-type>application/x-tcl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tex</extension>
-        <mime-type>application/x-tex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>texi</extension>
-        <mime-type>application/x-texinfo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>texinfo</extension>
-        <mime-type>application/x-texinfo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tif</extension>
-        <mime-type>image/tiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tiff</extension>
-        <mime-type>image/tiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tr</extension>
-        <mime-type>application/x-troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tsv</extension>
-        <mime-type>text/tab-separated-values</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>txt</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ulw</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ustar</extension>
-        <mime-type>application/x-ustar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>vxml</extension>
-        <mime-type>application/voicexml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xbm</extension>
-        <mime-type>image/x-xbitmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xht</extension>
-        <mime-type>application/xhtml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xhtml</extension>
-        <mime-type>application/xhtml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xml</extension>
-        <mime-type>application/xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xpm</extension>
-        <mime-type>image/x-xpixmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xsl</extension>
-        <mime-type>application/xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xslt</extension>
-        <mime-type>application/xslt+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xul</extension>
-        <mime-type>application/vnd.mozilla.xul+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xwd</extension>
-        <mime-type>image/x-xwindowdump</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wav</extension>
-        <mime-type>audio/x-wav</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>svg</extension>
-        <mime-type>image/svg+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>svgz</extension>
-        <mime-type>image/svg+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>vsd</extension>
-        <mime-type>application/x-visio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- Wireless Bitmap -->
-        <extension>wbmp</extension>
-        <mime-type>image/vnd.wap.wbmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- WML Source -->
-        <extension>wml</extension>
-        <mime-type>text/vnd.wap.wml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- Compiled WML -->
-        <extension>wmlc</extension>
-        <mime-type>application/vnd.wap.wmlc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- WML Script Source -->
-        <extension>wmls</extension>
-        <mime-type>text/vnd.wap.wmlscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- Compiled WML Script -->
-        <extension>wmlscriptc</extension>
-        <mime-type>application/vnd.wap.wmlscriptc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wmv</extension>
-        <mime-type>video/x-ms-wmv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wrl</extension>
-        <mime-type>x-world/x-vrml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wspolicy</extension>
-        <mime-type>application/wspolicy+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>Z</extension>
-        <mime-type>application/x-compress</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>z</extension>
-        <mime-type>application/x-compress</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>zip</extension>
-        <mime-type>application/zip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xls</extension>
-        <mime-type>application/vnd.ms-excel</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>doc</extension>
-        <mime-type>application/vnd.ms-word</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ppt</extension>
-        <mime-type>application/vnd.ms-powerpoint</mime-type>
-    </mime-mapping>
-
-  <!-- ==================== Default Welcome File List ===================== -->
-  <!-- When a request URI refers to a directory, the default servlet looks  -->
-  <!-- for a "welcome file" within that directory and, if present,          -->
-  <!-- to the corresponding resource URI for display.  If no welcome file   -->
-  <!-- is present, the default servlet either serves a directory listing,   -->
-  <!-- or returns a 404 status, depending on how it is configured.          -->
-  <!--                                                                      -->
-  <!-- If you define welcome files in your own application's web.xml        -->
-  <!-- deployment descriptor, that list *replaces* the list configured      -->
-  <!-- here, so be sure that you include any of the default values that     -->
-  <!-- you wish to include.                                                 -->
-
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-        <welcome-file>index.htm</welcome-file>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml
deleted file mode 100644 (file)
index 59fd5fe..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.catalina</artifactId>
-       <name>Commons Server Default Catalina Service (Tomcat)</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Fragment-Host>org.apache.catalina</Fragment-Host>
-                                               <!-- Hack for HTTP session deserialization in OSGi -->
-                                               <Import-Package>
-                                                       *,
-                                                       org.apache.commons.logging.impl;resolution:=optional,
-                                                       org.argeo.security.core;resolution:=optional,
-                                                       org.argeo.security.jcr;resolution:=optional,
-                                                       org.springframework.beans.factory.support;resolution:=optional,
-                                                       org.springframework.context.annotation;resolution:=optional,
-                                                       org.springframework.orm.jpa.support;resolution:=optional,
-                                                       org.springframework.security;resolution:=optional,
-                                                       org.springframework.security.context;resolution:=optional,
-                                                       org.springframework.security.providers;resolution:=optional,
-                                                       org.springframework.security.providers.rememberme;resolution:=optional,
-                                                       org.springframework.security.ui;resolution:=optional,
-                                                       org.springframework.security.ui.savedrequest;resolution:=optional,
-                                                       org.springframework.security.userdetails;resolution:=optional,
-                                                       org.springframework.security.providers.preauth;resolution:=optional,
-                                                       org.springframework.web.context.request;resolution:=optional
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jdbc/.project b/server/modules/org.argeo.server.jdbc/.project
deleted file mode 100644 (file)
index 283257b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.jdbc</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/modules/org.argeo.server.jdbc/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.jdbc/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index e9fc089..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Jun 15 17:44:26 CEST 2010
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/server/modules/org.argeo.server.jdbc/build.properties b/server/modules/org.argeo.server.jdbc/build.properties
deleted file mode 100644 (file)
index 5f22cdd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/
diff --git a/server/modules/org.argeo.server.jdbc/pom.xml b/server/modules/org.argeo.server.jdbc/pom.xml
deleted file mode 100644 (file)
index a5e5bf1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.jdbc</artifactId>
-       <name>Commons Server Spring JDBC Drivers for OSGi</name>
-       <description>Makes commons JDBC drivers visible to Spring JDBC in an OSGi runtime</description>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Fragment-Host>org.springframework.jdbc</Fragment-Host>
-                                               <Import-Package>
-                                                       *,
-                                                       com.microsoft.sqlserver.jdbc;resolution:=optional,
-                                                       com.mysql.jdbc;resolution:=optional,
-                                                       net.sourceforge.jtds.jdbc;resolution:=optional,
-                                                       oracle.jdbc;resolution:=optional,
-                                                       org.apache.derby.jdbc;resolution:=optional,
-                                                       org.h2;resolution:=optional,
-                                                       org.hsqldb;resolution:=optional,
-                                                       org.postgresql;resolution:=optional
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/modules/pom.xml b/server/modules/pom.xml
deleted file mode 100644 (file)
index 18652f2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>server</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons Server Modules</name>
-       <modules>
-               <module>org.argeo.ext.jackrabbit.sybase</module>
-               <module>org.argeo.ext.jdbm</module>
-               <module>org.argeo.ext.bsf</module>
-               <module>org.argeo.jackrabbit.webapp</module>
-               <module>org.argeo.node.repo.jackrabbit</module>
-               <module>org.argeo.server.activemq.broker</module>
-               <module>org.argeo.server.ads.server</module>
-               <module>org.argeo.server.catalina</module>
-               <module>org.argeo.server.jdbc</module>
-               <module>org.argeo.server.rap.webapp</module>
-<!--           <module>org.argeo.server.tomcat</module> -->
-       </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>**</include>
-                               </includes>
-                               <excludes>
-                                       <exclude>.*</exclude>
-                                       <exclude>.*/**</exclude>
-                                       <exclude>pom.xml</exclude>
-                                       <exclude>build.properties</exclude>
-                               </excludes>
-                       </resource>
-               </resources>
-       </build>
-</project>
\ No newline at end of file
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
deleted file mode 100644 (file)
index bc96b87..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>server</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <name>Commons Server Eclipse Plugins</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.jcr.ui.explorer</module>
-       </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                               <configuration>
-                                       <!-- Prevents source jars to contain misleading data -->
-                                       <excludes>
-                                               <exclude>plugin.xml</exclude>
-                                               <exclude>META-INF/MANIFEST.MF</exclude>
-                                       </excludes>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
diff --git a/server/pom.xml b/server/pom.xml
deleted file mode 100644 (file)
index d4e76c8..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>server</artifactId>
-       <name>Commons Server</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>modules</module>
-               <module>runtime</module>
-               <module>plugins</module>
-               <module>dep</module>
-       </modules>
-</project>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.catalina.start/.classpath b/server/runtime/org.argeo.server.catalina.start/.classpath
deleted file mode 100644 (file)
index b56882d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
diff --git a/server/runtime/org.argeo.server.catalina.start/.project b/server/runtime/org.argeo.server.catalina.start/.project
deleted file mode 100644 (file)
index 25f3507..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.catalina.start</name>
-       <comment></comment>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
-
diff --git a/server/runtime/org.argeo.server.catalina.start/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.catalina.start/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 6d0bce7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Apr 23 08:40:00 CEST 2010
-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/runtime/org.argeo.server.catalina.start/build.properties b/server/runtime/org.argeo.server.catalina.start/build.properties
deleted file mode 100644 (file)
index 2c65f86..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/main/java/,\
-           src/main/resources/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
diff --git a/server/runtime/org.argeo.server.catalina.start/pom.xml b/server/runtime/org.argeo.server.catalina.start/pom.xml
deleted file mode 100644 (file)
index ce9d405..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.catalina.start</artifactId>
-       <name>Commons Catalina starter</name>
-       <description>Catalina starter hacked from Spring DM sandbox</description>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-Activator>org.argeo.catalina.start.CatalinaActivator</Bundle-Activator>
-                                               <Import-Package>
-                                                       javax.management;version="0.0.0",
-                                                       *
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.commons.io</artifactId>
-               </dependency>
-       </dependencies>
-</project>
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java
deleted file mode 100644 (file)
index b990c99..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.argeo.catalina.start;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
-import org.springframework.osgi.web.tomcat.internal.Activator;
-
-/** Starts Catalina (hacked from Spring OSGi 1.0) */
-public class CatalinaActivator extends Activator {
-       private final static Log log = LogFactory.getLog(CatalinaActivator.class);
-
-       private final static String ARGEO_OSGI_DATA_DIR = "argeo.osgi.data.dir";
-       /** System properties used to override Tomcat XML config URL */
-       public final static String ARGEO_SERVER_TOMCAT_CONFIG = "argeo.server.tomcat.config";
-
-       public void start(BundleContext context) throws Exception {
-               if (!System.getProperties().containsKey(ARGEO_OSGI_DATA_DIR)) {
-                       String osgiInstanceArea = System.getProperty("osgi.instance.area");
-                       String osgiInstanceAreaDefault = System
-                                       .getProperty("osgi.instance.area.default");
-                       String tempDir = System.getProperty("java.io.tmpdir");
-
-                       File dataDir = null;
-                       if (osgiInstanceArea != null) {
-                               // within OSGi with -data specified
-                               osgiInstanceArea = removeFilePrefix(osgiInstanceArea);
-                               dataDir = new File(osgiInstanceArea);
-                       } else if (osgiInstanceAreaDefault != null) {
-                               // within OSGi without -data specified
-                               osgiInstanceAreaDefault = removeFilePrefix(osgiInstanceAreaDefault);
-                               dataDir = new File(osgiInstanceAreaDefault);
-                       } else {// outside OSGi
-                               dataDir = new File(tempDir + File.separator + "osgiData");
-                       }
-
-                       System.setProperty(ARGEO_OSGI_DATA_DIR, dataDir.getAbsolutePath());
-               }
-
-               // Load config properties and put them in system properties so that they
-               // can be used in tomcat conf
-               Properties confProps = new Properties();
-               URL propsUrl = context.getBundle().getResource("tomcat.properties");
-               if (propsUrl != null) {
-                       InputStream in = null;
-                       try {
-                               in = propsUrl.openStream();
-                               confProps.load(in);
-                       } catch (Exception e) {
-                               throw new RuntimeException("Cannot read catalina properties.",
-                                               e);
-                       } finally {
-                               IOUtils.closeQuietly(in);
-                       }
-
-                       for (Object key : confProps.keySet()) {
-                               // System properties have priority
-                               if (!System.getProperties().containsKey(key)) {
-                                       System.setProperty(key.toString(),
-                                                       confProps.getProperty(key.toString()));
-                               }
-                       }
-               }
-
-               // calling Catalina.setCatalinaHome(String) or
-               // Catalina.setCatalinaBase(String) does the same
-               if (System.getProperty("catalina.home") == null)
-                       System.setProperty("catalina.home",
-                                       System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
-               if (System.getProperty("catalina.base") == null)
-                       System.setProperty("catalina.base",
-                                       System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
-
-               // Make sure directories are created
-               File catalinaDir = new File(System.getProperty("catalina.home"));
-               if (!catalinaDir.exists()) {
-                       catalinaDir.mkdirs();
-                       if (log.isDebugEnabled())
-                               log.debug("Created Tomcat directory " + catalinaDir);
-               }
-
-               // Call Spring starter
-               super.start(context);
-       }
-
-       @Override
-       public void stop(BundleContext context) throws Exception {
-               super.stop(context);
-       }
-
-       protected String removeFilePrefix(String url) {
-               if (url.startsWith("file:"))
-                       return url.substring("file:".length());
-               else if (url.startsWith("reference:file:"))
-                       return url.substring("reference:file:".length());
-               else
-                       return url;
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
deleted file mode 100644 (file)
index 17ed5e9..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-/*\r
- * Copyright 2006-2008 the original author or authors.\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.springframework.osgi.web.tomcat.internal;\r
-\r
-import java.io.File;\r
-import java.io.FileOutputStream;\r
-import java.io.IOException;\r
-import java.io.InputStream;\r
-import java.net.MalformedURLException;\r
-import java.net.URL;\r
-import java.net.URLConnection;\r
-import java.net.URLStreamHandler;\r
-import java.util.Properties;\r
-\r
-import javax.management.MBeanRegistration;\r
-\r
-import org.apache.catalina.Lifecycle;\r
-import org.apache.catalina.Server;\r
-import org.apache.catalina.Service;\r
-import org.apache.catalina.connector.Connector;\r
-import org.apache.catalina.core.StandardService;\r
-import org.apache.catalina.util.ServerInfo;\r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-import org.apache.naming.resources.DirContextURLStreamHandler;\r
-import org.argeo.catalina.start.CatalinaActivator;\r
-import org.osgi.framework.Bundle;\r
-import org.osgi.framework.BundleActivator;\r
-import org.osgi.framework.BundleContext;\r
-import org.osgi.framework.Constants;\r
-import org.osgi.framework.ServiceRegistration;\r
-import org.osgi.service.url.AbstractURLStreamHandlerService;\r
-import org.osgi.service.url.URLConstants;\r
-import org.osgi.service.url.URLStreamHandlerService;\r
-\r
-/**\r
- * Simple activator for starting Apache Tomcat Catalina container inside OSGi\r
- * using Tomcat's XML configuration files.\r
- * \r
- * <p/>\r
- * This activator looks initially for a <code>conf/server.xml</code> file\r
- * falling back to <code>conf/default-server.xml</code>. This allows the default\r
- * configuration to be tweaked through fragments for example.\r
- * \r
- * @author Costin Leau\r
- */\r
-public class Activator implements BundleActivator {\r
-\r
-       /** logger */\r
-       private static final Log log = LogFactory.getLog(Activator.class);\r
-\r
-       /** default XML configuration */\r
-       private static final String DEFAULT_XML_CONF_LOCATION = "conf/default-server.xml";\r
-\r
-       /** user-configurable XML configuration */\r
-       private static final String XML_CONF_LOCATION = "conf/server.xml";\r
-\r
-       private BundleContext bundleContext;\r
-\r
-       private StandardService server;\r
-\r
-       private ServiceRegistration registration, urlRegistration;\r
-\r
-       private Thread startupThread;\r
-\r
-       public void start(BundleContext context) throws Exception {\r
-               this.bundleContext = context;\r
-               // do the initialization on a different thread\r
-               // so the activator finishes fast\r
-               startupThread = new Thread(new Runnable() {\r
-\r
-                       public void run() {\r
-                               log.info("Starting " + ServerInfo.getServerInfo() + " ...");\r
-\r
-                               // default startup procedure\r
-                               ClassLoader cl = Activator.class.getClassLoader();\r
-                               Thread current = Thread.currentThread();\r
-                               ClassLoader old = current.getContextClassLoader();\r
-\r
-                               try {\r
-                                       current.setContextClassLoader(cl);\r
-\r
-                                       server = createCatalinaServer(bundleContext.getBundle());\r
-\r
-                                       server.start();\r
-\r
-                                       Connector[] connectors = server.findConnectors();\r
-                                       for (int i = 0; i < connectors.length; i++) {\r
-                                               Connector conn = connectors[i];\r
-                                               log.info("Succesfully started "\r
-                                                               + ServerInfo.getServerInfo() + " @ "\r
-                                                               + conn.getDomain() + ":" + conn.getPort());\r
-                                       }\r
-\r
-                                       // register URL service\r
-                                       urlRegistration = registerTomcatJNDIUrlService();\r
-                                       // publish server as an OSGi service\r
-                                       registration = publishServerAsAService(server);\r
-                                       log.info("Published " + ServerInfo.getServerInfo()\r
-                                                       + " as an OSGi service");\r
-                               } catch (Exception ex) {\r
-                                       String msg = "Cannot start " + ServerInfo.getServerInfo();\r
-                                       log.error(msg, ex);\r
-                                       throw new RuntimeException(msg, ex);\r
-                               } finally {\r
-                                       current.setContextClassLoader(old);\r
-                               }\r
-                       }\r
-               }, "Tomcat Catalina Start Thread");\r
-\r
-               startupThread.start();\r
-       }\r
-\r
-       public void stop(BundleContext context) throws Exception {\r
-               // unpublish service first\r
-               registration.unregister();\r
-               urlRegistration.unregister();\r
-\r
-               log.info("Unpublished  " + ServerInfo.getServerInfo() + " OSGi service");\r
-\r
-               // default startup procedure\r
-               ClassLoader cl = Activator.class.getClassLoader();\r
-               Thread current = Thread.currentThread();\r
-               ClassLoader old = current.getContextClassLoader();\r
-\r
-               try {\r
-                       current.setContextClassLoader(cl);\r
-                       // reset CCL\r
-                       // current.setContextClassLoader(null);\r
-                       log.info("Stopping " + ServerInfo.getServerInfo() + " ...");\r
-                       server.stop();\r
-                       log.info("Succesfully stopped " + ServerInfo.getServerInfo());\r
-               } catch (Exception ex) {\r
-                       log.error("Cannot stop " + ServerInfo.getServerInfo(), ex);\r
-                       throw ex;\r
-               } finally {\r
-                       current.setContextClassLoader(old);\r
-               }\r
-       }\r
-\r
-       private StandardService createCatalinaServer(Bundle bundle)\r
-                       throws Exception {\r
-               URL xmlConfiguration = null;\r
-\r
-               if (System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG) != null) {\r
-                       String customConfig = System\r
-                                       .getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG);\r
-                       try {\r
-                               xmlConfiguration = new URL(customConfig);\r
-                       } catch (MalformedURLException e) {\r
-                               // within this bundle\r
-                               // typically 'default-server-ssl.xml'\r
-                               xmlConfiguration = bundle.getResource(customConfig);\r
-                       }\r
-               } else {\r
-                       // fragment\r
-                       xmlConfiguration = bundle.getResource(XML_CONF_LOCATION);\r
-               }\r
-\r
-               if (xmlConfiguration != null) {\r
-                       log.info("Using custom XML configuration " + xmlConfiguration);\r
-               } else {\r
-                       xmlConfiguration = bundle.getResource(DEFAULT_XML_CONF_LOCATION);\r
-                       if (xmlConfiguration == null)\r
-                               log.error("No XML configuration found; bailing out...");\r
-                       else\r
-                               log.info("Using default XML configuration " + xmlConfiguration);\r
-               }\r
-\r
-               return createServerFromXML(xmlConfiguration);\r
-       }\r
-\r
-       private StandardService createServerFromXML(URL xmlConfiguration)\r
-                       throws IOException {\r
-               OsgiCatalina catalina = new OsgiCatalina();\r
-               catalina.setAwait(false);\r
-               catalina.setUseShutdownHook(false);\r
-               catalina.setName("Catalina");\r
-               catalina.setParentClassLoader(Thread.currentThread()\r
-                               .getContextClassLoader());\r
-\r
-               // copy the URL file to a local temporary file (since Catalina doesn't\r
-               // use URL unfortunately)\r
-               File configTempFile = File.createTempFile("dm.catalina", ".cfg.xml");\r
-               configTempFile.deleteOnExit();\r
-\r
-               // copy URL to temporary file\r
-               copyURLToFile(xmlConfiguration.openStream(), new FileOutputStream(\r
-                               configTempFile));\r
-               log.debug("Copied configuration " + xmlConfiguration\r
-                               + " to temporary file " + configTempFile);\r
-\r
-               catalina.setConfigFile(configTempFile.getAbsolutePath());\r
-\r
-               catalina.load();\r
-\r
-               Server server = catalina.getServer();\r
-\r
-               return (StandardService) server.findServices()[0];\r
-       }\r
-\r
-       private void copyURLToFile(InputStream inStream, FileOutputStream outStream) {\r
-\r
-               int bytesRead;\r
-               byte[] buf = new byte[4096];\r
-               try {\r
-                       while ((bytesRead = inStream.read(buf)) >= 0) {\r
-                               outStream.write(buf, 0, bytesRead);\r
-                       }\r
-               } catch (IOException ex) {\r
-                       throw (RuntimeException) new IllegalStateException(\r
-                                       "Cannot copy URL to file").initCause(ex);\r
-               } finally {\r
-                       try {\r
-                               inStream.close();\r
-                       } catch (IOException ignore) {\r
-                       }\r
-                       try {\r
-                               outStream.close();\r
-                       } catch (IOException ignore) {\r
-                       }\r
-               }\r
-       }\r
-\r
-       private ServiceRegistration publishServerAsAService(StandardService server) {\r
-               Properties props = new Properties();\r
-               // put some extra properties to easily identify the service\r
-               props.put(Constants.SERVICE_VENDOR, "Spring Dynamic Modules");\r
-               props.put(Constants.SERVICE_DESCRIPTION, ServerInfo.getServerInfo());\r
-               props.put(Constants.BUNDLE_VERSION, ServerInfo.getServerNumber());\r
-               props.put(Constants.BUNDLE_NAME, bundleContext.getBundle()\r
-                               .getSymbolicName());\r
-\r
-               // spring-dm specific property\r
-               props.put("org.springframework.osgi.bean.name", "tomcat-server");\r
-\r
-               // publish just the interfaces and the major classes\r
-               // (server/handlerWrapper)\r
-               String[] classes = new String[] { StandardService.class.getName(),\r
-                               Service.class.getName(), MBeanRegistration.class.getName(),\r
-                               Lifecycle.class.getName() };\r
-\r
-               return bundleContext.registerService(classes, server, props);\r
-       }\r
-\r
-       private ServiceRegistration registerTomcatJNDIUrlService() {\r
-               Properties properties = new Properties();\r
-               properties.put(URLConstants.URL_HANDLER_PROTOCOL, "jndi");\r
-               final URLStreamHandler handler = new DirContextURLStreamHandler();\r
-\r
-               return bundleContext.registerService(\r
-                               URLStreamHandlerService.class.getName(),\r
-                               new AbstractURLStreamHandlerService() {\r
-\r
-                                       private final static String EMPTY_STRING = "";\r
-\r
-                                       public URLConnection openConnection(URL u)\r
-                                                       throws IOException {\r
-                                               return new URL(u, EMPTY_STRING, handler)\r
-                                                               .openConnection();\r
-                                       }\r
-                               }, properties);\r
-       }\r
-}
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/OsgiCatalina.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/OsgiCatalina.java
deleted file mode 100644 (file)
index f7903ff..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\r
- * Copyright 2006-2008 the original author or authors.\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.springframework.osgi.web.tomcat.internal;\r
-\r
-import org.apache.catalina.Server;\r
-import org.apache.catalina.startup.Catalina;\r
-\r
-/**\r
- * OSGi extension of Catalina class used for easy access to the underlying\r
- * configuration.\r
- * \r
- * @author Costin Leau\r
- * \r
- */\r
-public class OsgiCatalina extends Catalina {\r
-\r
-       public Server getServer() {\r
-               return server;\r
-       }\r
-}\r
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server-ssl.xml b/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server-ssl.xml
deleted file mode 100644 (file)
index 0417b7c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Server port="-1" shutdown="SHUTDOWN">
-       <!--APR library loader. Documentation at /docs/apr.html -->
-       <!-- <Listener className="org.apache.catalina.core.AprLifecycleListener" 
-               SSLEngine="on" /> -->
-       <!-- Initialize Jasper prior to webapps are loaded. -->
-       <Listener className="org.apache.catalina.core.JasperListener" />
-       <!-- JMX -->
-       <!-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" 
-               /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" 
-               /> -->
-
-       <Service name="Catalina">
-               <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-                       maxThreads="150" minSpareThreads="4" />
-
-               <!-- HTTP -->
-               <Connector executor="tomcatThreadPool" port="${argeo.server.port.http}"
-                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}"
-                       secure="${argeo.server.http.secure}" proxyName="${argeo.server.http.proxyName}"
-                       proxyPort="${argeo.server.http.proxyPort}" />
-               <!-- HTTPS -->
-               <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
-                       SSLEnabled="true" scheme="https" secure="true" sslProtocol="TLS"
-                       keystoreFile="${argeo.server.keystoreFile}" keystoreType="JKS"
-                       keystorePass="${argeo.server.keystorePass}" truststoreFile="${argeo.server.truststoreFile}"
-                       truststoreType="JKS" truststorePass="${argeo.server.truststorePass}"
-                       clientAuth="${argeo.server.https.clientAuth}" />
-                        
-               <!-- AJP (for proxying with httpd) -->
-               <Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
-                       redirectPort="${argeo.server.port.https}" />
-
-               <Engine name="Catalina" defaultHost="localhost">
-                       <Host name="localhost" appBase="webapps" unpackWARs="true"
-                               autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"
-                               workDir="work">
-                       </Host>
-               </Engine>
-       </Service>
-</Server>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml b/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml
deleted file mode 100644 (file)
index a558e13..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Server port="-1" shutdown="SHUTDOWN">
-       <!--APR library loader. Documentation at /docs/apr.html -->
-       <!-- <Listener className="org.apache.catalina.core.AprLifecycleListener" 
-               SSLEngine="on" /> -->
-       <!-- Initialize Jasper prior to webapps are loaded. -->
-       <Listener className="org.apache.catalina.core.JasperListener" />
-       <!-- JMX -->
-       <!-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" 
-               /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" 
-               /> -->
-
-       <Service name="Catalina">
-               <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-                       maxThreads="150" minSpareThreads="4" />
-
-               <!-- HTTP -->
-               <Connector executor="tomcatThreadPool" port="${argeo.server.port.http}"
-                       protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}"
-                       secure="${argeo.server.http.secure}" proxyName="${argeo.server.http.proxyName}"
-                       proxyPort="${argeo.server.http.proxyPort}" />
-               <!-- HTTPS
-               <Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
-                       SSLEnabled="true" scheme="https" secure="true" sslProtocol="TLS"
-                       keystoreFile="${argeo.server.keystoreFile}" keystoreType="JKS"
-                       keystorePass="${argeo.server.keystorePass}" truststoreFile="${argeo.server.truststoreFile}"
-                       truststoreType="JKS" truststorePass="${argeo.server.truststorePass}"
-                       clientAuth="${argeo.server.https.clientAuth}" />
-                        -->
-               <!-- AJP (for proxying with httpd) -->
-               <Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
-                       redirectPort="${argeo.server.port.https}" />
-
-               <Engine name="Catalina" defaultHost="localhost">
-                       <Host name="localhost" appBase="webapps" unpackWARs="true"
-                               autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"
-                               workDir="work">
-                       </Host>
-               </Engine>
-       </Service>
-</Server>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.catalina.start/tomcat.properties b/server/runtime/org.argeo.server.catalina.start/tomcat.properties
deleted file mode 100644 (file)
index 5e6a5f1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-argeo.server.port.http=7070
-argeo.server.port.https=7073
-argeo.server.port.ajp=7079
-
-# Used only when SSL is activated (uncommented in server.xml)
-argeo.server.keystoreFile=../../../../ssl/server.ks
-argeo.server.keystorePass=changeit
-argeo.server.truststoreFile=../../../../ssl/server.ts
-argeo.server.truststorePass=changeit
-argeo.server.https.clientAuth=want
-
-argeo.server.http.proxyName=
-argeo.server.http.proxyPort=
-argeo.server.http.secure=false
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.hibernate/.classpath b/server/runtime/org.argeo.server.hibernate/.classpath
deleted file mode 100644 (file)
index ff41fbb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/server/runtime/org.argeo.server.hibernate/.project b/server/runtime/org.argeo.server.hibernate/.project
deleted file mode 100644 (file)
index 8252672..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.hibernate</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/runtime/org.argeo.server.hibernate/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 405317e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Oct 13 14:51:57 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/server/runtime/org.argeo.server.hibernate/.settings/org.maven.ide.eclipse.prefs b/server/runtime/org.argeo.server.hibernate/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644 (file)
index c523f7b..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Oct 13 14:51:50 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/server/runtime/org.argeo.server.hibernate/build.properties b/server/runtime/org.argeo.server.hibernate/build.properties
deleted file mode 100644 (file)
index 68ef43c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-additional.bundles = org.springframework.core
-source.. = src/main/java/
diff --git a/server/runtime/org.argeo.server.hibernate/pom.xml b/server/runtime/org.argeo.server.hibernate/pom.xml
deleted file mode 100644 (file)
index adbd427..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.hibernate</artifactId>
-       <name>Commons Server Hibernate</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.argeo.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.core</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Hibernate -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.dep.hibernate</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>net.sf.ehcache</artifactId>
-               </dependency>
-
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.orm</artifactId>
-               </dependency>
-               <dependency>
-                       <!-- For EhCache support -->
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.context.support</artifactId>
-               </dependency>
-
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/HibernateLightDaoSync.java b/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/HibernateLightDaoSync.java
deleted file mode 100644 (file)
index 365565f..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.hibernate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.server.dao.LightDaoSupport;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-public class HibernateLightDaoSync {
-       private final static Log log = LogFactory
-                       .getLog(HibernateLightDaoSync.class);
-
-       private String externalSuffix = LightDaoInterceptor.DEFAULT_EXTERNAL_SUFFIX;
-
-       private SessionFactory sessionFactory;
-
-       private LightDaoSupport lightDaoSupport;
-
-       private List<Class<?>> classes = new ArrayList<Class<?>>();
-
-       public void sync() {
-               List<Class<?>> lst;
-               if (classes.size() > 0)
-                       lst = classes;
-               else
-                       lst = lightDaoSupport.getSupportedClasses();
-
-               Session session = sessionFactory.getCurrentSession();
-               session.beginTransaction();
-               try {
-                       for (Class<?> clss : lst) {
-                               String entityName = clss.getSimpleName() + externalSuffix;
-                               int count = 0;
-                               for (Object obj : lightDaoSupport.list(clss, null)) {
-                                       session.save(entityName, obj);
-                                       count++;
-                               }
-                               if (log.isDebugEnabled())
-                                       log.debug("Synchronized " + count + "\tentities '"
-                                                       + entityName + "'");
-                       }
-                       session.getTransaction().commit();
-               } catch (Exception e) {
-                       session.getTransaction().rollback();
-               }
-       }
-
-       public void setClasses(List<Class<?>> classes) {
-               this.classes = classes;
-       }
-
-       public void setExternalSuffix(String externalSuffix) {
-               this.externalSuffix = externalSuffix;
-       }
-
-       public void setSessionFactory(SessionFactory sessionFactory) {
-               this.sessionFactory = sessionFactory;
-       }
-
-       public void setLightDaoSupport(LightDaoSupport lightDaoSupport) {
-               this.lightDaoSupport = lightDaoSupport;
-       }
-}
diff --git a/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java b/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
deleted file mode 100644 (file)
index 868ae39..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.hibernate;
-
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.server.dao.LightDaoSupport;
-import org.hibernate.EmptyInterceptor;
-import org.hibernate.type.Type;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-
-public class LightDaoInterceptor extends EmptyInterceptor {
-       private final static Log log = LogFactory.getLog(LightDaoInterceptor.class);
-
-       private static final long serialVersionUID = 1L;
-
-       public final static String DEFAULT_EXTERNAL_SUFFIX = "_external";
-
-       private String externalSuffix = DEFAULT_EXTERNAL_SUFFIX;
-
-       private LightDaoSupport lightDaoSupport;
-
-       private List<Class<?>> classes = new ArrayList<Class<?>>();
-
-       private Map<Class<?>, String> businessIdFields = new HashMap<Class<?>, String>();
-
-       /** internal */
-       private final Map<Class<?>, Map<Serializable, Object>> bidMappings = new HashMap<Class<?>, Map<Serializable, Object>>();
-
-       @Override
-       public Object getEntity(String entityName, Serializable id) {
-               Class<?> clss = findSupportingClass(entityName);
-               Object res = null;
-               if (clss != null) {
-                       if (businessIdFields.containsKey(clss)) {
-                               String field = businessIdFields.get(clss);
-                               Object value = bidMappings.get(clss).get(id);
-                               res = lightDaoSupport.getByField(clss, field, value);
-                               if (log.isTraceEnabled())
-                                       log.debug("Got entity " + clss + " (" + field + "=" + value
-                                                       + ")");
-                       } else {
-                               res = lightDaoSupport.getByKey(clss, id);
-                               if (log.isTraceEnabled())
-                                       log.debug("Got entity " + clss + " (id=" + id + ")");
-                       }
-               } else {
-                       res = super.getEntity(entityName, id);
-               }
-               return res;
-       }
-
-       @Override
-       public String getEntityName(Object object) {
-               if (supports(object)) {
-                       return toExternalName(object.getClass());
-               } else {
-                       return super.getEntityName(object);
-               }
-       }
-
-       @Override
-       public boolean onSave(Object entity, Serializable id, Object[] state,
-                       String[] propertyNames, Type[] types) {
-               if (supports(entity)) {
-                       Class<?> clss = entity.getClass();
-                       if (businessIdFields.containsKey(clss)) {
-                               if (!bidMappings.containsKey(clss))
-                                       bidMappings.put(clss, new HashMap<Serializable, Object>());
-                               BeanWrapper bw = new BeanWrapperImpl(entity);
-                               Object bid = bw.getPropertyValue(businessIdFields.get(clss));
-                               bidMappings.get(clss).put(id, bid);
-                               if (log.isTraceEnabled())
-                                       log.debug("Mapped tid " + id + " with bid " + bid + " for "
-                                                       + clss);
-                       }
-               }
-               return super.onSave(entity, id, state, propertyNames, types);
-       }
-
-       @Override
-       public boolean onLoad(Object entity, Serializable id, Object[] state,
-                       String[] propertyNames, Type[] types) {
-               Class<?> clss = entity.getClass();
-               Object source = null;
-               if (lightDaoSupport.getSupportedClasses().contains(clss)) {
-                       if (businessIdFields.containsKey(clss)) {
-                               String field = businessIdFields.get(clss);
-                               Object value = bidMappings.get(clss).get(id);
-                               source = lightDaoSupport.getByField(clss, field, value);
-                               if (log.isTraceEnabled())
-                                       log.debug("Loading entity " + clss + " (" + field + "="
-                                                       + value + ")");
-                       } else {
-                               source = lightDaoSupport.getByKey(clss, id);
-                               if (log.isTraceEnabled())
-                                       log.debug("Loading entity " + clss + " (id=" + id + ")");
-                       }
-               }
-
-               if (source != null) {
-                       BeanWrapper bwTarget = new BeanWrapperImpl(entity);
-                       BeanWrapper bwSource = new BeanWrapperImpl(source);
-                       for (PropertyDescriptor pd : bwTarget.getPropertyDescriptors()) {
-                               String propName = pd.getName();
-                               if (bwSource.isReadableProperty(propName)
-                                               && bwTarget.isWritableProperty(propName)) {
-                                       bwTarget.setPropertyValue(propName, bwSource
-                                                       .getPropertyValue(propName));
-                                       if (log.isTraceEnabled())
-                                               log.debug("Loaded property " + propName + " for class "
-                                                               + clss + " (id=" + id + ")");
-                               }
-                       }
-
-                       return true;
-               } else {
-                       // res = super.getEntity(entityName, id);
-                       return super.onLoad(entity, id, state, propertyNames, types);
-               }
-       }
-
-       protected Boolean supports(Object object) {
-               if (classes.contains(object.getClass()))
-                       return lightDaoSupport.getSupportedClasses().contains(
-                                       object.getClass());
-               else
-                       return false;
-       }
-
-       /** @return null if not found */
-       protected Class<?> findSupportingClass(String entityName) {
-               for (Class<?> clss : lightDaoSupport.getSupportedClasses()) {
-                       if (toExternalName(clss).equals(entityName)) {
-                               if (classes.contains(clss))
-                                       return clss;
-                       }
-               }
-               return null;
-       }
-
-       protected final String toExternalName(Class<?> clss) {
-               return clss.getSimpleName() + externalSuffix;
-       }
-
-       public void setExternalSuffix(String externalSuffix) {
-               this.externalSuffix = externalSuffix;
-       }
-
-       public void setLightDaoSupport(LightDaoSupport lightDaoSupport) {
-               this.lightDaoSupport = lightDaoSupport;
-       }
-
-       public void setClasses(List<Class<?>> classes) {
-               this.classes = classes;
-       }
-
-       public void setBusinessIdFields(Map<Class<?>, String> businessIdFields) {
-               this.businessIdFields = businessIdFields;
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.json/.classpath b/server/runtime/org.argeo.server.json/.classpath
deleted file mode 100644 (file)
index 607f058..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/server/runtime/org.argeo.server.json/.project b/server/runtime/org.argeo.server.json/.project
deleted file mode 100644 (file)
index e32fd4a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.json</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/runtime/org.argeo.server.json/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.json/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index d5df3e8..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#Sun Feb 21 11:16:01 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/server/runtime/org.argeo.server.json/.settings/org.maven.ide.eclipse.prefs b/server/runtime/org.argeo.server.json/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644 (file)
index cb4dc85..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#Wed Sep 16 09:47:45 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/server/runtime/org.argeo.server.json/build.properties b/server/runtime/org.argeo.server.json/build.properties
deleted file mode 100644 (file)
index 65cb73b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-source.. = src/main/java/,\
-           src/test/java/
diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml
deleted file mode 100644 (file)
index abd4461..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.json</artifactId>
-       <name>Commons Server JSON</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.argeo.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Argeo Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.core</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- JSON  -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.codehaus.jackson.mapper</artifactId>
-               </dependency>
-
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.web.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.osgi.core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-
-               <!-- J2EE -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet</artifactId>
-               </dependency>
-
-               <!-- Logging -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-
-               <!-- TEST -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
deleted file mode 100644 (file)
index 6f039c4..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.json;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.ObjectCodec;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
-import org.codehaus.jackson.map.ObjectMapper;
-
-public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
-       private final static Log log = LogFactory
-                       .getLog(GenericJsonDeserializer.class);
-
-       private JsonFactory jsonFactory = new JsonFactory();
-       private ObjectCodec objectCodec = new ObjectMapper();
-       private JsonObjectFactory defaultObjectFactory = new JsonObjectFactoryImpl();
-
-       private String typeField = "type";
-
-       private List<JsonObjectFactory> objectFactories = new ArrayList<JsonObjectFactory>();
-
-       @SuppressWarnings("unchecked")
-       @Override
-       public T deserialize(JsonParser parser, DeserializationContext ctxt)
-                       throws IOException, JsonProcessingException {
-               // first read as Json DOM in order to extract the type
-               // TODO: optimize with streaming API
-               JsonNode root = parser.readValueAsTree();
-               String type = root.get(typeField).getTextValue();
-
-               // Write it back as a string
-               StringWriter writer = new StringWriter();
-               JsonGenerator generator = jsonFactory.createJsonGenerator(writer);
-               generator.setCodec(objectCodec);
-               generator.writeTree(root);
-               String str = writer.toString();
-
-               if (log.isTraceEnabled())
-                       log.debug("Deserialize object of type=" + type + ", str=" + str);
-
-               JsonObjectFactory objectFactory = null;
-               jofs: for (JsonObjectFactory jof : objectFactories) {
-                       if (jof.supports(type)) {
-                               objectFactory = jof;
-                               break jofs;
-                       }
-               }
-
-               if (objectFactory == null)
-                       objectFactory = defaultObjectFactory;
-
-               if (objectFactory == null || !objectFactory.supports(type))
-                       throw new ArgeoException(
-                                       "Cannot find JSON object factory for type " + type);
-
-               return (T) objectFactory.readValue(type, str);
-       }
-
-       public void setTypeField(String typeField) {
-               this.typeField = typeField;
-       }
-
-       public void setObjectFactories(List<JsonObjectFactory> objectFactories) {
-               this.objectFactories = objectFactories;
-       }
-
-       public List<JsonObjectFactory> getObjectFactories() {
-               return objectFactories;
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactory.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactory.java
deleted file mode 100644 (file)
index 0fa67c6..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.json;
-
-
-public interface JsonObjectFactory {
-       public Boolean supports(String type);
-
-       public <T> T readValue(String type, String str);
-}
diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
deleted file mode 100644 (file)
index 4ed46c5..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.json;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.osgi.framework.BundleContext;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.osgi.util.BundleDelegatingClassLoader;
-
-public class JsonObjectFactoryImpl implements JsonObjectFactory,
-               BundleContextAware, InitializingBean {
-       private final static Log log = LogFactory
-                       .getLog(JsonObjectFactoryImpl.class);
-
-       private BundleContext bundleContext;
-       private ClassLoader classLoader = getClass().getClassLoader();
-
-       private ObjectMapper objectMapper = new ObjectMapper();
-       private Map<String, Class<?>> supportedTypes = new HashMap<String, Class<?>>();
-
-       public Boolean supports(String type) {
-               if (supportedTypes.containsKey(type))
-                       return true;
-
-               return loadClass(type) != null ? true : false;
-       }
-
-       @SuppressWarnings("unchecked")
-       public <T> T readValue(String type, String str) {
-               final Class<?> clss;
-               if (supportedTypes.containsKey(type))
-                       clss = supportedTypes.get(type);
-               else {
-                       clss = loadClass(type);
-                       if (clss == null)
-                               throw new ArgeoException("Cannot find type " + type);
-               }
-
-               try {
-                       return (T) objectMapper.readValue(str, clss);
-               } catch (Exception e) {
-                       throw new ArgeoException("Cannot deserialize " + str
-                                       + " (type=" + type + ")", e);
-               }
-       }
-
-       public void setSupportedTypes(Map<String, Class<?>> supportedTypes) {
-               this.supportedTypes = supportedTypes;
-       }
-
-       protected Class<?> loadClass(String type) {
-               try {
-                       return classLoader.loadClass(type);
-               } catch (ClassNotFoundException e) {
-                       if (log.isDebugEnabled())
-                               log.debug("BundleDelegatingClassLoader.loadClass failed: " + e);
-               }
-
-               return null;
-       }
-
-       public void setBundleContext(BundleContext bundleContext) {
-               this.bundleContext = bundleContext;
-       }
-
-       public void afterPropertiesSet() throws Exception {
-               classLoader = BundleDelegatingClassLoader
-                               .createBundleClassLoaderFor(bundleContext.getBundle());
-       }
-}
diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
deleted file mode 100644 (file)
index a7c860c..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.json;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
-import org.argeo.server.Deserializer;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.DeserializationProblemHandler;
-import org.codehaus.jackson.map.JsonDeserializer;
-import org.codehaus.jackson.map.deser.CustomDeserializerFactory;
-import org.codehaus.jackson.map.deser.StdDeserializerProvider;
-import org.springframework.beans.factory.InitializingBean;
-
-public class JsonServerMapper extends JsonServerSerializer implements
-               Deserializer, InitializingBean {
-       private final static Log log = LogFactory.getLog(JsonServerMapper.class);
-
-       private Class<?> targetClass;
-
-       private Map<Class<?>, JsonDeserializer<?>> deserializers = new HashMap<Class<?>, JsonDeserializer<?>>();
-
-       @SuppressWarnings("unchecked")
-       public void afterPropertiesSet() throws Exception {
-               CustomDeserializerFactory dsf = new CustomDeserializerFactory();
-               for (Class clss : deserializers.keySet()) {
-                       dsf.addSpecificMapping(clss, deserializers.get(clss));
-                       if (log.isDebugEnabled())
-                               log.debug("Add JSON mapping for " + clss);
-               }
-               StdDeserializerProvider sdp = new StdDeserializerProvider(dsf);
-               getObjectMapper().setDeserializerProvider(sdp);
-               // ignore unkown properties
-               getObjectMapper().getDeserializationConfig().addHandler(
-                               new DeserializationProblemHandler() {
-                                       public boolean handleUnknownProperty(
-                                                       DeserializationContext ctxt,
-                                                       JsonDeserializer<?> deserializer, Object bean,
-                                                       String propertyName) throws IOException,
-                                                       JsonProcessingException {
-                                               if (log.isTraceEnabled())
-                                                       log.debug("Ignore property " + propertyName
-                                                                       + " in bean " + bean);
-                                               ctxt.getParser().skipChildren();
-                                               return true;
-                                       }
-                               });
-       }
-
-       public Object deserialize(Reader reader) {
-               try {
-                       if (log.isTraceEnabled()) {
-                               String str = IOUtils.toString(reader);
-                               log.debug(str);
-                               reader = new StringReader(str);
-                       }
-
-                       return getObjectMapper().readValue(reader, targetClass);
-               } catch (Exception e) {
-                       throw new ArgeoException("Cannot deserialize " + reader, e);
-               }
-
-       }
-
-       public <T> T deserialize(Reader reader, Class<T> clss) {
-               try {
-                       if (log.isTraceEnabled()) {
-                               String str = IOUtils.toString(reader);
-                               log.debug(str);
-                               reader = new StringReader(str);
-                       }
-
-                       return getObjectMapper().readValue(reader, clss);
-               } catch (Exception e) {
-                       throw new ArgeoException("Cannot deserialize " + reader, e);
-               }
-
-       }
-
-       public Object deserialize(String content) {
-               StringReader reader = new StringReader(content);
-               try {
-                       return deserialize(reader);
-               } finally {
-                       IOUtils.closeQuietly(reader);
-               }
-       }
-
-       public void setTargetClass(Class<?> targetClass) {
-               this.targetClass = targetClass;
-       }
-
-       public void setDeserializers(
-                       Map<Class<?>, JsonDeserializer<?>> deserializers) {
-               this.deserializers = deserializers;
-       }
-
-       public Class<?> getTargetClass() {
-               return targetClass;
-       }
-
-       public Map<Class<?>, JsonDeserializer<?>> getDeserializers() {
-               return deserializers;
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
deleted file mode 100644 (file)
index 696cdf8..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.json;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
-import org.argeo.server.Serializer;
-import org.argeo.server.ServerSerializer;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.SerializerFactory;
-import org.codehaus.jackson.map.SerializerProvider;
-import org.codehaus.jackson.map.ser.StdSerializerProvider;
-
-public class JsonServerSerializer implements ServerSerializer, Serializer {
-       private final static Log log = LogFactory
-                       .getLog(JsonServerSerializer.class);
-
-       private JsonFactory jsonFactory = new JsonFactory();
-       private ObjectMapper objectMapper = new ObjectMapper();
-       private SerializerProvider serializerProvider = new CustomSerializerProvider();
-
-       private Boolean prettyPrint = false;
-
-       private Boolean asHtml = false;
-
-       private String contentTypeCharset = "UTF-8";
-
-       // private Map<Class<?>,String> ignoredFields = new HashMap<Class<?>,
-       // String>();
-
-       public JsonServerSerializer() {
-               objectMapper.setSerializerProvider(serializerProvider);
-       }
-
-       @SuppressWarnings("restriction")
-       public void serialize(Object obj, HttpServletRequest request,
-                       HttpServletResponse response) {
-               if (asHtml)
-                       response.setContentType("text/html;charset=" + contentTypeCharset);
-               else
-                       response.setContentType("application/json;charset="
-                                       + contentTypeCharset);
-
-               try {
-                       if (asHtml)
-                               response.getWriter().append("<pre>");
-
-                       serialize(obj, response.getWriter());
-
-                       if (asHtml)
-                               response.getWriter().append("</pre>");
-
-               } catch (IOException e) {
-                       throw new ArgeoException("Cannot open response stream.", e);
-               }
-       }
-
-       public void serialize(Object obj, Writer writer) {
-               serializeAndLog(obj);
-
-               JsonGenerator jsonGenerator = null;
-               try {
-                       jsonGenerator = jsonFactory.createJsonGenerator(writer);
-
-                       if (prettyPrint)
-                               jsonGenerator.useDefaultPrettyPrinter();
-
-                       objectMapper.writeValue(jsonGenerator, obj);
-                       jsonGenerator.flush();
-               } catch (Exception e) {
-                       throw new ArgeoException("Cannot serialize " + obj, e);
-               } finally {
-                       if (jsonGenerator != null)
-                               try {
-                                       jsonGenerator.close();
-                               } catch (IOException e) {
-                                       if (log.isTraceEnabled())
-                                               log.error("Cannot close JSON generator", e);
-                               }
-               }
-       }
-
-       @Deprecated
-       public void serialize(Writer writer, Object obj) {
-               serialize(obj, writer);
-       }
-
-       protected void serializeAndLog(Object obj) {
-               if (!log.isTraceEnabled())
-                       return;
-
-               JsonGenerator jsonGenerator = null;
-               try {
-                       StringWriter stringWriter = new StringWriter();
-                       jsonGenerator = jsonFactory.createJsonGenerator(stringWriter);
-                       jsonGenerator.useDefaultPrettyPrinter();
-                       objectMapper.writeValue(jsonGenerator, obj);
-                       jsonGenerator.close();
-                       log.debug(stringWriter.toString());
-               } catch (Exception e) {
-                       throw new ArgeoException("Cannot log JSON", e);
-               } finally {
-                       if (jsonGenerator != null)
-                               try {
-                                       jsonGenerator.close();
-                               } catch (IOException e) {
-                                       if (log.isTraceEnabled())
-                                               log.error("Cannot close JSON generator", e);
-                               }
-
-               }
-       }
-
-       public void setPrettyPrint(Boolean prettyPrint) {
-               this.prettyPrint = prettyPrint;
-       }
-
-       protected ObjectMapper getObjectMapper() {
-               return objectMapper;
-       }
-
-       public void setContentTypeCharset(String contentTypeCharset) {
-               this.contentTypeCharset = contentTypeCharset;
-       }
-
-       static class CustomSerializerProvider extends StdSerializerProvider {
-
-               public CustomSerializerProvider() {
-                       super();
-               }
-
-               public CustomSerializerProvider(SerializationConfig config,
-                               StdSerializerProvider src, SerializerFactory f) {
-                       super(config, src, f);
-               }
-
-               protected StdSerializerProvider createInstance(
-                               SerializationConfig config, SerializerFactory jsf) {
-                       return new CustomSerializerProvider(config, this, jsf);
-               }
-
-               @Override
-               public JsonSerializer<Object> getUnknownTypeSerializer(
-                               Class<?> unknownType) {
-                       JsonSerializer<Object> res = new JsonSerializer<Object>() {
-                               public void serialize(Object value, JsonGenerator jgen,
-                                               SerializerProvider provider)
-                                               throws JsonMappingException {
-                                       if (log.isDebugEnabled())
-                                               log.warn("Unknown serializer for "
-                                                               + value.getClass().getName());
-                                       try {
-                                               jgen.writeNull();
-                                       } catch (Exception e) {
-                                               throw new ArgeoException("Cannot write null", e);
-                                       }
-                               }
-
-                       };
-
-                       return res;
-               }
-
-       }
-}
diff --git a/server/runtime/org.argeo.server.jxl/.classpath b/server/runtime/org.argeo.server.jxl/.classpath
deleted file mode 100644 (file)
index ab16ae2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/server/runtime/org.argeo.server.jxl/.project b/server/runtime/org.argeo.server.jxl/.project
deleted file mode 100644 (file)
index 10df72a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.jxl</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/runtime/org.argeo.server.jxl/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.jxl/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index d991f4b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#Sun Feb 21 11:16:56 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/server/runtime/org.argeo.server.jxl/.settings/org.maven.ide.eclipse.prefs b/server/runtime/org.argeo.server.jxl/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644 (file)
index ef3da62..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#Thu Oct 01 12:05:59 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/server/runtime/org.argeo.server.jxl/build.properties b/server/runtime/org.argeo.server.jxl/build.properties
deleted file mode 100644 (file)
index d5d2601..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-additional.bundles = com.springsource.junit
-source.. = src/main/java/,\
-           src/test/java/,\
-           src/test/resources/
diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml
deleted file mode 100644 (file)
index b75892a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.jxl</artifactId>
-       <name>Commons Server JXL</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.argeo.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Argeo Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.core</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- JXL  -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>jxl</artifactId>
-               </dependency>
-
-               <!-- TEST -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-                       <scope>test</scope>
-               </dependency>
-
-
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java b/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java
deleted file mode 100644 (file)
index 6d59961..0000000
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.jxl.dao;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import jxl.Cell;
-import jxl.CellType;
-import jxl.FormulaCell;
-import jxl.JXLException;
-import jxl.LabelCell;
-import jxl.NumberCell;
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.WorkbookSettings;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
-import org.argeo.server.dao.AbstractTabularDaoSupport;
-import org.argeo.server.dao.LightDaoSupport;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.util.StringUtils;
-
-public class JxlDaoSupport extends AbstractTabularDaoSupport implements
-               LightDaoSupport, ApplicationContextAware, InitializingBean {
-       private final static Log log = LogFactory.getLog(JxlDaoSupport.class);
-
-       private String encoding = "cp1252";
-       private Locale locale = null;
-
-       protected void load(InputStream in, List<Reference> references) {
-               try {
-                       WorkbookSettings workbookSettings = new WorkbookSettings();
-                       workbookSettings.setEncoding(encoding);
-                       if (locale != null)
-                               workbookSettings.setLocale(locale);
-                       Workbook workbook = Workbook.getWorkbook(in, workbookSettings);
-                       for (Sheet sheet : workbook.getSheets()) {
-                               loadSheet(sheet, references);
-                       }
-               } catch (Exception e) {
-                       throw new ArgeoException("Cannot load workbook", e);
-               }
-       }
-
-       protected void loadSheet(Sheet sheet, List<Reference> references)
-                       throws JXLException {
-               String sheetName = sheet.getName();
-               if (log.isTraceEnabled())
-                       log.debug("Instantiate sheet " + sheetName);
-
-               String tableName;
-               int hashIndex = sheetName.lastIndexOf('#');
-               if (hashIndex >= 0) {
-                       tableName = sheetName.substring(0, hashIndex);
-               } else {
-                       tableName = sheetName;
-               }
-
-               Class<?> clss = findClassToInstantiate(tableName);
-
-               if (hashIndex >= 0) {
-                       // see
-                       // http://stackoverflow.com/questions/451452/valid-characters-for-excel-sheet-names
-                       BeanWrapper bw = newBeanWrapper(clss);
-                       StringTokenizer espSt = new StringTokenizer(sheetName
-                                       .substring(hashIndex + 1), "&=");
-                       String keyProperty = null;
-                       while (espSt.hasMoreTokens()) {
-                               String fieldName = espSt.nextToken();
-                               if (keyProperty == null)
-                                       keyProperty = fieldName;
-                               if (!espSt.hasMoreTokens())
-                                       throw new ArgeoException("Badly formatted sheetname "
-                                                       + sheetName);
-                               String fieldValue = espSt.nextToken();
-                               bw.setPropertyValue(fieldName, fieldValue);
-                               loadAsObject(bw, sheet, references);
-                               saveOrUpdate(bw.getPropertyValue(keyProperty), bw
-                                               .getWrappedInstance(), clss);
-                       }
-
-               } else {
-
-                       Cell[] firstRow = sheet.getRow(0);
-                       String keyProperty = firstRow[0].getContents();
-
-                       if (keyProperty.charAt(keyProperty.length() - 1) == '>') {
-                               loadAsColumns(clss, keyProperty.substring(0, keyProperty
-                                               .length() - 1), sheet, firstRow, references);
-                       } else {
-                               loadAsRows(clss, keyProperty, sheet, firstRow, references);
-                       }
-               }
-       }
-
-       protected void loadAsRows(Class<?> clss, String keyProperty, Sheet sheet,
-                       Cell[] firstRow, List<Reference> references) throws JXLException {
-               for (int row = 1; row < sheet.getRows(); row++) {
-                       if (log.isTraceEnabled())
-                               log.trace(" row " + row);
-
-                       Cell[] currentRow = sheet.getRow(row);
-                       BeanWrapper bw = newBeanWrapper(clss);
-                       cells: for (int col = 0; col < firstRow.length; col++) {
-                               String pName = firstRow[col].getContents();
-
-                               if (col < currentRow.length) {
-                                       Cell cell = currentRow[col];
-                                       if (overrideCell(cell, bw, pName, keyProperty, row,
-                                                       references))
-                                               continue cells;
-                                       loadCell(cell, bw, pName, keyProperty, row, references);
-                               }
-                       }// cells
-
-                       saveOrUpdate(bw.getPropertyValue(keyProperty), bw
-                                       .getWrappedInstance(), clss);
-                       // tempRefs.get(sheet.getName()).add(bw.getWrappedInstance());
-                       registerInTabularView(sheet.getName(), bw.getWrappedInstance());
-               }
-       }
-
-       protected void loadAsColumns(Class<?> clss, String keyProperty,
-                       Sheet sheet, Cell[] firstRow, List<Reference> references)
-                       throws JXLException {
-               Cell[] firstColumn = sheet.getColumn(0);
-
-               for (int col = 1; col < firstRow.length; col++) {
-                       if (log.isTraceEnabled())
-                               log.trace(" column " + col);
-                       BeanWrapper bw = newBeanWrapper(clss);
-                       Cell[] column = sheet.getColumn(col);
-                       for (int row = 0; row < column.length; row++) {
-                               Cell cell = column[row];
-
-                               String propertyName;
-                               if (row == 0)
-                                       propertyName = keyProperty;
-                               else
-                                       propertyName = firstColumn[row].getContents();
-
-                               Class<?> rowType = bw.getPropertyType(propertyName);
-                               if (log.isTraceEnabled())
-                                       log.trace(" " + propertyName + " rowType="
-                                                       + rowType.getName());
-                               if (Map.class.isAssignableFrom(rowType)) {
-                                       if (log.isTraceEnabled())
-                                               log.trace("  start building map " + propertyName);
-                                       row++;
-                                       Map<Object, Object> map = new HashMap<Object, Object>();
-                                       String firstColContents = firstColumn[row].getContents();
-                                       mapRows: for (; row < column.length; row++) {
-                                               cell = column[row];
-                                               Object key = firstColContents;
-                                               if (log.isTraceEnabled())
-                                                       log.trace("   row=" + row + ", firstColContents="
-                                                                       + firstColContents + ", key=" + key
-                                                                       + ", type=" + cell.getType());
-                                               Object cellValue = getCellValue(cell);
-                                               map.put(key, cellValue);
-
-                                               // check next row too see if one should break
-                                               if (row < firstColumn.length - 1)
-                                                       firstColContents = firstColumn[row + 1]
-                                                                       .getContents();
-                                               if (bw.isWritableProperty(firstColContents)
-                                                               || firstColContents.trim().equals("")
-                                                               || row == firstColumn.length - 1) {
-                                                       bw.setPropertyValue(propertyName, map);
-                                                       if (log.isTraceEnabled())
-                                                               log.trace(" set map " + propertyName
-                                                                               + " of size " + map.size());
-                                                       break mapRows;// map is over
-                                               }
-                                       }
-                               } else {
-                                       loadCell(cell, bw, propertyName, keyProperty, row,
-                                                       references);
-                               }
-
-                       }
-                       saveOrUpdate(bw.getPropertyValue(keyProperty), bw
-                                       .getWrappedInstance(), clss);
-                       // tempRefs.get(sheet.getName()).add(bw.getWrappedInstance());
-                       registerInTabularView(sheet.getName(), bw.getWrappedInstance());
-               }// columns
-       }
-
-       protected void loadAsObject(BeanWrapper bw, Sheet sheet,
-                       List<Reference> references) {
-               Cell[] firstColumn = sheet.getColumn(0);
-               for (int row = 0; row < firstColumn.length; row++) {
-                       if (log.isTraceEnabled())
-                               log.trace(" row " + row);
-                       Cell[] currentRow = sheet.getRow(row);
-                       String propertyName = firstColumn[row].getContents();
-                       Class<?> rowType = bw.getPropertyType(propertyName);
-                       if (Map.class.isAssignableFrom(rowType)) {
-                               Map<Object, Object> map = new HashMap<Object, Object>();
-                               if (currentRow.length == 1
-                                               || currentRow[1].getContents().trim().equals("")) {
-                                       // simple map
-                               } else {
-                                       // map of maps
-                                       List<Object> subKeys = new ArrayList<Object>();
-                                       for (int col = 1; col < currentRow.length; col++) {
-                                               subKeys.add(getCellValue(currentRow[col]));
-                                       }
-                                       if (log.isTraceEnabled())
-                                               log.trace("   subKeys=" + subKeys);
-                                       row++;
-                                       String firstColContents = firstColumn[row].getContents();
-                                       mapRows: for (; row < firstColumn.length; row++) {
-                                               currentRow = sheet.getRow(row);
-
-                                               Object key = firstColContents;
-                                               Map<Object, Object> subMap = new HashMap<Object, Object>();
-
-                                               for (int col = 1; col < currentRow.length
-                                                               && col < subKeys.size() + 1; col++) {
-                                                       Object subKey = subKeys.get(col - 1);
-                                                       Cell cell = currentRow[col];
-                                                       if (log.isTraceEnabled())
-                                                               log.trace("   row=" + row
-                                                                               + ", firstColContents="
-                                                                               + firstColContents + ", subKey="
-                                                                               + subKey + ", type=" + cell.getType());
-                                                       Object cellValue = getCellValue(cell);
-                                                       subMap.put(subKey, cellValue);
-                                               }
-                                               map.put(key, subMap);
-
-                                               // check next row too see if one should break
-                                               if (row < firstColumn.length - 1)
-                                                       firstColContents = firstColumn[row + 1]
-                                                                       .getContents();
-                                               if (bw.isWritableProperty(firstColContents)
-                                                               || firstColContents.trim().equals("")
-                                                               || row == firstColumn.length - 1) {
-                                                       log.trace(map);
-                                                       bw.setPropertyValue(propertyName, map);
-                                                       if (log.isTraceEnabled())
-                                                               log.trace(" set map " + propertyName
-                                                                               + " of size " + map.size());
-                                                       break mapRows;// map is over
-                                               }
-                                       }
-
-                               }
-                       } else if (List.class.isAssignableFrom(rowType)) {
-                               throw new UnsupportedOperationException();
-                       } else {
-                               bw.setPropertyValue(propertyName, getCellValue(currentRow[1]));
-                       }
-               }
-       }
-
-       protected void loadCell(Cell cell, BeanWrapper bw, String propertyName,
-                       String keyProperty, Integer row, List<Reference> references)
-                       throws JXLException {
-
-               if (cell instanceof FormulaCell) {
-                       String formula = ((FormulaCell) cell).getFormula();
-                       int index = formula.indexOf('!');
-                       if (index < 0)
-                               throw new ArgeoException("Cannot interpret formula "
-                                               + formula);
-                       ;
-                       String targetSheet = formula.substring(0, index);
-                       // assume no double letters!!
-                       String targetRowStr = formula.substring(index + 2);
-                       if (targetRowStr.charAt(0) == '$')
-                               targetRowStr = targetRowStr.substring(1);
-                       Integer targetRow = Integer.parseInt(targetRowStr);
-                       references.add(new TabularInternalReference(
-                                       bw.getWrappedInstance(), propertyName, targetSheet,
-                                       targetRow));
-
-                       if (log.isTraceEnabled())
-                               log.debug("  formula: " + formula + " | content: "
-                                               + cell.getContents() + " | targetSheet=" + targetSheet
-                                               + ", targetRow=" + targetRow);
-               } else {
-                       Object cellValue = getCellValue(cell);
-
-                       if (propertyName.equals(keyProperty)
-                                       && !StringUtils.hasText(cellValue.toString())) {
-                               // auto allocate key column if empty
-                               cellValue = Integer.toString(row);
-                       }
-
-                       if (propertyName.charAt(0) == '#') {// externalRef
-                               references.add(new Reference(bw.getWrappedInstance(),
-                                               propertyName.substring(1), cellValue.toString()));
-                       } else {
-                               bw.setPropertyValue(propertyName, cellValue);
-                       }
-
-                       if (log.isTraceEnabled())
-                               log.debug("  " + propertyName + "=" + cellValue);
-               }
-
-       }
-
-       protected Object getCellValue(Cell cell) {
-               Object contents;
-               if (cell.getType() == CellType.LABEL) {
-                       LabelCell lc = (LabelCell) cell;
-                       contents = lc.getString();
-               } else if (cell.getType() == CellType.NUMBER) {
-                       NumberCell nc = (NumberCell) cell;
-                       contents = nc.getValue();
-               } else {
-                       contents = cell.getContents();
-               }
-               return contents;
-       }
-
-       /** Returns true if property was set (thus bypassing standard process). */
-       protected Boolean overrideCell(Cell cell, BeanWrapper bw,
-                       String propertyName, String keyProperty, Integer row,
-                       List<Reference> references) {
-               return false;
-       }
-
-       public void setEncoding(String encoding) {
-               this.encoding = encoding;
-       }
-
-       public void setLocale(Locale locale) {
-               this.locale = locale;
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/CollectionsObject.java b/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/CollectionsObject.java
deleted file mode 100644 (file)
index 2c6308f..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.jxl.dao;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CollectionsObject {
-       private String id;
-       private String label;
-       private SimpleObject simpleObject;
-       private List<String> stringList = new ArrayList<String>();
-       private Map<String, Float> floatMap = new HashMap<String, Float>();
-       private Map<SimpleObject, String> objectMap = new HashMap<SimpleObject, String>();
-       private Map<String, Map<String, String>> mapOfMaps = new HashMap<String, Map<String, String>>();
-
-       public String getId() {
-               return id;
-       }
-
-       public void setId(String id) {
-               this.id = id;
-       }
-
-       public String getLabel() {
-               return label;
-       }
-
-       public void setLabel(String label) {
-               this.label = label;
-       }
-
-       public SimpleObject getSimpleObject() {
-               return simpleObject;
-       }
-
-       public void setSimpleObject(SimpleObject simpleObject) {
-               this.simpleObject = simpleObject;
-       }
-
-       public List<String> getStringList() {
-               return stringList;
-       }
-
-       public void setStringList(List<String> stringList) {
-               this.stringList = stringList;
-       }
-
-       public Map<String, Float> getFloatMap() {
-               return floatMap;
-       }
-
-       public void setFloatMap(Map<String, Float> floatMap) {
-               this.floatMap = floatMap;
-       }
-
-       public Map<SimpleObject, String> getObjectMap() {
-               return objectMap;
-       }
-
-       public void setObjectMap(Map<SimpleObject, String> objectMap) {
-               this.objectMap = objectMap;
-       }
-
-       public Map<String, Map<String, String>> getMapOfMaps() {
-               return mapOfMaps;
-       }
-
-       public void setMapOfMaps(Map<String, Map<String, String>> mapOfMaps) {
-               this.mapOfMaps = mapOfMaps;
-       }
-}
diff --git a/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java b/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java
deleted file mode 100644 (file)
index 75e6b1c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.jxl.dao;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-
-@SuppressWarnings("restriction")
-public class JxlDaoSupportTest extends TestCase {
-       public void testBasic() throws Exception {
-               JxlDaoSupport jsd = new JxlDaoSupport();
-               jsd.getExternalRefs().put("test", new OtherObject());
-
-               jsd.getResources().add(new ClassPathResource("/dao/simple.xls"));
-               jsd.init();
-
-               SimpleObject soAaa = jsd.getByKey(SimpleObject.class, "aaa");
-               assertNotNull(soAaa);
-               assertEquals("aaa", soAaa.getString());
-               assertEquals(1, soAaa.getInteger().intValue());
-               assertNotNull(soAaa.getOtherObject());
-               assertEquals("USD", soAaa.getOtherObject().getKey());
-               assertEquals("US Dollar", soAaa.getOtherObject().getValue());
-
-               SimpleObject soBbb = jsd.getByKey(SimpleObject.class, "bbb");
-               assertNotNull(soBbb.getOtherObject());
-               assertEquals("bbb", ((SimpleObject) soBbb.getOtherObject().getValue())
-                               .getString());
-
-               List<SimpleObject> simpleObjects = jsd.list(SimpleObject.class, null);
-               assertEquals(4, simpleObjects.size());
-
-               List<CollectionsObject> collectionsObjects = jsd.list(
-                               CollectionsObject.class, null);
-               assertEquals(4, collectionsObjects.size());
-       }
-}
diff --git a/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/OtherObject.java b/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/OtherObject.java
deleted file mode 100644 (file)
index ec41c55..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.jxl.dao;
-
-public class OtherObject {
-       private String key;
-       private Object value;
-
-       public String getKey() {
-               return key;
-       }
-
-       public void setKey(String key) {
-               this.key = key;
-       }
-
-       public Object getValue() {
-               return value;
-       }
-
-       public void setValue(Object value) {
-               this.value = value;
-       }
-}
diff --git a/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/SimpleObject.java b/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/SimpleObject.java
deleted file mode 100644 (file)
index eee4ec5..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.jxl.dao;
-
-public class SimpleObject {
-       private String string;
-       private Integer integer;
-       private OtherObject otherObject;
-       private OtherObject anotherObject;
-
-       public String getString() {
-               return string;
-       }
-
-       public void setString(String sting) {
-               this.string = sting;
-       }
-
-       public Integer getInteger() {
-               return integer;
-       }
-
-       public void setInteger(Integer integer) {
-               this.integer = integer;
-       }
-
-       public OtherObject getOtherObject() {
-               return otherObject;
-       }
-
-       public void setOtherObject(OtherObject otherObject) {
-               this.otherObject = otherObject;
-       }
-
-       public OtherObject getAnotherObject() {
-               return anotherObject;
-       }
-
-       public void setAnotherObject(OtherObject anotherObject) {
-               this.anotherObject = anotherObject;
-       }
-
-       @Override
-       public boolean equals(Object obj) {
-               return string.equals(((SimpleObject) obj).string);
-       }
-
-       @Override
-       public int hashCode() {
-               return string.hashCode();
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/SimpleObjectEditor.java b/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/SimpleObjectEditor.java
deleted file mode 100644 (file)
index c7cb00a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.jxl.dao;
-
-import java.beans.PropertyEditorSupport;
-
-public class SimpleObjectEditor extends PropertyEditorSupport {
-
-       @Override
-       public String getAsText() {
-               return ((SimpleObject) getValue()).getString();
-       }
-
-       @Override
-       public void setAsText(String text) throws IllegalArgumentException {
-               SimpleObject obj = new SimpleObject();
-               obj.setString(text);
-               setValue(obj);
-       }
-
-}
diff --git a/server/runtime/org.argeo.server.jxl/src/test/resources/dao/simple.xls b/server/runtime/org.argeo.server.jxl/src/test/resources/dao/simple.xls
deleted file mode 100644 (file)
index 6cb4c2e..0000000
Binary files a/server/runtime/org.argeo.server.jxl/src/test/resources/dao/simple.xls and /dev/null differ
diff --git a/server/runtime/org.argeo.server.jxl/src/test/resources/log4j.properties b/server/runtime/org.argeo.server.jxl/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 6a9667c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.server.jxl=TRACE
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console 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/runtime/org.argeo.server.modeshape/.classpath b/server/runtime/org.argeo.server.modeshape/.classpath
deleted file mode 100644 (file)
index 8cf7f48..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/server/runtime/org.argeo.server.modeshape/.project b/server/runtime/org.argeo.server.modeshape/.project
deleted file mode 100644 (file)
index 3018b71..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.modeshape</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/runtime/org.argeo.server.modeshape/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.modeshape/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 5a7d6c7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Feb 09 07:24:45 CET 2011
-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.compliance=1.5
-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/runtime/org.argeo.server.modeshape/.settings/org.eclipse.pde.core.prefs b/server/runtime/org.argeo.server.modeshape/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index b6bd622..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Feb 09 07:24:45 CET 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/server/runtime/org.argeo.server.modeshape/build.properties b/server/runtime/org.argeo.server.modeshape/build.properties
deleted file mode 100644 (file)
index 5fc538b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml
deleted file mode 100644 (file)
index d66de88..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.modeshape</artifactId>
-       <name>Commons Server Modeshape</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.argeo.modeshape.*,
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.modeshape</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.jcr</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.modeshape/src/main/java/org/argeo/modeshape/FileSystemRepository.java b/server/runtime/org.argeo.server.modeshape/src/main/java/org/argeo/modeshape/FileSystemRepository.java
deleted file mode 100644 (file)
index ab008c5..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.modeshape;
-
-import java.util.UUID;
-
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
-import org.argeo.jcr.JcrUtils;
-import org.modeshape.connector.filesystem.FileSystemSource;
-import org.modeshape.jcr.JcrConfiguration;
-import org.modeshape.jcr.JcrEngine;
-
-public class FileSystemRepository {
-       public void init() {
-               try {
-                       // Required in order to load mime type definitions
-                       Thread.currentThread().setContextClassLoader(JcrConfiguration.class.getClassLoader());
-                       JcrConfiguration config = new JcrConfiguration();
-                       config.repositorySource("fsSource")
-                                       .usingClass(FileSystemSource.class)
-                                       .setDescription("The repository for our content")
-                                       .setProperty("workspaceRootPath", "/home/mbaudier/tmp")
-                                       .setProperty("defaultWorkspaceName", "prod")
-                                       .setProperty("predefinedWorkspaceNames",
-                                                       new String[] { "staging", "dev" })
-                                       .setProperty(
-                                                       "rootNodeUuid",
-                                                       UUID.fromString("fd129c12-81a8-42ed-aa4b-820dba49e6f0"))
-                                       .setProperty("updatesAllowed", "true")
-                                       .setProperty("creatingWorkspaceAllowed", "false");
-                       config.repository("fsRepo").setSource("fsSource");
-
-                       JcrEngine jcrEngine = config.build();
-                       jcrEngine.start();
-                       Repository repository = jcrEngine.getRepository("fsRepo");
-                       Session session = repository.login(new SimpleCredentials("demo",
-                                       "demo".toCharArray()));
-                       JcrUtils.debug(session.getRootNode());
-               } catch (RepositoryException e) {
-                       e.printStackTrace();
-               }
-       }
-}
diff --git a/server/runtime/org.argeo.server.webextender/.classpath b/server/runtime/org.argeo.server.webextender/.classpath
deleted file mode 100644 (file)
index 8cf7f48..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/server/runtime/org.argeo.server.webextender/.project b/server/runtime/org.argeo.server.webextender/.project
deleted file mode 100644 (file)
index 39a8ee8..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.webextender</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/server/runtime/org.argeo.server.webextender/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.webextender/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 606000e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Jul 09 14:46:32 CEST 2010
-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.compliance=1.5
-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/runtime/org.argeo.server.webextender/.settings/org.eclipse.pde.core.prefs b/server/runtime/org.argeo.server.webextender/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index c0af3ca..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Jul 09 14:46:32 CEST 2010
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/server/runtime/org.argeo.server.webextender/META-INF/spring/extender/extender.properties b/server/runtime/org.argeo.server.webextender/META-INF/spring/extender/extender.properties
deleted file mode 100644 (file)
index 4dde802..0000000
+++ /dev/null
@@ -1 +0,0 @@
-undeploy.wars.at.shutdown=true
diff --git a/server/runtime/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml b/server/runtime/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml
deleted file mode 100644 (file)
index 2e45128..0000000
+++ /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:osgi="http://www.springframework.org/schema/osgi"
-       xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans   
-     http://www.springframework.org/schema/beans/spring-beans.xsd
-     http://www.springframework.org/schema/osgi
-     http://www.springframework.org/schema/osgi/spring-osgi.xsd
-     http://www.springframework.org/schema/util
-     http://www.springframework.org/schema/util/spring-util.xsd">
-
-       <!-- we leave 5 mins to Tomcat to start -->
-       <osgi:reference id="tomcatServer" interface="org.apache.catalina.Service"
-               cardinality="0..1" timeout="300000" />
-
-       <bean id="warDeployer" class="org.argeo.server.webextender.TomcatDeployer"
-               p:service-ref="tomcatServer" />
-
-       <util:properties id="extenderProperties"
-               location="osgibundle:/META-INF/spring/extender/extender.properties" />
-</beans>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.webextender/build.properties b/server/runtime/org.argeo.server.webextender/build.properties
deleted file mode 100644 (file)
index 5fc538b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
diff --git a/server/runtime/org.argeo.server.webextender/pom.xml b/server/runtime/org.argeo.server.webextender/pom.xml
deleted file mode 100644 (file)
index aadf95a..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.12-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.server.webextender</artifactId>
-       <name>Commons Server Web Extender (Spring DM)</name>
-       <description>Configure / hack Spring DM web extender</description>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Fragment-Host>org.springframework.osgi.web.extender</Fragment-Host>
-                                               <Export-Package>org.argeo.server.webextender.*</Export-Package>
-                                               <Import-Package>org.springframework.beans.factory,*</Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.osgi.web</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.osgi.web.extender</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.beans</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java b/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java
deleted file mode 100644 (file)
index 192cead..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.server.webextender;
-
-import org.apache.catalina.Container;
-import org.apache.catalina.Context;
-import org.apache.catalina.Service;
-import org.springframework.osgi.web.deployer.WarDeployment;
-import org.springframework.osgi.web.deployer.tomcat.TomcatWarDeployer;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Wraps the Spring DM Tomcat deployer in order to avoid issue with call to
- * getServerInfo() when undeployed. We need to hack a lot here because Spring
- * OSGi Web is really not extendable.
- */
-public class TomcatDeployer extends TomcatWarDeployer {
-       private String serverInfo;
-       private Service service;
-       private String contextPath = "/ui";
-
-       @Override
-       public void setService(Object service) {
-               this.service = (Service) service;
-               super.setService(service);
-               // TODO: listen to OSGi service so that we get notified in the
-               // (unlikely) case the underlying service is updated
-               serverInfo = ((Service) service).getInfo();
-               log.info("Enhanced Argeo Tomcat webapp deployer being used");
-       }
-
-       @Override
-       protected String getServerInfo() {
-               return serverInfo;
-       }
-
-       @Override
-       protected void startDeployment(WarDeployment deployment) throws Exception {
-               // Context context = ((TomcatWarDeployment)
-               // deployment).getCatalinaContext();
-               // context.setCookies(false);
-               super.startDeployment(deployment);
-
-               // Required for multiple RAP sessions to work with Tomcat
-               // see
-               // http://wiki.eclipse.org/RAP/FAQ#How_to_run_a_RAP_application_in_multiple_browser_tabs.2Fwindows.3F
-               Context context = getContext(contextPath);
-               if (context != null)
-                       context.setCookies(false);
-       }
-
-       /** @return null if not found */
-       private Context getContext(String path) {
-               for (Container container : getHost().findChildren()) {
-                       if (log.isTraceEnabled())
-                               log.trace(container.getClass() + ": " + container.getName());
-                       if (container instanceof Context) {
-                               Context context = (Context) container;
-                               if (path.equals(context.getPath()))
-                                       return context;
-                       }
-               }
-               return null;
-       }
-
-       private Container getHost() {
-               // get engine
-               Container container = service.getContainer();
-
-               if (container == null)
-                       throw new IllegalStateException(
-                                       "The Tomcat server doesn't have any Engines defined");
-               // now get host
-               Container[] children = container.findChildren();
-               if (ObjectUtils.isEmpty(children))
-                       throw new IllegalStateException(
-                                       "The Tomcat server doesn't have any Hosts defined");
-
-               // pick the first one and associate the context with it
-               return children[0];
-       }
-
-       public void setContextPath(String contextPath) {
-               this.contextPath = contextPath;
-       }
-
-}
diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
deleted file mode 100644 (file)
index 4c9e9dd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.12-SNAPSHOT</version>
-               <artifactId>server</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.commons</groupId>
-       <artifactId>argeo-commons</artifactId>
-       <name>Commons Server Runtime</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.server.core</module>
-               <module>org.argeo.server.json</module>
-               <module>org.argeo.server.catalina.start</module>
-               <module>org.argeo.server.webextender</module>
-               <module>org.argeo.server.jxl</module>
-               <module>org.argeo.server.hibernate</module>
-               <module>org.argeo.server.ads</module>
-               <module>org.argeo.server.jcr</module>
-               <module>org.argeo.server.jcr.mvc</module>
-               <module>org.argeo.server.jackrabbit</module>
-               <module>org.argeo.server.modeshape</module>
-       </modules>
-</project>
\ No newline at end of file