Generate modules in a standard Maven way

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

diff --git a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.dao.jackrabbit/META-INF/MANIFEST.MF
index 7a5b2ee9f384ff49f78e9b9d370558f159fc02cb..184af074b9a4a7d8820c67a42895f1e14dd490c5 100644 (file)
--- a/security/modules/org.argeo.security.dao.jackrabbit/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.dao.jackrabbit/META-INF/MANIFEST.MF
@@ -1,12 +1,18 @@
-Bundle-SymbolicName: org.argeo.security.dao.jackrabbit
-Bundle-Version: 0.3.4.SNAPSHOT
-Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
- org.argeo.security,
- org.argeo.security.core,
- org.argeo.security.jackrabbit.providers,
- org.argeo.security.jcr,
- org.springframework.beans.factory.config;specification-version="2.5.6.SEC01",
- org.springframework.security;specification-version="2.0.6.RELEASE",
- org.springframework.security.adapters;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers;specification-version="2.0.6.RELEASE"
-Bundle-Name: Security DAO Jackrabbit
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Security DAO Jackrabbit\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_125627\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: javax.jcr,org.argeo.security,org.argeo.security.core,o\r
+ rg.argeo.security.jackrabbit.providers,org.argeo.security.jcr,org.spr\r
+ ingframework.beans.factory.config,org.springframework.security,org.sp\r
+ ringframework.security.adapters,org.springframework.security.provider\r
+ s\r
+Bundle-SymbolicName: org.argeo.security.dao.jackrabbit\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/security/modules/org.argeo.security.dao.jackrabbit/pom.xml b/security/modules/org.argeo.security.dao.jackrabbit/pom.xml
new file mode 100644 (file)
index 0000000..9e44799
--- /dev/null
+++ b/security/modules/org.argeo.security.dao.jackrabbit/pom.xml
@@ -0,0 +1,12 @@
+<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.security</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+       <name>Commons Security DAO Jackrabbit</name>
+</project>
\ No newline at end of file

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF
index 9d80a53e75c99be58adaf298d608dabe77639169..9c92182ba9b5f9a739fe6de7aa45b7a45635c4eb 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Bundle-SymbolicName: org.argeo.security.dao.ldap
-Bundle-Version: 0.3.4.SNAPSHOT
-Import-Package: com.sun.jndi.ldap;resolution:=optional,
- javax.jcr;version="[2.0.0,3.0.0)",
- org.argeo.jcr,
- org.argeo.security,
- org.argeo.security.jcr,
- org.argeo.security.ldap,
- org.argeo.security.ldap.jcr,
- org.springframework.beans.factory.config,
- org.springframework.ldap.core.support,
- org.springframework.security,
- org.springframework.security.ldap,
- org.springframework.security.ldap.populator,
- org.springframework.security.providers,
- org.springframework.security.providers.encoding,
- org.springframework.security.providers.ldap,
- org.springframework.security.providers.ldap.authenticator,
- org.springframework.security.userdetails,
- org.springframework.security.userdetails.ldap
-Bundle-Name: Security DAO LDAP
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Security DAO LDAP\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_125628\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: com.sun.jndi.ldap;resolution:=optional,javax.jcr,org.a\r
+ rgeo.security,org.argeo.security.jcr,org.argeo.security.ldap,org.arge\r
+ o.security.ldap.jcr,org.springframework.beans.factory.config,org.spri\r
+ ngframework.ldap.core.support,org.springframework.security.ldap,org.s\r
+ pringframework.security.ldap.populator,org.springframework.security.p\r
+ roviders,org.springframework.security.providers.ldap,org.springframew\r
+ ork.security.providers.ldap.authenticator,org.springframework.securit\r
+ y.userdetails\r
+Bundle-SymbolicName: org.argeo.security.dao.ldap\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/security/modules/org.argeo.security.dao.ldap/pom.xml b/security/modules/org.argeo.security.dao.ldap/pom.xml
new file mode 100644 (file)
index 0000000..760563f
--- /dev/null
+++ b/security/modules/org.argeo.security.dao.ldap/pom.xml
@@ -0,0 +1,29 @@
+<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.security</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.dao.ldap</artifactId>
+       <name>Commons Security DAO LDAP</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       com.sun.jndi.ldap;resolution:=optional,
+                                                       org.springframework.ldap.core.support
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
index 1a4682ccef41d4d58a1a45460a3c39ed538249ac..0e536e12f6a2a44c9031625429807ea25c990d02 100644 (file)
--- a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
@@ -1,12 +1,17 @@
-Bundle-SymbolicName: org.argeo.security.services
-Bundle-Version: 0.3.4.SNAPSHOT
-Import-Package: org.argeo.security,
- org.argeo.security.core,
- org.springframework.beans.factory.config;specification-version="2.5.6.SEC01",
- org.springframework.security;specification-version="2.0.4.A",
- org.springframework.security.adapters;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.anonymous;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.encoding;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.rememberme;specification-version="2.0.6.RELEASE"
-Bundle-Name: Security Services
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Security Services\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_125628\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: org.argeo.security,org.argeo.security.core,org.springf\r
+ ramework.beans.factory.config,org.springframework.security,org.spring\r
+ framework.security.adapters,org.springframework.security.providers,or\r
+ g.springframework.security.providers.anonymous\r
+Bundle-SymbolicName: org.argeo.security.services\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/security/modules/org.argeo.security.services/pom.xml b/security/modules/org.argeo.security.services/pom.xml
new file mode 100644 (file)
index 0000000..17f86f0
--- /dev/null
+++ b/security/modules/org.argeo.security.services/pom.xml
@@ -0,0 +1,12 @@
+<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.security</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.services</artifactId>
+       <name>Commons Security Services</name>
+</project>
\ No newline at end of file

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 a92f784db6fad4bf0bd66431086dcaedf56e228a..3546cfbdad1173edf1ee707a00c0de1a28df5cbe 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,23 +1,22 @@
-Bundle-SymbolicName: org.argeo.security.webapp
-Bundle-Version: 0.3.4.SNAPSHOT
-Web-ContextPath: org.argeo.security.webapp
-Import-Package: javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.argeo.security,
- org.argeo.security.mvc,
- org.argeo.server.json,
- org.argeo.server.mvc,
- org.springframework.ldap.core.support,
- org.springframework.osgi.web.context.support,
- org.springframework.security,
- org.springframework.security.config,
- org.springframework.security.ui,
- org.springframework.security.ui.rememberme;specification-version="2.0.4.A",
- org.springframework.security.ui.webapp,
- org.springframework.security.userdetails;specification-version="2.0.4.A",
- org.springframework.web.context,
- org.springframework.web.context.support,
- org.springframework.web.filter,
- org.springframework.web.servlet
-Bundle-Name: Security Webapp
+Manifest-Version: 1.0\r
+Export-Package: WEB-INF\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Security Webapp\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_125629\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: javax.servlet,javax.servlet.http,javax.servlet.resourc\r
+ es,org.argeo.security,org.argeo.security.mvc,org.argeo.server.json,or\r
+ g.argeo.server.mvc,org.springframework.ldap.core.support,org.springfr\r
+ amework.osgi.web.context.support,org.springframework.security,org.spr\r
+ ingframework.security.config,org.springframework.security.ui,org.spri\r
+ ngframework.security.ui.rememberme,org.springframework.security.ui.we\r
+ bapp,org.springframework.security.userdetails,org.springframework.web\r
+ .context,org.springframework.web.context.support,org.springframework.\r
+ web.filter,org.springframework.web.servlet\r
+Bundle-SymbolicName: org.argeo.security.webapp\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/security/modules/org.argeo.security.webapp/pom.xml b/security/modules/org.argeo.security.webapp/pom.xml
new file mode 100644 (file)
index 0000000..e2adcf7
--- /dev/null
+++ b/security/modules/org.argeo.security.webapp/pom.xml
@@ -0,0 +1,47 @@
+<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.security</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.webapp</artifactId>
+       <name>Commons Security Webapp</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Web-ContextPath>org.argeo.security.webapp</Web-ContextPath>
+                                               <Import-Package>
+                                                       *,
+                                                       javax.servlet,
+                                                       javax.servlet.http,
+                                                       javax.servlet.resources,
+                                                       org.argeo.security,
+                                                       org.argeo.security.mvc,
+                                                       org.argeo.server.json,
+                                                       org.argeo.server.mvc,
+                                                       org.springframework.ldap.core.support,
+                                                       org.springframework.osgi.web.context.support,
+                                                       org.springframework.security,
+                                                       org.springframework.security.config,
+                                                       org.springframework.security.ui,
+                                                       org.springframework.security.ui.rememberme,
+                                                       org.springframework.security.ui.webapp,
+                                                       org.springframework.security.userdetails,
+                                                       org.springframework.web.context,
+                                                       org.springframework.web.context.support,
+                                                       org.springframework.web.filter,
+                                                       org.springframework.web.servlet
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index 1045006e20246f15d9555eb966dc03ef2cc9d617..85950378543e7a535300f75632cbd488c9d57086 100644 (file)
--- a/security/modules/pom.xml
+++ b/security/modules/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.commons</groupId>
@@ -8,16 +9,59 @@
        </parent>
        <groupId>org.argeo.commons.security</groupId>
        <artifactId>modules</artifactId>
