From c95ab41f84b0cf5394e1041b6ff52fd6019aa2e6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 17 Jan 2015 19:02:47 +0000
Subject: [PATCH] Reduce CMS size

git-svn-id: https://svn.argeo.org/commons/trunk@7684 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.dep.cms/pom.xml                 | 169 +++++++++++++++++-
 dep/org.argeo.security.dep.node/pom.xml       |  16 +-
 org.argeo.cms/bnd.bnd                         |   3 +-
 .../JcrPersistentTokenRepository.java         |  45 -----
 org.argeo.server.jackrabbit/bnd.bnd           |   1 -
 org.argeo.server.jackrabbit/pom.xml           |   8 +-
 org.argeo.server.jcr.mvc/bnd.bnd              |   2 +
 .../AbstractJackrabbitHandlerMapping.java     |   0
 .../remote/ExtendedDispatcherServlet.java     |   0
 .../jackrabbit/remote/IOHandlerWrapper.java   |   0
 .../jackrabbit/remote/IOManagerBean.java      |   0
 .../remote/JcrRemotingHandlerMapping.java     |   0
 .../jackrabbit/remote/JcrRemotingServlet.java |   0
 .../remote/OpenInViewSessionProvider.java     |   0
 .../remote/ScopedSessionProvider.java         |   0
 .../remote/SimpleSessionProvider.java         |   0
 .../remote/SimpleWebdavHandlerMapping.java    |   0
 .../remote/SimpleWebdavServlet.java           |   0
 18 files changed, 179 insertions(+), 65 deletions(-)
 delete mode 100644 org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/IOHandlerWrapper.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/IOManagerBean.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/JcrRemotingServlet.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/SimpleSessionProvider.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java (100%)
 rename {org.argeo.server.jackrabbit => org.argeo.server.jcr.mvc}/src/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java (100%)

diff --git a/dep/org.argeo.dep.cms/pom.xml b/dep/org.argeo.dep.cms/pom.xml
index f69418c5a..28ccd858f 100644
--- a/dep/org.argeo.dep.cms/pom.xml
+++ b/dep/org.argeo.dep.cms/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
@@ -47,14 +48,56 @@
 			<version>2.1.13-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Minimal web target platform -->
+		<!-- Complete target platform -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.dep.node</artifactId>
 			<type>pom</type>
 			<version>2.1.13-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Third parties -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
 			<exclusions>
+				<!-- Equinox -->
+				<exclusion>
+					<groupId>org.argeo.tp.rap</groupId>
+					<artifactId>org.eclipse.equinox.security</artifactId>
+				</exclusion>
+				<!-- Databinding -->
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>com.ibm.icu.base</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.jface.databinding</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.core.databinding</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.core.databinding.observable</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.core.databinding.property</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.core.databinding.beans</artifactId>
+				</exclusion>
+
 				<!-- Workbench -->
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>javax.xml</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.rap.ui.workbench</artifactId>
@@ -79,7 +122,129 @@
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.help</artifactId>
 				</exclusion>
+
+				<!-- Spring -->
+				<exclusion>
+					<groupId>org.argeo.tp.spring</groupId>
+					<artifactId>org.springframework.jdbc</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring</groupId>
+					<artifactId>org.springframework.web</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring</groupId>
+					<artifactId>org.springframework.web.servlet</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring</groupId>
+					<artifactId>org.springframework.ldap</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring</groupId>
+					<artifactId>org.springframework.aspects</artifactId>
+				</exclusion>
+
+				<!-- Spring Security -->
+				<exclusion>
+					<groupId>org.argeo.tp.spring.security</groupId>
+					<artifactId>org.springframework.security.aspects</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring.security</groupId>
+					<artifactId>org.springframework.security.ldap</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring.security</groupId>
+					<artifactId>org.springframework.security.web</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.spring.security</groupId>
+					<artifactId>org.springframework.security.config</artifactId>
+				</exclusion>
+
+				<!-- Apache -->
+				<exclusion>
+					<groupId>org.argeo.tp.apache</groupId>
+					<artifactId>org.apache.tika.parser</artifactId>
+				</exclusion>
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.apache.commons</groupId> -->
+				<!-- <artifactId>org.apache.commons.vfs</artifactId> -->
+				<!-- </exclusion> -->
+
+				<!-- Bouncycastle -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+				<!-- <artifactId>bcpkix</artifactId> -->
+				<!-- </exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+				<!-- <artifactId>bcmail</artifactId> -->
+				<!-- </exclusion> -->
+
+				<!-- Misc -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp</groupId> -->
+				<!-- <artifactId>org.junit</artifactId> -->
+				<!-- </exclusion> -->
+				<exclusion>
+					<groupId>org.argeo.tp</groupId>
+					<artifactId>org.joda.time</artifactId>
+				</exclusion>
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.javax</groupId> -->
+				<!-- <artifactId>javax.mail</artifactId> -->
+				<!-- </exclusion> -->
+				<exclusion>
+					<groupId>org.argeo.tp</groupId>
+					<artifactId>org.objectweb.asm</artifactId>
+				</exclusion>
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp</groupId> -->
+				<!-- <artifactId>com.jcraft.jsch</artifactId> -->
+				<!-- </exclusion> -->
+
+				<!-- Require org.springframework.core repackaging -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp</groupId> -->
+				<!-- <artifactId>org.aspectj.weaver</artifactId> -->
+				<!-- </exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+				<!-- <artifactId>org.apache.ant</artifactId> -->
+				<!-- </exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+				<!-- <artifactId>org.apache.ant.launch</artifactId> -->
+				<!-- </exclusion> -->
 			</exclusions>
 		</dependency>
