From 7aebe7f0ce615abad3c95f30da674fbbd848b5f6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 2 Mar 2011 13:44:10 +0000
Subject: [PATCH] Put SLC in line with Commons

git-svn-id: https://svn.argeo.org/slc/trunk@4267 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.sdk.rap/pom.xml                     | 5 +++++
 dep/org.argeo.slc.dep.server/pom.xml                      | 8 +-------
 .../.project                                              | 0
 .../META-INF/MANIFEST.MF                                  | 0
 .../WEB-INF/ajaxplorer-servlet.xml                        | 0
 .../WEB-INF/applicationContext.xml                        | 0
 .../WEB-INF/doc-servlet.xml                               | 0
 .../WEB-INF/jcr-manager-servlet.xml                       | 0
 .../WEB-INF/jcr-servlet.xml                               | 0
 .../WEB-INF/osgi.xml                                      | 0
 .../WEB-INF/provisioning-servlet.xml                      | 0
 .../WEB-INF/security.xml                                  | 0
 .../WEB-INF/slc-service-servlet.xml                       | 0
 .../WEB-INF/web.xml                                       | 0
 .../WEB-INF/webdav-config.xml                             | 0
 .../WEB-INF/webdav-servlet.xml                            | 0
 .../WEB-INF/xslt/resultView.xsl                           | 0
 .../WEB-INF/xslt/resultXmlView.xsl                        | 0
 .../WEB-INF/xslt/resultXsltView.xsl                       | 0
 .../WEB-INF/xslt/viewXml.xsl                              | 0
 20 files changed, 6 insertions(+), 7 deletions(-)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/.project (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/META-INF/MANIFEST.MF (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/ajaxplorer-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/applicationContext.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/doc-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/jcr-manager-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/jcr-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/osgi.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/provisioning-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/security.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/slc-service-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/web.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/webdav-config.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/webdav-servlet.xml (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/xslt/resultView.xsl (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/xslt/resultXmlView.xsl (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/xslt/resultXsltView.xsl (100%)
 rename modules/server/{org.argeo.slc.webapp.war => org.argeo.slc.webapp}/WEB-INF/xslt/viewXml.xsl (100%)

diff --git a/dep/org.argeo.slc.dep.sdk.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
index b6a313e4b..5c3cd0344 100644
--- a/dep/org.argeo.slc.dep.sdk.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -24,6 +24,11 @@
 			<artifactId>org.argeo.slc.client.rap</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ui.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 199f2e00d..3f83e8e8e 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -52,15 +52,9 @@
 		</dependency>
 
 		<!-- Commons -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.modules</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.modules</artifactId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
diff --git a/modules/server/org.argeo.slc.webapp.war/.project b/modules/server/org.argeo.slc.webapp/.project
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/.project
rename to modules/server/org.argeo.slc.webapp/.project
diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
rename to modules/server/org.argeo.slc.webapp/META-INF/MANIFEST.MF
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/ajaxplorer-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/ajaxplorer-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/ajaxplorer-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/ajaxplorer-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/applicationContext.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/doc-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/doc-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-manager-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/jcr-manager-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-manager-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/jcr-manager-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/jcr-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/jcr-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/osgi.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/osgi.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/provisioning-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/provisioning-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/provisioning-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/provisioning-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/security.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/security.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/slc-service-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/slc-service-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/web.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/webdav-config.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/webdav-config.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/webdav-config.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/webdav-config.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/webdav-servlet.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/webdav-servlet.xml
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/webdav-servlet.xml
rename to modules/server/org.argeo.slc.webapp/WEB-INF/webdav-servlet.xml
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl b/modules/server/org.argeo.slc.webapp/WEB-INF/xslt/resultView.xsl
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl
rename to modules/server/org.argeo.slc.webapp/WEB-INF/xslt/resultView.xsl
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXmlView.xsl b/modules/server/org.argeo.slc.webapp/WEB-INF/xslt/resultXmlView.xsl
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXmlView.xsl
rename to modules/server/org.argeo.slc.webapp/WEB-INF/xslt/resultXmlView.xsl
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXsltView.xsl b/modules/server/org.argeo.slc.webapp/WEB-INF/xslt/resultXsltView.xsl
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/resultXsltView.xsl
rename to modules/server/org.argeo.slc.webapp/WEB-INF/xslt/resultXsltView.xsl
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl b/modules/server/org.argeo.slc.webapp/WEB-INF/xslt/viewXml.xsl
similarity index 100%
rename from modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl
rename to modules/server/org.argeo.slc.webapp/WEB-INF/xslt/viewXml.xsl
-- 
2.39.2