-       <packaging>bundles</packaging>
+       <packaging>pom</packaging>
        <name>Commons Security Modules</name>
+       <modules>
+               <module>org.argeo.security.dao.jackrabbit</module>
+               <module>org.argeo.security.dao.ldap</module>
+               <module>org.argeo.security.services</module>
+               <module>org.argeo.security.webapp</module>
+       </modules>
        <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>pom.xml</exclude>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <extensions>true</extensions>
+                               <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
-                                       <bundlesPomArtifactId>org.argeo.security.modules</bundlesPomArtifactId>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <manifestLocation>META-INF</manifestLocation>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                                       </instructions>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/META-INF/MANIFEST.MF b/server/modules/org.argeo.ext.jackrabbit.sybase/META-INF/MANIFEST.MF
index 721c5f70acf01bfe7dfe5e5f8377427c2be43cd4..a607d262c4dabe3520564bd94173face7e0aa55a 100644 (file)
--- a/server/modules/org.argeo.ext.jackrabbit.sybase/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.ext.jackrabbit.sybase/META-INF/MANIFEST.MF
@@ -1,7 +1,18 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jackrabbit
-Bundle-SymbolicName: org.argeo.ext.jackrabbit.sybase
-Bundle-Description: provides experimental support to Sybase in Jackrabbit
-Bundle-Version: 0.3.4.SNAPSHOT
-Fragment-Host: org.argeo.dep.osgi.jackrabbit
+Manifest-Version: 1.0\r
+Private-Package: org.apache.jackrabbit.core.persistence.bundle,org.apa\r
+ che.jackrabbit.core.fs.db,org.apache.jackrabbit.core.persistence.db,o\r
+ rg.apache.jackrabbit.core.journal\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Jackrabbit Sybase Extension\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Fragment-Host: org.argeo.dep.osgi.jackrabbit\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131926\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: Provides experimental support to Sybase in Jackrab\r
+ bit\r
+Bundle-SymbolicName: org.argeo.ext.jackrabbit.sybase\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml
new file mode 100644 (file)
index 0000000..546d824
--- /dev/null
+++ b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml
@@ -0,0 +1,26 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.ext.jackrabbit.sybase</artifactId>
+       <name>Commons Server Jackrabbit Sybase Extension</name>
+       <description>Provides experimental support to Sybase in Jackrabbit</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.argeo.dep.osgi.jackrabbit</Fragment-Host>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF
index 0a2e781292b71cb259316e4cb577504f3c66f07c..a033edf8e29ecf0031934c829d16a85d417df4a0 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF
@@ -1,30 +1,26 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Webapp
-Bundle-SymbolicName: org.argeo.jackrabbit.webapp
-Bundle-Version: 0.3.4.SNAPSHOT
-Web-ContextPath: org.argeo.jcr.webapp
-Bundle-Vendor: Argeo
-DynamicImport-Package: *
-Import-Package: javax.jcr,
- javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.aopalliance.aop;version="1.0.0",
- org.argeo.jackrabbit.remote,
- org.argeo.jcr,
- org.argeo.jcr.mvc,
- org.argeo.server.mvc,
- org.springframework.aop;version="2.5.6.SEC01",
- org.springframework.aop.framework;version="2.5.6.SEC01",
- org.springframework.aop.scope;version="2.5.6.SEC01",
- org.springframework.beans.factory.config;version="2.5.6.SEC01",
- org.springframework.osgi.web.context.support;version="1.2.1",
- org.springframework.security;version="2.0.6.RELEASE",
- org.springframework.security.providers.anonymous;version="2.0.6.RELEASE",
- org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
- org.springframework.web.context;version="2.5.6.SEC01",
- org.springframework.web.filter;version="2.5.6.SEC01",
- org.springframework.web.servlet;version="2.5.6.SEC01",
- org.springframework.web.servlet.handler;version="2.5.6.SEC01",
- org.springframework.web.servlet.view;version="2.5.6.SEC01"
+Manifest-Version: 1.0\r
+Private-Package: .,WEB-INF\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Jackrabbit Webapp\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Web-ContextPath: org.argeo.jcr.webapp\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+DynamicImport-Package: *\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131927\r
+Bundle-ManifestVersion: 2\r
+Bundle-Description: JCR remoting, WebDav\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: javax.jcr,javax.servlet,javax.servlet.http,javax.servl\r
+ et.resources,org.aopalliance.aop,org.argeo.jackrabbit.remote,org.arge\r
+ o.jcr,org.argeo.jcr.mvc,org.argeo.server.mvc,org.springframework.aop,\r
+ org.springframework.aop.framework,org.springframework.aop.scope,org.s\r
+ pringframework.beans.factory.config,org.springframework.osgi.web.cont\r
+ ext.support,org.springframework.security,org.springframework.security\r
+ .providers.anonymous,org.springframework.security.ui.webapp,org.sprin\r
+ gframework.web.context,org.springframework.web.filter,org.springframe\r
+ work.web.servlet,org.springframework.web.servlet.handler,org.springfr\r
+ amework.web.servlet.view\r
+Bundle-SymbolicName: org.argeo.jackrabbit.webapp\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.jackrabbit.webapp/pom.xml b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
new file mode 100644 (file)
index 0000000..2e47cd1
--- /dev/null
+++ b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
@@ -0,0 +1,53 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.jackrabbit.webapp</artifactId>
+       <name>Commons Server Jackrabbit Webapp</name>
+       <description>JCR remoting, WebDav</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Web-ContextPath>org.argeo.jcr.webapp</Web-ContextPath>
+                                               <!-- TODO is it still necessary? -->
+                                               <DynamicImport-Package>*</DynamicImport-Package>
+                                               <Import-Package>
+                                                       *,
+                                                       javax.jcr,
+                                                       javax.servlet,
+                                                       javax.servlet.http,
+                                                       javax.servlet.resources,
+                                                       org.aopalliance.aop,
+                                                       org.argeo.jackrabbit.remote,
+                                                       org.argeo.jcr,
+                                                       org.argeo.jcr.mvc,
+                                                       org.argeo.server.mvc,
+                                                       org.springframework.aop,
+                                                       org.springframework.aop.framework,
+                                                       org.springframework.aop.scope,
+                                                       org.springframework.beans.factory.config,
+                                                       org.springframework.osgi.web.context.support,
+                                                       org.springframework.security,
+                                                       org.springframework.security.providers.anonymous,
+                                                       org.springframework.security.ui.webapp,
+                                                       org.springframework.web.context,
+                                                       org.springframework.web.filter,
+                                                       org.springframework.web.servlet,
+                                                       org.springframework.web.servlet.handler,
+                                                       org.springframework.web.servlet.view
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/MANIFEST.MF b/server/modules/org.argeo.node.repo.jackrabbit/META-INF/MANIFEST.MF
index a30e2d10e4628eebfb1529b5d3ddc2067bcb80eb..f9655adb24d178f9fc192a433c8a1b743621d56a 100644 (file)
--- a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.node.repo.jackrabbit/META-INF/MANIFEST.MF
@@ -1,19 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jackrabbit Node Repository
-Bundle-SymbolicName: org.argeo.node.repo.jackrabbit
-Bundle-Version: 0.3.4.SNAPSHOT
-Spring-ContextDISABLED: *;create-asynchronously:=false
-Import-Package: com.mysql.jdbc;version="[5.0.0,6.0.0)";resolution:=optional,
- javax.jcr;version="[2.0.0,3.0.0)",
- org.apache.jackrabbit.core;version="[2.0.0,3.0.0)",
- org.apache.jackrabbit.core.config;version="[2.0.0,3.0.0)",
- org.apache.xalan.processor,
- org.argeo.jackrabbit,
- org.argeo.jcr,
- org.argeo.security,
- org.argeo.security.core,
- org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
- org.postgresql;version="[8.0.0,9.0.0)";resolution:=optional,
- org.springframework.beans.factory.config,
- org.springframework.security;version="2.0.6.RELEASE"
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Node Repository Jackrabbit\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131928\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: Default Node Repository Based on Jackrabbit\r
+Import-Package: com.mysql.jdbc;version="[5.0.0,6.0.0)";resolution:=opt\r
+ ional,javax.jcr;version="[2.0.0,3.0.0)",org.apache.jackrabbit.core;ve\r
+ rsion="[2.0.0,3.0.0)",org.apache.jackrabbit.core.config;version="[2.0\r
+ .0,3.0.0)",org.apache.xalan.processor,org.argeo.jackrabbit,org.argeo.\r
+ jcr,org.argeo.security,org.argeo.security.core,org.h2;version="[1.0.0\r
+ ,2.0.0)";resolution:=optional,org.postgresql;version="[8.0.0,9.0.0)";\r
+ resolution:=optional,org.springframework.beans.factory.config,org.spr\r
+ ingframework.security;version="2.0.6.RELEASE"\r
+Bundle-SymbolicName: org.argeo.node.repo.jackrabbit\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.node.repo.jackrabbit/pom.xml b/server/modules/org.argeo.node.repo.jackrabbit/pom.xml
new file mode 100644 (file)
index 0000000..12ea019
--- /dev/null
+++ b/server/modules/org.argeo.node.repo.jackrabbit/pom.xml
@@ -0,0 +1,41 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+       <name>Commons Server Node Repository Jackrabbit</name>
+       <description>Default Node Repository Based on Jackrabbit</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       com.mysql.jdbc;version="[5.0.0,6.0.0)";resolution:=optional,
+                                                       javax.jcr;version="[2.0.0,3.0.0)",
+                                                       org.apache.jackrabbit.core;version="[2.0.0,3.0.0)",
+                                                       org.apache.jackrabbit.core.config;version="[2.0.0,3.0.0)",
+                                                       org.apache.xalan.processor,
+                                                       org.argeo.jackrabbit,
+                                                       org.argeo.jcr,
+                                                       org.argeo.security,
+                                                       org.argeo.security.core,
+                                                       org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
+                                                       org.postgresql;version="[8.0.0,9.0.0)";resolution:=optional,
+                                                       org.springframework.beans.factory.config,
+                                                       org.springframework.security;version="2.0.6.RELEASE"
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF
index 2ebccf1d7f7a4fdee846ecf5cd2dbf38af3a5af5..c4a19fabcb03f98339bc662e1f31c068f3f61735 100644 (file)
--- a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF
@@ -1,8 +1,15 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jackrabbit Node Repository Factory
-Bundle-SymbolicName: org.argeo.node.repofactory.jackrabbit
-Bundle-Version: 0.3.4.SNAPSHOT
-Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
- org.argeo.jackrabbit,
- org.argeo.jcr
+Manifest-Version: 1.0\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Node Repository Factory Jackrabbit\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131928\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: Default JCR repository factory based on Jackrabbit\r
+ . It provides access to aliased and remote repositories.\r
+Import-Package: javax.jcr,org.argeo.jackrabbit,org.argeo.jcr\r
+Bundle-SymbolicName: org.argeo.node.repofactory.jackrabbit\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml
new file mode 100644 (file)
index 0000000..cf8d727
--- /dev/null
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/pom.xml
@@ -0,0 +1,28 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
+       <name>Commons Server Node Repository Factory Jackrabbit</name>
+       <description>Default JCR repository factory based on Jackrabbit. It provides access to aliased and remote repositories.</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 d5582fc956a31f66f67e6a7af86d242b93ebfcdf..0f3ef0c789775a95821b695bc6da6ae43b2ef12b 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,25 +1,26 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-SymbolicName: org.argeo.server.activemq.broker
-Import-Package: ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
- ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,
- ietf.params.xml.ns.xmpp_streams;resolution:=optional,
- ietf.params.xml.ns.xmpp_tls;resolution:=optional,
- jabber.client;resolution:=optional,
- jabber.iq._private;resolution:=optional,
- jabber.iq.auth;resolution:=optional,
- jabber.iq.roster;resolution:=optional,
- org.apache.activemq.broker,
- org.apache.activemq.command;resolution:=optional,
- org.apache.activemq.store.amq,
- org.apache.activemq.transport.http;resolution:=optional,
- org.apache.activemq.util,
- org.apache.activemq.xbean,
- org.jabber.etherx.streams;resolution:=optional,
- org.jabber.protocol.disco_info;resolution:=optional,
- org.jabber.protocol.disco_items;resolution:=optional,
- org.jabber.protocol.muc;resolution:=optional,
- org.jabber.protocol.muc_user;resolution:=optional,
- org.springframework.beans.factory.config
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Name: ActiveMQ broker
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Default Active MQ Broker\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131929\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: ietf.params.xml.ns.xmpp_sasl;resolution:=optional,ietf\r
+ .params.xml.ns.xmpp_stanzas;resolution:=optional,ietf.params.xml.ns.x\r
+ mpp_streams;resolution:=optional,ietf.params.xml.ns.xmpp_tls;resoluti\r
+ on:=optional,jabber.client;resolution:=optional,jabber.iq._private;re\r
+ solution:=optional,jabber.iq.auth;resolution:=optional,jabber.iq.rost\r
+ er;resolution:=optional,org.apache.activemq.broker,org.apache.activem\r
+ q.command;resolution:=optional,org.apache.activemq.store.amq,org.apac\r
+ he.activemq.transport.http;resolution:=optional,org.apache.activemq.u\r
+ til,org.apache.activemq.xbean,org.jabber.etherx.streams;resolution:=o\r
+ ptional,org.jabber.protocol.disco_info;resolution:=optional,org.jabbe\r
+ r.protocol.disco_items;resolution:=optional,org.jabber.protocol.muc;r\r
+ esolution:=optional,org.jabber.protocol.muc_user;resolution:=optional\r
+ ,org.springframework.beans.factory.config\r
+Bundle-SymbolicName: org.argeo.server.activemq.broker\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.activemq.broker/pom.xml b/server/modules/org.argeo.server.activemq.broker/pom.xml
new file mode 100644 (file)
index 0000000..8740203
--- /dev/null
+++ b/server/modules/org.argeo.server.activemq.broker/pom.xml
@@ -0,0 +1,46 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.activemq.broker</artifactId>
+       <name>Commons Server Default Active MQ Broker</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
+                                                       ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,
+                                                       ietf.params.xml.ns.xmpp_streams;resolution:=optional,
+                                                       ietf.params.xml.ns.xmpp_tls;resolution:=optional,
+                                                       jabber.client;resolution:=optional,
+                                                       jabber.iq._private;resolution:=optional,
+                                                       jabber.iq.auth;resolution:=optional,
+                                                       jabber.iq.roster;resolution:=optional,
+                                                       org.apache.activemq.broker,
+                                                       org.apache.activemq.command;resolution:=optional,
+                                                       org.apache.activemq.store.amq,
+                                                       org.apache.activemq.transport.http;resolution:=optional,
+                                                       org.apache.activemq.util,
+                                                       org.apache.activemq.xbean,
+                                                       org.jabber.etherx.streams;resolution:=optional,
+                                                       org.jabber.protocol.disco_info;resolution:=optional,
+                                                       org.jabber.protocol.disco_items;resolution:=optional,
+                                                       org.jabber.protocol.muc;resolution:=optional,
+                                                       org.jabber.protocol.muc_user;resolution:=optional,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 8832bf0663f0a63cda4baaf9b1dcc3835dc8ad44..b649d1e92ea9ef171e9d8c191e4e19b64de48e6f 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,23 +1,26 @@
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-SymbolicName: org.argeo.server.ads.server
-Import-Package: javax.naming.directory,
- jdbm;specification-version="1.0.0",
- org.apache.directory.server.configuration,
- org.apache.directory.server.core.authn,
- org.apache.directory.server.core.authz,
- org.apache.directory.server.core.collective,
- org.apache.directory.server.core.configuration,
- org.apache.directory.server.core.event,
- org.apache.directory.server.core.exception,
- org.apache.directory.server.core.normalization,
- org.apache.directory.server.core.operational,
- org.apache.directory.server.core.partition.impl.btree,
- org.apache.directory.server.core.referral,
- org.apache.directory.server.core.schema,
- org.apache.directory.server.core.schema.bootstrap,
- org.apache.directory.server.core.subtree,
- org.apache.directory.server.jndi,
- org.apache.directory.server.ldap.support.extended,
- org.apache.directory.shared.asn1.codec,
- org.argeo.server.ads,
- org.springframework.beans.factory.config
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Default ADS LDAP Server\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131929\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: javax.naming.directory,jdbm,org.apache.directory.serve\r
+ r.configuration,org.apache.directory.server.core.authn,org.apache.dir\r
+ ectory.server.core.authz,org.apache.directory.server.core.collective,\r
+ org.apache.directory.server.core.configuration,org.apache.directory.s\r
+ erver.core.event,org.apache.directory.server.core.exception,org.apach\r
+ e.directory.server.core.normalization,org.apache.directory.server.cor\r
+ e.operational,org.apache.directory.server.core.partition.impl.btree,o\r
+ rg.apache.directory.server.core.referral,org.apache.directory.server.\r
+ core.schema,org.apache.directory.server.core.schema.bootstrap,org.apa\r
+ che.directory.server.core.subtree,org.apache.directory.server.jndi,or\r
+ g.apache.directory.server.ldap.support.extended,org.apache.directory.\r
+ shared.asn1.codec,org.argeo.server.ads,org.springframework.beans.fact\r
+ ory.config\r
+Bundle-SymbolicName: org.argeo.server.ads.server\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.ads.server/pom.xml b/server/modules/org.argeo.server.ads.server/pom.xml
new file mode 100644 (file)
index 0000000..5604b89
--- /dev/null
+++ b/server/modules/org.argeo.server.ads.server/pom.xml
@@ -0,0 +1,46 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.ads.server</artifactId>
+       <name>Commons Server Default ADS LDAP Server</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       javax.naming.directory,
+                                                       jdbm,
+                                                       org.apache.directory.server.configuration,
+                                                       org.apache.directory.server.core.authn,
+                                                       org.apache.directory.server.core.authz,
+                                                       org.apache.directory.server.core.collective,
+                                                       org.apache.directory.server.core.configuration,
+                                                       org.apache.directory.server.core.event,
+                                                       org.apache.directory.server.core.exception,
+                                                       org.apache.directory.server.core.normalization,
+                                                       org.apache.directory.server.core.operational,
+                                                       org.apache.directory.server.core.partition.impl.btree,
+                                                       org.apache.directory.server.core.referral,
+                                                       org.apache.directory.server.core.schema,
+                                                       org.apache.directory.server.core.schema.bootstrap,
+                                                       org.apache.directory.server.core.subtree,
+                                                       org.apache.directory.server.jndi,
+                                                       org.apache.directory.server.ldap.support.extended,
+                                                       org.apache.directory.shared.asn1.codec,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 37b2a42e64ee4dd1ccb1bf115190ab9e7172e814..351eb934b94d7018c004d5932c2a6928b930b869 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,19 +1,26 @@
-Manifest-Version: 1.0
-Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6
- .0.16,7.0.0)"
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-SymbolicName: org.argeo.server.catalina
-Import-Package: org.apache.commons.logging.impl;resolution:=optional,
- org.argeo.security.core;resolution:=optional,
- org.argeo.security.jcr;resolution:=optional,
- org.springframework.beans.factory.support;resolution:=optional,
- org.springframework.context.annotation;resolution:=optional,
- org.springframework.orm.jpa.support;resolution:=optional,
- org.springframework.security;resolution:=optional,
- org.springframework.security.context;resolution:=optional,
- org.springframework.security.providers;resolution:=optional,
- org.springframework.security.providers.rememberme;resolution:=optional,
- org.springframework.security.ui;resolution:=optional,
- org.springframework.security.ui.savedrequest;resolution:=optional,
- org.springframework.security.userdetails;resolution:=optional,
- org.springframework.web.context.request;resolution:=optional
+Manifest-Version: 1.0\r
+Private-Package: conf\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Default Catalina Service (Tomcat)\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Fragment-Host: com.springsource.org.apache.catalina\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131931\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: org.apache.commons.logging.impl;resolution:=optional,o\r
+ rg.argeo.security.core;resolution:=optional,org.argeo.security.jcr;re\r
+ solution:=optional,org.springframework.beans.factory.support;resoluti\r
+ on:=optional,org.springframework.context.annotation;resolution:=optio\r
+ nal,org.springframework.orm.jpa.support;resolution:=optional,org.spri\r
+ ngframework.security;resolution:=optional,org.springframework.securit\r
+ y.context;resolution:=optional,org.springframework.security.providers\r
+ ;resolution:=optional,org.springframework.security.providers.remember\r
+ me;resolution:=optional,org.springframework.security.ui;resolution:=o\r
+ ptional,org.springframework.security.ui.savedrequest;resolution:=opti\r
+ onal,org.springframework.security.userdetails;resolution:=optional,or\r
+ g.springframework.web.context.request;resolution:=optional\r
+Bundle-SymbolicName: org.argeo.server.catalina\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml
new file mode 100644 (file)
index 0000000..e914fea
--- /dev/null
+++ b/server/modules/org.argeo.server.catalina/pom.xml
@@ -0,0 +1,43 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.catalina</artifactId>
+       <name>Commons Server Default Catalina Service (Tomcat)</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>com.springsource.org.apache.catalina</Fragment-Host>
+                                               <!-- Hack for HTTP session deserialization in OSGi -->
+                                               <Import-Package>
+                                                       *,
+                                                       org.apache.commons.logging.impl;resolution:=optional,
+                                                       org.argeo.security.core;resolution:=optional,
+                                                       org.argeo.security.jcr;resolution:=optional,
+                                                       org.springframework.beans.factory.support;resolution:=optional,
+                                                       org.springframework.context.annotation;resolution:=optional,
+                                                       org.springframework.orm.jpa.support;resolution:=optional,
+                                                       org.springframework.security;resolution:=optional,
+                                                       org.springframework.security.context;resolution:=optional,
+                                                       org.springframework.security.providers;resolution:=optional,
+                                                       org.springframework.security.providers.rememberme;resolution:=optional,
+                                                       org.springframework.security.ui;resolution:=optional,
+                                                       org.springframework.security.ui.savedrequest;resolution:=optional,
+                                                       org.springframework.security.userdetails;resolution:=optional,
+                                                       org.springframework.web.context.request;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 7d12bccf529b667305055ce9dcadd9bad5e3e13c..914025917a1e4b330853c0906e17af6f0ca4f85b 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,15 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-SymbolicName: org.argeo.server.hsqldb
-Import-Package: org.hsqldb.jdbc,
- org.springframework.beans.factory.config
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Default HSQL Datasource\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131931\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: javax.sql,org.hsqldb.jdbc,org.springframework.beans.fa\r
+ ctory.config\r
+Bundle-SymbolicName: org.argeo.server.hsqldb\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.hsqldb/pom.xml b/server/modules/org.argeo.server.hsqldb/pom.xml
new file mode 100644 (file)
index 0000000..1df98b5
--- /dev/null
+++ b/server/modules/org.argeo.server.hsqldb/pom.xml
@@ -0,0 +1,27 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.hsqldb</artifactId>
+       <name>Commons Server Default HSQL Datasource</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 a7b5f693258f94b837ae43058150823e8d22e782..b6b758fbbd60895fd7c1fc48fab2456cb69ff260 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,13 +1,20 @@
-Manifest-Version: 1.0
-Fragment-Host: org.springframework.jdbc
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-SymbolicName: org.argeo.server.jdbc
-Import-Package: com.microsoft.sqlserver.jdbc;resolution:=optional,
- com.mysql.jdbc;resolution:=optional,
- net.sourceforge.jtds.jdbc;resolution:=optional,
- oracle.jdbc;resolution:=optional,
- org.apache.derby.jdbc;resolution:=optional,
- org.h2;resolution:=optional,
- org.hsqldb;resolution:=optional,
- org.postgresql;resolution:=optional
-Bundle-Name: Argeo Spring JDBC Extension
+Manifest-Version: 1.0\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Spring JDBC Drivers for OSGi\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Fragment-Host: org.springframework.jdbc\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131931\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: Makes commons JDBC drivers visible to Spring JDBC \r
+ in an OSGi runtime\r
+Import-Package: com.microsoft.sqlserver.jdbc;resolution:=optional,com.\r
+ mysql.jdbc;resolution:=optional,net.sourceforge.jtds.jdbc;resolution:\r
+ =optional,oracle.jdbc;resolution:=optional,org.apache.derby.jdbc;reso\r
+ lution:=optional,org.h2;resolution:=optional,org.hsqldb;resolution:=o\r
+ ptional,org.postgresql;resolution:=optional\r
+Bundle-SymbolicName: org.argeo.server.jdbc\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.jdbc/pom.xml b/server/modules/org.argeo.server.jdbc/pom.xml
new file mode 100644 (file)
index 0000000..2a8fc68
--- /dev/null
+++ b/server/modules/org.argeo.server.jdbc/pom.xml
@@ -0,0 +1,37 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.jdbc</artifactId>
+       <name>Commons Server Spring JDBC Drivers for OSGi</name>
+       <description>Makes commons JDBC drivers visible to Spring JDBC in an OSGi runtime</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.springframework.jdbc</Fragment-Host>
+                                               <Import-Package>
+                                                       *,
+                                                       com.microsoft.sqlserver.jdbc;resolution:=optional,
+                                                       com.mysql.jdbc;resolution:=optional,
+                                                       net.sourceforge.jtds.jdbc;resolution:=optional,
+                                                       oracle.jdbc;resolution:=optional,
+                                                       org.apache.derby.jdbc;resolution:=optional,
+                                                       org.h2;resolution:=optional,
+                                                       org.hsqldb;resolution:=optional,
+                                                       org.postgresql;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 b0889b91b3223592c7035c3fe1f060abf72de7be..df1590fe7dc2149215e3b9511566a544a117b5d1 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,9 +1,18 @@
-Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-Name: Argeo SLC MySQL
-Bundle-SymbolicName: org.argeo.server.mysql
-Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate,org.hibernate,
- org.springframework.cache.ehcache,org.springframework.jdbc.datasource
- ,org.springframework.orm.hibernate3,org.apache.commons.dbcp,org.sprin
- gframework.beans.factory.config
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Default MySQL DB Config\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131932\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate;resolution:=op\r
+ tional,org.apache.commons.dbcp,org.hibernate,org.springframework.bean\r
+ s.factory.config,org.springframework.cache.ehcache;resolution:=option\r
+ al,org.springframework.jdbc.datasource,org.springframework.orm.hibern\r
+ ate3\r
+Bundle-SymbolicName: org.argeo.server.mysql\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.mysql/pom.xml b/server/modules/org.argeo.server.mysql/pom.xml
new file mode 100644 (file)
index 0000000..4810931
--- /dev/null
+++ b/server/modules/org.argeo.server.mysql/pom.xml
@@ -0,0 +1,32 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.mysql</artifactId>
+       <name>Commons Server Default MySQL DB Config</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       com.mysql.jdbc,
+                                                       net.sf.ehcache.hibernate;resolution:=optional,
+                                                       org.springframework.cache.ehcache;resolution:=optional,
+                                                       org.springframework.jdbc.datasource,
+                                                       org.springframework.orm.hibernate3,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF
index f355f7abcddf76eb66b1bb0dce41aaf7e9c661f4..a1d40522bd54c932b2aafd86f732a2ace83f56e4 100644 (file)
--- a/server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF
@@ -1,17 +1,20 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RAP Webapp
-Bundle-Description: OSGi compatible RAP webapp
-Bundle-SymbolicName: org.argeo.server.rap.webapp
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-Vendor: Argeo
-Web-ContextPath: org.argeo.rap.webapp
-Import-Package: org.eclipse.equinox.http.servlet;version="1.1.0",
- org.springframework.osgi.web.context.support;version="1.2.1",
- org.springframework.security;version="2.0.6.RELEASE",
- org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
- org.springframework.web.context;version="2.5.6.SEC01",
- org.springframework.web.filter;version="2.5.6.SEC01",
- org.springframework.web.servlet;version="2.5.6.SEC01",
- org.springframework.web.servlet.handler;version="2.5.6.SEC01",
- org.springframework.web.servlet.mvc;version="2.5.6.SEC01"
+Manifest-Version: 1.0\r
+Private-Package: WEB-INF\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server RAP Webapp\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Web-ContextPath: org.argeo.rap.webapp\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131932\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: Integrates into OSGi HTTP registry\r
+Import-Package: org.eclipse.equinox.http.servlet,org.springframework.o\r
+ sgi.web.context.support,org.springframework.security,org.springframew\r
+ ork.security.ui.webapp,org.springframework.web.context,org.springfram\r
+ ework.web.filter,org.springframework.web.servlet,org.springframework.\r
+ web.servlet.handler,org.springframework.web.servlet.mvc\r
+Bundle-SymbolicName: org.argeo.server.rap.webapp\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.rap.webapp/pom.xml b/server/modules/org.argeo.server.rap.webapp/pom.xml
new file mode 100644 (file)
index 0000000..ee05364
--- /dev/null
+++ b/server/modules/org.argeo.server.rap.webapp/pom.xml
@@ -0,0 +1,38 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.rap.webapp</artifactId>
+       <name>Commons Server RAP Webapp</name>
+       <description>Integrates into OSGi HTTP registry</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Web-ContextPath>org.argeo.rap.webapp</Web-ContextPath>
+                                               <Import-Package>
+                                                       *,
+                                                       org.eclipse.equinox.http.servlet,
+                                                       org.springframework.osgi.web.context.support,
+                                                       org.springframework.security,
+                                                       org.springframework.security.ui.webapp,
+                                                       org.springframework.web.context,
+                                                       org.springframework.web.filter,
+                                                       org.springframework.web.servlet,
+                                                       org.springframework.web.servlet.handler,
+                                                       org.springframework.web.servlet.mvc
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

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 2d308ca52f638c7ecf1d2394d3c09ec8ba56c82d..2719360219a9866bc43a7f275b2e592e534c41e7 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,15 @@
-Manifest-Version: 1.0
-Fragment-Host: org.argeo.dep.osgi.catalina.start
-Bundle-Version: 0.3.4.SNAPSHOT
-Bundle-SymbolicName: org.argeo.server.tomcat
+Manifest-Version: 1.0\r
+Private-Package: conf,.\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Commons Server Default Tomcat configuration\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Fragment-Host: org.argeo.dep.osgi.catalina.start\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111013_131932\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: Integrates into OSGi HTTP registry\r
+Bundle-SymbolicName: org.argeo.server.tomcat\r
+Bundle-DocURL: http://www.argeo.org\r
+\r

