Restructure Jackrabbit modules

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

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/.project b/server/modules/org.argeo.jackrabbit.localrepo/.project
new file mode 100644 (file)
index 0000000..87b35f8
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.jackrabbit.localrepo</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.jackrabbit.localrepo/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.jackrabbit.localrepo/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..aae2471
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Wed Feb 23 10:53:42 CET 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/META-INF/MANIFEST.MF b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..9e035e2
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jackrabbit Local Repository
+Bundle-SymbolicName: org.argeo.jackrabbit.localrepo
+Bundle-Version: 0.2.3.SNAPSHOT
+Import-Package: javax.jcr,
+ org.apache.jackrabbit.core,
+ org.apache.jackrabbit.core.config,
+ org.apache.lucene.util;version="2.4.1",
+ org.apache.xalan.processor,
+ org.argeo.jackrabbit,
+ org.springframework.beans.factory.config

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit-osgi.xml b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit-osgi.xml
new file mode 100644 (file)
index 0000000..7a3c71a
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit-osgi.xml
@@ -0,0 +1,16 @@
+<?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
+       <service ref="remoteJcrRepository" interface="javax.jcr.Repository">\r
+               <service-properties>\r
+                       <beans:entry key="argeo.jcr.repository.name" value="local" />\r
+               </service-properties>\r
+       </service>\r
+\r
+\r
+</beans:beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit.xml b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit.xml
new file mode 100644 (file)
index 0000000..0ac070e
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.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:jackrabbit.properties</value>
+               </property>
+       </bean>
+
+       <bean id="localJcrRepository" class="org.argeo.jackrabbit.JackrabbitContainer">
+               <property name="uri"
+                       value="http://localhost:7070/org.argeo.server.jcr.webapp/remoting/repo" />
+               <property name="homeDirectory" value="${slc.jackrabbit.home}" />
+               <property name="configuration" value="${slc.jackrabbit.configuration}" />
+               <property name="variables" value="osgibundle:/jackrabbit.properties" />
+               <property name="namespaces">
+                       <map>
+                               <entry key="argeo" value="http://www.argeo.org/argeo" />
+                       </map>
+               </property>
+               <property name="cndFiles">
+                       <list>
+                               <value>classpath:/org/argeo/jcr/argeo.cnd</value>
+                       </list>
+               </property>
+       </bean>
+</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/build.properties b/server/modules/org.argeo.jackrabbit.localrepo/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/localrepo.properties b/server/modules/org.argeo.jackrabbit.localrepo/localrepo.properties
new file mode 100644 (file)
index 0000000..c046ca4
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/localrepo.properties
@@ -0,0 +1 @@
+argeo.localrepo.configuration=osgibundle:repository.xml
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml b/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml
new file mode 100644 (file)
index 0000000..7b1d3bf
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<Repository>
+       <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+               <param name="path" value="${rep.home}/repository" />
+       </FileSystem>
+
+       <Security appName="Jackrabbit">
+               <SecurityManager
+                       class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+                       workspaceName="security">
+               </SecurityManager>
+               <AccessManager
+                       class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+                       <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+               </AccessManager>
+
+               <LoginModule
+                       class="org.springframework.security.providers.jaas.SecurityContextLoginModule">
+               </LoginModule>
+<!--           <LoginModule-->
+<!--                   class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">-->
+<!--                   <param name="anonymousId" value="anonymous" />-->
+<!--                   <param name="adminId" value="admin" />-->
+<!--           </LoginModule>-->
+       </Security>
+
+       <Workspaces rootPath="${rep.home}/workspaces"
+               defaultWorkspace="default" />
+
+       <Workspace name="${wsp.name}">
+               <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+                       <param name="path" value="${wsp.home}" />
+               </FileSystem>
+               <PersistenceManager
+                       class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+                       <param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_db" />
+                       <param name="schemaObjectPrefix" value="${wsp.name}_" />
+               </PersistenceManager>
+               <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+                       <param name="path" value="${wsp.home}/index" />
+                       <param name="extractorPoolSize" value="2" />
+                       <param name="supportHighlighting" value="true" />
+               </SearchIndex>
+       </Workspace>
+
+       <Versioning rootPath="${rep.home}/version">
+               <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+                       <param name="path" value="${rep.home}/version" />
+               </FileSystem>
+               <PersistenceManager
+                       class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+                       <param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_version" />
+                       <param name="schemaObjectPrefix" value="version_" />
+               </PersistenceManager>
+       </Versioning>
+
+       <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+               <param name="path" value="${rep.home}/repository/index" />
+               <param name="extractorPoolSize" value="2" />
+               <param name="supportHighlighting" value="true" />
+       </SearchIndex>
+</Repository>

