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 168cdbac3a237a2e4f249045256a9fb8f7dd95cb..0b18cd066f045cb9e3f2ddfd0e510001c93cd1a6 100644 (file)
--- 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 c770fe77a5ea8111c81d6a511af9e48cac06baee..9180f70d5fc61b7d9954cd177662444e07514ba7 100644 (file)
--- 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 e95bbc2e51d10251e688ea803ae0cda6ec063f91..bb61a8fee6e591b389c10041ddba006101bd011a 100644 (file)
--- 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 805536e81bc5fc52840f0f894c8395638d94f390..50e07d8322b770a7a233a803ca98fa2460457ae4 100644 (file)
--- 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 144add1e426ff7f4340570dd12f283a9e2fbc6ae..ed07797ce450866272f412f302ca87b6abeb0e22 100644 (file)
--- 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 b96ebfe107e06ca6b1134bf19b87c2580c80de5d..5c274b175bfc4f4800e82c21ac8f95d8e05600d9 100644 (file)
--- 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 ba07660cef4509b511199cd3e576fce31144de54..fa115ac0de4d3be9e5833cde144eb7acf474596b 100644 (file)
--- 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 223bbd9c7cd292340c4d73ae9b16f40d61a742e8..f3aa7993775def4cf1be1e48d3af0e362793fcc5 100644 (file)
--- 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 80ebb981b9f466dae085994c2586f731b2721f86..3888018a5bba29c094670efa7420397f0a2a128e 100644 (file)
--- 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 91eeea70fdbdebeeafe59670788f709baa795366..e77321ae40aff74e432e7ee11c72c516e329a39e 100644 (file)
--- 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 78701c1b72838e7d59bad6a80b4f56ca88bd849c..90b6df90dc313abeef37d73da0090b42fc364d8b 100644 (file)
--- 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 8c36088684a36ddbd181fbab2ae897c044c9df9e..92fc80df52ab64f7a547735f1d53279080b56c91 100644 (file)
--- 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 (file)
index 0000000..70710ea
--- /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 (file)
index 0000000..39d17be
--- /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 (file)
index 0000000..493a6b8
--- /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"?>\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
+       <reference id="repository" interface="javax.jcr.Repository" />\r
+</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 (file)
index 0000000..058c18c
--- /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 cfad16d8fa75ccf11307d6f2fd76a35941965447..abcbf4d5682ade7462d7b3bac879c0a394893683 100644 (file)
--- 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 5eddd9bc6db56c77e36bb0f4f76e5cee180ee4b9..c368b79bb081d6edd4f8d82861709522dc477403 100644 (file)
--- 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 3af97decdd3157baaef22d268365edb074fad696..f3087d0478980f31186ded7898747a2ec11d0824 100644 (file)
--- 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 a92061b37bfc878f0fb3228c119cff36adcad7cf..cbc5c115ea81bb2bdb45e764e463ac44ef078fcf 100644 (file)
--- 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