From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 19 Nov 2009 14:07:34 +0000 (+0000)
Subject: Improve naming and versions
X-Git-Tag: argeo-commons-2.1.30~1720
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=fe4c0d511210c4dc24136c8eefe401b159b60d44

Improve naming and versions

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

diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
index 168cdbac3..0b18cd066 100644
--- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
+++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
@@ -24,7 +24,11 @@
 					</argsToAppend>
 					<systemProperties>
 						<slc.osgi.start>
+							org.argeo.dep.osgi.jackrabbit,
 							org.springframework.osgi.extender,
+							org.springframework.osgi.web.extender,
+							org.argeo.dep.osgi.catalina.start,
+							org.argeo.server.jackrabbit.webapp,
 							org.argeo.server.jackrabbit.repo
 						</slc.osgi.start>
 						<slc.osgi.bundles>
@@ -40,7 +44,7 @@
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
-			<version>1.6.0.0002</version>
+			<version>1.6.0.0003-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
@@ -61,11 +65,25 @@
 			<version>0.1.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<!--  Commons Dep -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.tomcat</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
+		
+		<!--  -->
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.xerces</groupId>
 			<artifactId>com.springsource.org.apache.xerces</artifactId>
diff --git a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
index c770fe77a..9180f70d5 100644
--- a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
+++ b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.security.demo.log4j
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Fragment-Host: com.springsource.org.apache.log4j
diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
index e95bbc2e5..bb61a8fee 100644
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.security.manager.ldap
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Import-Package: org.argeo.security,
  org.argeo.security.ldap,
  org.springframework.ldap.core.support,
diff --git a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
index 805536e81..50e07d832 100644
--- a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.security.webapp
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Import-Package: javax.servlet,
  javax.servlet.http,
  javax.servlet.resources,
diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index 144add1e4..ed07797ce 100644
--- a/security/modules/pom.xml
+++ b/security/modules/pom.xml
@@ -3,10 +3,10 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<version>0.1.2-SNAPSHOT</version>
-		<artifactId>server</artifactId>
+		<artifactId>security</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.security</groupId>
+	<groupId>org.argeo.commons.security</groupId>
 	<artifactId>modules</artifactId>
 	<packaging>bundles</packaging>
 	<name>Commons Security Modules</name>
diff --git a/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF
index b96ebfe10..5c274b175 100644
--- a/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF
+++ b/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.server.demo.log4j
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Fragment-Host: com.springsource.org.apache.log4j
diff --git a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF
index ba07660ce..fa115ac0d 100644
--- a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF
+++ b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Web-ContextPath: org.argeo.server.demo.miniwebapp
 Bundle-SymbolicName: org.argeo.server.demo.miniwebapp
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Import-Package: javax.servlet,
  javax.servlet.http,
  javax.servlet.jsp,
diff --git a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
index 223bbd9c7..f3aa79937 100644
--- a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
+++ b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Web-ContextPath: org.argeo.server.osgi.monitor
 Bundle-SymbolicName: org.argeo.server.osgi.monitor
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Import-Package: javax.servlet,
  javax.servlet.http,
  javax.servlet.jsp,
diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
index 80ebb981b..3888018a5 100644
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.activemq.broker
 Import-Package: jabber.client;resolution:=optional,jabber.iq._private;
  resolution:=optional,jabber.iq.auth;resolution:=optional,jabber.iq.ro
diff --git a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
index 91eeea70f..e77321ae4 100644
--- a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.ads.server
 Import-Package: org.apache.directory.server.configuration,
  org.apache.directory.server.core.partition.impl.btree,
diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
index 78701c1b7..90b6df90d 100644
--- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6
  .0.16,7.0.0)"
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.catalina
 Import-Package: org.springframework.security;resolution:=optional,
  org.springframework.security.providers;resolution:=optional,
diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
index 8c3608868..92fc80df5 100644
--- a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.hsqldb
 Import-Package: org.hsqldb.jdbc,
  org.springframework.beans.factory.config
diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webapp/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..70710eaf4
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Bundle-SymbolicName: org.argeo.server.jackrabbit.webapp
+Bundle-Version: 0.1.2.SNAPSHOT
+Web-ContextPath: org.argeo.server.jackrabbit.webapp
+Import-Package: javax.jcr,
+ javax.servlet,
+ javax.servlet.http,
+ javax.servlet.resources,
+ org.apache.jackrabbit.j2ee
diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..39d17be83
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,12 @@
+<?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" />
+
+</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/osgi.xml
new file mode 100644
index 000000000..493a6b81e
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/osgi.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       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.xsd">
+
+	<reference id="repository" interface="javax.jcr.Repository" />
+</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..058c18ce4
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web.xml
@@ -0,0 +1,39 @@
+<?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>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>
+
+	<!-- Simple Webdav -->
+	<servlet>
+		<servlet-name>Webdav</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>Webdav</servlet-name>
+        <url-pattern>/repository/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
diff --git a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
index cfad16d8f..abcbf4d56 100644
--- a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Fragment-Host: org.springframework.jdbc
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.jdbc
 Import-Package: com.microsoft.sqlserver.jdbc;resolution:=optional,
  com.mysql.jdbc;resolution:=optional,
diff --git a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
index 5eddd9bc6..c368b79bb 100644
--- a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-Name: Argeo SLC MySQL
 Bundle-SymbolicName: org.argeo.server.mysql
 Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate,org.hibernate,
diff --git a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
index 3af97decd..f3087d047 100644
--- a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Fragment-Host: org.argeo.dep.osgi.catalina.start
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.tomcat
diff --git a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
index a92061b37..cbc5c115e 100644
--- a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Fragment-Host: org.springframework.osgi.web.extender
-Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.webextender
 Import-Package: org.apache.catalina,org.apache.catalina.connector