diff --git a/server/modules/org.argeo.jackrabbit.localrepo/repository-postgresql.xml b/server/modules/org.argeo.jackrabbit.localrepo/repository-postgresql.xml
new file mode 100644 (file)
index 0000000..9f95adf
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.localrepo/repository-postgresql.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<Repository>
+       <!-- Shared datasource -->
+       <DataSources>
+               <DataSource name="dataSource">
+                       <param name="driver" value="org.postgresql.Driver" />
+                       <param name="url" value="${slc.jackrabbit.dburl}" />
+                       <param name="user" value="${slc.jackrabbit.dbuser}" />
+                       <param name="password" value="${slc.jackrabbit.dbpassword}" />
+                       <param name="databaseType" value="postgresql" />
+                       <param name="maxPoolSize" value="10" />
+               </DataSource>
+       </DataSources>
+
+       <!-- File system and datastore -->
+       <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+               <param name="dataSourceName" value="dataSource" />
+               <param name="schema" value="postgresql" />
+               <param name="schemaObjectPrefix" value="fs_" />
+       </FileSystem>
+       <DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">
+               <param name="dataSourceName" value="dataSource" />
+               <param name="schemaObjectPrefix" value="ds_" />
+       </DataStore>
+
+       <!-- Workspace templates -->
+       <Workspaces rootPath="${rep.home}/workspaces"
+               defaultWorkspace="default" />
+       <Workspace name="${wsp.name}">
+               <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schema" value="postgresql" />
+                       <param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+               </FileSystem>
+               <PersistenceManager
+                       class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+               </PersistenceManager>
+               <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+                       <param name="path" value="${wsp.home}/index" />
+               </SearchIndex>
+       </Workspace>
+
+       <!-- Versioning -->
+       <Versioning rootPath="${rep.home}/version">
+               <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schema" value="postgresql" />
+                       <param name="schemaObjectPrefix" value="fs_ver_" />
+               </FileSystem>
+               <PersistenceManager
+                       class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schemaObjectPrefix" value="pm_ver_" />
+               </PersistenceManager>
+       </Versioning>
+
+       <!-- Indexing -->
+       <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+               <param name="path" value="${rep.home}/repository/index" />
+               <param name="extractorPoolSize" value="2" />
+               <param name="supportHighlighting" value="true" />
+       </SearchIndex>
+
+       <!-- Security -->
+       <Security appName="Jackrabbit">
+               <SecurityManager
+                       class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+                       workspaceName="security">
+               </SecurityManager>
+               <AccessManager
+                       class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+               </AccessManager>
+<!--            <LoginModule -->
+<!--            class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> -->
+<!--            </LoginModule> -->
+               <LoginModule
+                       class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+                       <param name="anonymousId" value="anonymous" />
+                       <param name="adminId" value="admin" />
+               </LoginModule>
+       </Security>
+</Repository>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.webapp/.project b/server/modules/org.argeo.jackrabbit.webapp/.project
new file mode 100644 (file)
index 0000000..37eed05
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.jackrabbit.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/server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..ee0c8b2
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Tue Feb 22 17:15:24 CET 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..2122086
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Webapp
+Bundle-SymbolicName: org.argeo.jackrabbit.webapp
+Bundle-Version: 1.0.0.qualifier
+Web-ContextPath: org.argeo.jcr.webapp
+Bundle-Vendor: Argeo
+Import-Package: javax.jcr,
+ javax.servlet,
+ javax.servlet.http,
+ javax.servlet.resources,
+ org.argeo.jackrabbit.remote,
+ org.argeo.jcr,
+ org.springframework.osgi.web.context.support;version="1.2.1",
+ org.springframework.security;version="2.0.6.RELEASE",
+ org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
+ org.springframework.web.context;version="2.5.6.SEC01",
+ org.springframework.web.filter;version="2.5.6.SEC01",
+ org.springframework.web.servlet.handler;version="2.5.6.SEC01"

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
new file mode 100644 (file)
index 0000000..1aec32e
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,15 @@
+<?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="osgi.xml" />
+       <import resource="security.xml" />
+
+       <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" />
+
+</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml
new file mode 100644 (file)
index 0000000..80b804e
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml
@@ -0,0 +1,18 @@
+<?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:security="http://www.springframework.org/schema/security"\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/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">\r
+\r
+       <set id="repositories" interface="javax.jcr.Repository" cardinality="0..N">\r
+               <listener ref="repositoryRegister" bind-method="register"\r
+                       unbind-method="unregister" />\r
+       </set>\r
+\r
+       <reference id="_authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
+</beans:beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml
new file mode 100644 (file)
index 0000000..c77def2
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml
@@ -0,0 +1,21 @@
+<?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">
+
+       <bean
+               class="org.springframework.web.servlet.handler.SimpleServletPostProcessor" />
+
+       <bean id="servletHandler"
+               class="org.springframework.web.servlet.handler.SimpleServletHandlerAdapter" />
+
+       <bean id="urlMapping"
+               class="org.argeo.server.jackrabbit.webdav.MultipleRepositoryHandlerMapping">
+               <property name="repositoryRegister" ref="repositoryRegister" />
+       </bean>
+
+</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security.xml
new file mode 100644 (file)
index 0000000..2e08bfd
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security.xml
@@ -0,0 +1,14 @@
+<?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">
+
+       <security:http>
+               <security:http-basic />
+               <security:intercept-url pattern="/**"
+                       access="ROLE_USER,ROLE_ADMIN,ROLE_ANONYMOUS" />
+       </security:http>
+</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..a2822ad
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
@@ -0,0 +1,53 @@
+<?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 Jackrabbit Webapp</display-name>
+
+       <!-- 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>
+
+       <!-- Remoting -->
+       <servlet>
+               <servlet-name>remoting</servlet-name>
+               <servlet-class>org.argeo.server.jackrabbit.webdav.ExtendedDispatcherServlet</servlet-class>
+               <init-param>
+                       <param-name>contextClass</param-name>
+                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>dispatchOptionsRequest</param-name>
+                       <param-value>true</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>remoting</servlet-name>
+               <url-pattern>/remoting/*</url-pattern>
+       </servlet-mapping>
+
+       <!--  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>-->
+</web-app>

diff --git a/server/modules/org.argeo.jackrabbit.webapp/build.properties b/server/modules/org.argeo.jackrabbit.webapp/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/.project b/server/modules/org.argeo.server.jackrabbit.repo/.project
deleted file mode 100644 (file)
index 695beeb..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.jackrabbit.repo</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.jackrabbit.repo/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.jackrabbit.repo/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index aae2471..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Feb 23 10:53:42 CET 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index a7181d1..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Repo
-Bundle-SymbolicName: org.argeo.server.jackrabbit.repo
-Bundle-Version: 0.2.3.SNAPSHOT
-Import-Package: javax.jcr,
- org.apache.jackrabbit.core,
- org.apache.jackrabbit.core.config,
- org.apache.lucene.util;version="2.4.1",
- org.apache.xalan.processor,
- org.argeo.jackrabbit,
- org.springframework.beans.factory.config

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml
deleted file mode 100644 (file)
index 7a3c71a..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml
+++ /dev/null
@@ -1,16 +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
-       <service ref="remoteJcrRepository" interface="javax.jcr.Repository">\r
-               <service-properties>\r
-                       <beans:entry key="argeo.jcr.repository.name" value="local" />\r
-               </service-properties>\r
-       </service>\r
-\r
-\r
-</beans:beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
deleted file mode 100644 (file)
index 0ac070e..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
+++ /dev/null
@@ -1,32 +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
-               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:jackrabbit.properties</value>
-               </property>
-       </bean>
-
-       <bean id="localJcrRepository" class="org.argeo.jackrabbit.JackrabbitContainer">
-               <property name="uri"
-                       value="http://localhost:7070/org.argeo.server.jcr.webapp/remoting/repo" />
-               <property name="homeDirectory" value="${slc.jackrabbit.home}" />
-               <property name="configuration" value="${slc.jackrabbit.configuration}" />
-               <property name="variables" value="osgibundle:/jackrabbit.properties" />
-               <property name="namespaces">
-                       <map>
-                               <entry key="argeo" value="http://www.argeo.org/argeo" />
-                       </map>
-               </property>
-               <property name="cndFiles">
-                       <list>
-                               <value>classpath:/org/argeo/jcr/argeo.cnd</value>
-                       </list>
-               </property>
-       </bean>
-</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/build.properties b/server/modules/org.argeo.server.jackrabbit.repo/build.properties
deleted file mode 100644 (file)
index 5f22cdd..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties b/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties
deleted file mode 100644 (file)
index c046ca4..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.localrepo.configuration=osgibundle:repository.xml
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml b/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml
deleted file mode 100644 (file)
index 7b1d3bf..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
-<Repository>
-       <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-               <param name="path" value="${rep.home}/repository" />
-       </FileSystem>
-
-       <Security appName="Jackrabbit">
-               <SecurityManager
-                       class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
-                       workspaceName="security">
-               </SecurityManager>
-               <AccessManager
-                       class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
-                       <!-- <param name="config" value="${rep.home}/access.xml"/> -->
-               </AccessManager>
-
-               <LoginModule
-                       class="org.springframework.security.providers.jaas.SecurityContextLoginModule">
-               </LoginModule>
-<!--           <LoginModule-->
-<!--                   class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">-->
-<!--                   <param name="anonymousId" value="anonymous" />-->
-<!--                   <param name="adminId" value="admin" />-->
-<!--           </LoginModule>-->
-       </Security>
-
-       <Workspaces rootPath="${rep.home}/workspaces"
-               defaultWorkspace="default" />
-
-       <Workspace name="${wsp.name}">
-               <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-                       <param name="path" value="${wsp.home}" />
-               </FileSystem>
-               <PersistenceManager
-                       class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
-                       <param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_db" />
-                       <param name="schemaObjectPrefix" value="${wsp.name}_" />
-               </PersistenceManager>
-               <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-                       <param name="path" value="${wsp.home}/index" />
-                       <param name="extractorPoolSize" value="2" />
-                       <param name="supportHighlighting" value="true" />
-               </SearchIndex>
-       </Workspace>
-
-       <Versioning rootPath="${rep.home}/version">
-               <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-                       <param name="path" value="${rep.home}/version" />
-               </FileSystem>
-               <PersistenceManager
-                       class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
-                       <param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_version" />
-                       <param name="schemaObjectPrefix" value="version_" />
-               </PersistenceManager>
-       </Versioning>
-
-       <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-               <param name="path" value="${rep.home}/repository/index" />
-               <param name="extractorPoolSize" value="2" />
-               <param name="supportHighlighting" value="true" />
-       </SearchIndex>
-</Repository>

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml b/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml
deleted file mode 100644 (file)
index 9f95adf..0000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
-<Repository>
-       <!-- Shared datasource -->
-       <DataSources>
-               <DataSource name="dataSource">
-                       <param name="driver" value="org.postgresql.Driver" />
-                       <param name="url" value="${slc.jackrabbit.dburl}" />
-                       <param name="user" value="${slc.jackrabbit.dbuser}" />
-                       <param name="password" value="${slc.jackrabbit.dbpassword}" />
-                       <param name="databaseType" value="postgresql" />
-                       <param name="maxPoolSize" value="10" />
-               </DataSource>
-       </DataSources>
-
-       <!-- File system and datastore -->
-       <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
-               <param name="dataSourceName" value="dataSource" />
-               <param name="schema" value="postgresql" />
-               <param name="schemaObjectPrefix" value="fs_" />
-       </FileSystem>
-       <DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">
-               <param name="dataSourceName" value="dataSource" />
-               <param name="schemaObjectPrefix" value="ds_" />
-       </DataStore>
-
-       <!-- Workspace templates -->
-       <Workspaces rootPath="${rep.home}/workspaces"
-               defaultWorkspace="default" />
-       <Workspace name="${wsp.name}">
-               <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
-                       <param name="dataSourceName" value="dataSource" />
-                       <param name="schema" value="postgresql" />
-                       <param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
-               </FileSystem>
-               <PersistenceManager
-                       class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
-                       <param name="dataSourceName" value="dataSource" />
-                       <param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
-               </PersistenceManager>
-               <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-                       <param name="path" value="${wsp.home}/index" />
-               </SearchIndex>
-       </Workspace>
-
-       <!-- Versioning -->
-       <Versioning rootPath="${rep.home}/version">
-               <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
-                       <param name="dataSourceName" value="dataSource" />
-                       <param name="schema" value="postgresql" />
-                       <param name="schemaObjectPrefix" value="fs_ver_" />
-               </FileSystem>
-               <PersistenceManager
-                       class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
-                       <param name="dataSourceName" value="dataSource" />
-                       <param name="schemaObjectPrefix" value="pm_ver_" />
-               </PersistenceManager>
-       </Versioning>
-
-       <!-- Indexing -->
-       <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-               <param name="path" value="${rep.home}/repository/index" />
-               <param name="extractorPoolSize" value="2" />
-               <param name="supportHighlighting" value="true" />
-       </SearchIndex>
-
-       <!-- Security -->
-       <Security appName="Jackrabbit">
-               <SecurityManager
-                       class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
-                       workspaceName="security">
-               </SecurityManager>
-               <AccessManager
-                       class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
-               </AccessManager>
-<!--            <LoginModule -->
-<!--            class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> -->
-<!--            </LoginModule> -->
-               <LoginModule
-                       class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
-                       <param name="anonymousId" value="anonymous" />
-                       <param name="adminId" value="admin" />
-               </LoginModule>
-       </Security>
-</Repository>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/.project b/server/modules/org.argeo.server.jackrabbit.webapp.war/.project
deleted file mode 100644 (file)
index b3972fb..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.server.jackrabbit.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/server/modules/org.argeo.server.jackrabbit.webapp.war/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.jackrabbit.webapp.war/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index ee0c8b2..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Feb 22 17:15:24 CET 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 76c2ee1..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Webapp
-Bundle-SymbolicName: org.argeo.server.jackrabbit.webapp
-Bundle-Version: 1.0.0.qualifier
-Web-ContextPath: org.argeo.server.jcr.webapp
-Bundle-Vendor: Argeo
-Import-Package: javax.jcr,
- javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.argeo.jackrabbit.remote,
- org.argeo.jcr,
- org.springframework.osgi.web.context.support;version="1.2.1",
- org.springframework.security;version="2.0.6.RELEASE",
- org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
- org.springframework.web.context;version="2.5.6.SEC01",
- org.springframework.web.filter;version="2.5.6.SEC01",
- org.springframework.web.servlet.handler;version="2.5.6.SEC01"

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/applicationContext.xml
deleted file mode 100644 (file)
index 1aec32e..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,15 +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="osgi.xml" />
-       <import resource="security.xml" />
-
-       <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" />
-
-</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/osgi.xml b/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/osgi.xml
deleted file mode 100644 (file)
index 80b804e..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/osgi.xml
+++ /dev/null
@@ -1,18 +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:security="http://www.springframework.org/schema/security"\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/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">\r
-\r
-       <set id="repositories" interface="javax.jcr.Repository" cardinality="0..N">\r
-               <listener ref="repositoryRegister" bind-method="register"\r
-                       unbind-method="unregister" />\r
-       </set>\r
-\r
-       <reference id="_authenticationManager"\r
-               interface="org.springframework.security.AuthenticationManager" />\r
-</beans:beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/remoting-servlet.xml b/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/remoting-servlet.xml
deleted file mode 100644 (file)
index c77def2..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/remoting-servlet.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean
-               class="org.springframework.web.servlet.handler.SimpleServletPostProcessor" />
-
-       <bean id="servletHandler"
-               class="org.springframework.web.servlet.handler.SimpleServletHandlerAdapter" />
-
-       <bean id="urlMapping"
-               class="org.argeo.server.jackrabbit.webdav.MultipleRepositoryHandlerMapping">
-               <property name="repositoryRegister" ref="repositoryRegister" />
-       </bean>
-
-</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/security.xml b/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/security.xml
deleted file mode 100644 (file)
index 2e08bfd..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/security.xml
+++ /dev/null
@@ -1,14 +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">
-
-       <security:http>
-               <security:http-basic />
-               <security:intercept-url pattern="/**"
-                       access="ROLE_USER,ROLE_ADMIN,ROLE_ANONYMOUS" />
-       </security:http>
-</beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/web.xml b/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/web.xml
deleted file mode 100644 (file)
index a2822ad..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/web.xml
+++ /dev/null
@@ -1,53 +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 Jackrabbit Webapp</display-name>
-
-       <!-- 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>
-
-       <!-- Remoting -->
-       <servlet>
-               <servlet-name>remoting</servlet-name>
-               <servlet-class>org.argeo.server.jackrabbit.webdav.ExtendedDispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>dispatchOptionsRequest</param-name>
-                       <param-value>true</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>remoting</servlet-name>
-               <url-pattern>/remoting/*</url-pattern>
-       </servlet-mapping>
-
-       <!--  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>-->
-</web-app>

diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/build.properties b/server/modules/org.argeo.server.jackrabbit.webapp.war/build.properties
deleted file mode 100644 (file)
index 5f22cdd..0000000
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/