diff --git a/server/modules/org.argeo.server.tomcat/pom.xml b/server/modules/org.argeo.server.tomcat/pom.xml
new file mode 100644 (file)
index 0000000..893ddf5
--- /dev/null
+++ b/server/modules/org.argeo.server.tomcat/pom.xml
@@ -0,0 +1,26 @@
+<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.server</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.tomcat</artifactId>
+       <name>Commons Server Default Tomcat configuration</name>
+       <description>Integrates into OSGi HTTP registry</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.argeo.dep.osgi.catalina.start</Fragment-Host>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index e605e279fd7087698542e1950f397de82ad40384..41da085b370b44e13407683b11b7fca2fc9672f4 100644 (file)
--- a/server/modules/pom.xml
+++ b/server/modules/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.commons</groupId>
@@ -8,16 +9,62 @@
        </parent>
        <groupId>org.argeo.commons.server</groupId>
        <artifactId>modules</artifactId>
-       <packaging>bundles</packaging>
+       <packaging>pom</packaging>
        <name>Commons Server Modules</name>
+       <modules>
+               <module>org.argeo.ext.jackrabbit.sybase</module>
+               <module>org.argeo.jackrabbit.webapp</module>
+               <module>org.argeo.node.repo.jackrabbit</module>
+               <module>org.argeo.node.repofactory.jackrabbit</module>
+               <module>org.argeo.server.activemq.broker</module>
+               <module>org.argeo.server.ads.server</module>
+               <module>org.argeo.server.catalina</module>
+               <module>org.argeo.server.hsqldb</module>
+               <module>org.argeo.server.jdbc</module>
+               <module>org.argeo.server.mysql</module>
+               <module>org.argeo.server.rap.webapp</module>
+               <module>org.argeo.server.tomcat</module>
+       </modules>
        <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>.*/**</exclude>
+                                       <exclude>pom.xml</exclude>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <extensions>true</extensions>
+                               <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
-                                       <bundlesPomArtifactId>org.argeo.server.modules</bundlesPomArtifactId>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Export-Package></Export-Package>
+                                       </instructions>
                                </configuration>
                        </plugin>
                </plugins>