From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 15 Mar 2013 12:38:17 +0000 (+0000)
Subject: Improve repo webapp
X-Git-Tag: argeo-slc-2.1.7~403
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=76b746c01f6404273a7e5cc8cca77bc8a937baf4;p=gpl%2Fargeo-slc.git

Improve repo webapp

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

diff --git a/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml b/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml
index 04d5151f0..520280804 100644
--- a/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml
+++ b/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml
@@ -28,6 +28,7 @@
 	</bean>
 
 	<bean id="jcrSession" class="org.argeo.security.jcr.SecureThreadBoundSession">
+		<property name="workspace" value="localrepo" />
 		<property name="repository" ref="jcrRepository" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml b/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml
index ddb4d2ec4..948d935c5 100644
--- a/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml
+++ b/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml
@@ -20,15 +20,9 @@
 			<value>
 				CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 				PATTERN_TYPE_APACHE_ANT
-				/public/**=IS_AUTHENTICATED_ANONYMOUSLY
-				/**=ROLE_USER
+				/private/**=ROLE_USER
+				/**=IS_AUTHENTICATED_ANONYMOUSLY
 			</value>
-			<!-- <value> -->
-			<!-- CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON -->
-			<!-- PATTERN_TYPE_APACHE_ANT -->
-			<!-- /config/**=ROLE_ADMINISTRATOR -->
-			<!-- /**=IS_AUTHENTICATED_ANONYMOUSLY -->
-			<!-- </value> -->
 		</property>
 	</bean>
 
diff --git a/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml b/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml
index a998cda0d..c2a68fbfc 100644
--- a/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml
+++ b/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml
@@ -2,6 +2,9 @@
 <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">
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
 
 	<display-name>Argeo SLC Repo Webapp</display-name>
 
diff --git a/modules/org.argeo.slc.server.repo.webapp/howto.jsp b/modules/org.argeo.slc.server.repo.webapp/howto.jsp
new file mode 100644
index 000000000..a8295da4d
--- /dev/null
+++ b/modules/org.argeo.slc.server.repo.webapp/howto.jsp
@@ -0,0 +1 @@
+<h1>SLC Repository</h1>
diff --git a/modules/org.argeo.slc.server.repo.webapp/index.jsp b/modules/org.argeo.slc.server.repo.webapp/index.jsp
new file mode 100644
index 000000000..abcf57dd7
--- /dev/null
+++ b/modules/org.argeo.slc.server.repo.webapp/index.jsp
@@ -0,0 +1 @@
+You can browse public artifacts <a href="/ui/public">here</a>.
\ No newline at end of file
diff --git a/modules/org.argeo.slc.server.repo.webapp/pom.xml b/modules/org.argeo.slc.server.repo.webapp/pom.xml
index 7efdbd032..44a37ea98 100644
--- a/modules/org.argeo.slc.server.repo.webapp/pom.xml
+++ b/modules/org.argeo.slc.server.repo.webapp/pom.xml
@@ -1,4 +1,5 @@
-<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.slc</groupId>
@@ -15,7 +16,7 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Web-ContextPath>org.argeo.slc.repo.webapp</Web-ContextPath>
+						<Web-ContextPath>repo</Web-ContextPath>
 						<!-- TODO optimize -->
 						<Import-Package>
 							*,