+
 	</dependencies>
+	<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>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.security.dep.node/pom.xml b/dep/org.argeo.security.dep.node/pom.xml
index 559ca8c8d..27efb4fa1 100644
--- a/dep/org.argeo.security.dep.node/pom.xml
+++ b/dep/org.argeo.security.dep.node/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
@@ -82,19 +83,6 @@
 			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
 			<version>2.1.13-SNAPSHOT</version>
 		</dependency>
-
-		<!-- Security (Standalone) -->
-		<!--  <dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.dao.os</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
- -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>2.1.13-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index 149e66fde..48343c42d 100644
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -6,6 +6,5 @@ Import-Package: org.springframework.core,\
 				javax.jcr.security,\
 				org.eclipse.swt.widgets;version="0.0.0",\
 				org.eclipse.rap.*;resolution:=optional,\
+				org.argeo.jackrabbit.*;resolution:=optional,\
 				*
-# Useless
-#Private-Package: org.argeo.cms.internal.*
\ No newline at end of file
diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java b/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java
deleted file mode 100644
index a573b6ae2..000000000
--- a/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java
+++ /dev/null
@@ -1,45 +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.jcr.rememberme;
-
-import java.util.Date;
-
-import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken;
-import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
-
-public class JcrPersistentTokenRepository implements PersistentTokenRepository {
-
-	public void createNewToken(PersistentRememberMeToken token) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void updateToken(String series, String tokenValue, Date lastUsed) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public PersistentRememberMeToken getTokenForSeries(String seriesId) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void removeUserTokens(String username) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/org.argeo.server.jackrabbit/bnd.bnd b/org.argeo.server.jackrabbit/bnd.bnd
index df9b79b1b..785086f75 100644
--- a/org.argeo.server.jackrabbit/bnd.bnd
+++ b/org.argeo.server.jackrabbit/bnd.bnd
@@ -1,6 +1,5 @@
 Import-Package: javax.servlet,\
 org.apache.jackrabbit.webdav.server,\
-org.springframework.web.context,\
 org.osgi.framework;version="0.0.0",\
 org.xml.sax;version="0.0.0",\
 org.apache.jackrabbit.webdav.jcr,\
diff --git a/org.argeo.server.jackrabbit/pom.xml b/org.argeo.server.jackrabbit/pom.xml
index 3ba4cc80b..c42cc6c00 100644
--- a/org.argeo.server.jackrabbit/pom.xml
+++ b/org.argeo.server.jackrabbit/pom.xml
@@ -17,9 +17,15 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.jcr.mvc</artifactId>
+			<artifactId>org.argeo.server.jcr</artifactId>
 			<version>2.1.13-SNAPSHOT</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.commons</groupId> -->
+<!-- 			<artifactId>org.argeo.server.jcr.mvc</artifactId> -->
+<!-- 			<version>2.1.13-SNAPSHOT</version> -->
+<!-- 			<scope>compile</scope> -->
+<!-- 		</dependency> -->
 
 		<!-- Jackrabbit -->
 <!-- 		<dependency> -->
diff --git a/org.argeo.server.jcr.mvc/bnd.bnd b/org.argeo.server.jcr.mvc/bnd.bnd
index b26c2e3ce..ce63cf68a 100644
--- a/org.argeo.server.jcr.mvc/bnd.bnd
+++ b/org.argeo.server.jcr.mvc/bnd.bnd
@@ -4,4 +4,6 @@ javax.xml.transform.*;version="0.0.0",\
 javax.xml.parsers.*;version="0.0.0",\
 org.w3c.dom.*;version="0.0.0",\
 org.xml.sax.*;version="0.0.0",\
+org.apache.jackrabbit.server.remoting.davex,\
+org.apache.jackrabbit.webdav.server,\
 *
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/AbstractJackrabbitHandlerMapping.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/IOHandlerWrapper.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/IOHandlerWrapper.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/IOHandlerWrapper.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/IOHandlerWrapper.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/IOManagerBean.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/IOManagerBean.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/IOManagerBean.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/IOManagerBean.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/JcrRemotingHandlerMapping.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/JcrRemotingServlet.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/JcrRemotingServlet.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/JcrRemotingServlet.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/JcrRemotingServlet.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/OpenInViewSessionProvider.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/SimpleSessionProvider.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/SimpleSessionProvider.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/SimpleSessionProvider.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/SimpleSessionProvider.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/SimpleWebdavHandlerMapping.java
diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java b/org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java
similarity index 100%
rename from org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java
rename to org.argeo.server.jcr.mvc/src/org/argeo/jackrabbit/remote/SimpleWebdavServlet.java
-- 
2.30.2