<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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.base</groupId>
</parent>
<artifactId>org.argeo.eclipse.dep.rap</artifactId>
<name>Commons Eclipse RAP Dependencies</name>
- <properties>
- <version.rap>2.2.0-R-20131204-0942</version.rap>
- <version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
- </properties>
<build>
<plugins>
<plugin>
<artifactId>binaries</artifactId>
<version>${version.rap.addons}</version>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <!-- TODO remove OSGi runtime from addons -->
+ <groupId>org.argeo.tp.rap.addons</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.security</artifactId>
</dependency>
- <dependency>
- <groupId>org.argeo.commons.base</groupId>
- <artifactId>org.argeo.osgi.boot</artifactId>
- <version>2.1.8-SNAPSHOT</version>
- </dependency>
+ <!-- 2014-07-31 mbaudier : Removed, since it feels wrong to put an Argeo
+ dependency here -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.argeo.commons.base</groupId> -->
+ <!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
+ <!-- <version>2.1.8-SNAPSHOT</version> -->
+ <!-- </dependency> -->
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.argeo.tp.rap</groupId>
- <artifactId>binaries</artifactId>
- <version>${version.argeo-distribution}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.rap.addons</groupId>
- <artifactId>binaries</artifactId>
- <version>${version.rap.addons}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>binaries</artifactId>
- <version>${version.rap}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<profiles>
<profile>
<id>check-osgi</id>
<configuration>
<target>
<copy todir="${rpm.stagingRepository}" verbose="true">
- <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+ <fileset dir="${project.build.directory}/rpm"
+ includes="*/RPMS/**/*.rpm" />
<flattenmapper />
</copy>
</target>
</build>
<dependencies>
<dependency>
- <!-- Temporary fix the OSGI boot with Rap 2.2+ : version has been uploaded
- to 3.9.1+ that breaks JCR <version>3.9.0.v20130305-2200</version> -->
- <groupId>org.argeo.tp.rap.addons</groupId>
+ <groupId>org.argeo.tp.rap.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.9.0.v20130529-1710</version>
+ <scope>provided</scope>
</dependency>
<!-- TEST -->
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
<description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
<packaging>pom</packaging>
<properties>
+ <version.argeo-commons>2.1.8-SNAPSHOT</version.argeo-commons>
<developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
<developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
<version.argeo-distribution>1.4.0</version.argeo-distribution>
- <version.argeo-commons>2.1.8-SNAPSHOT</version.argeo-commons>
+ <version.rap>2.2.0-R-20131204-0942</version.rap>
+ <version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
<!-- RPM -->
<rpm.release>6</rpm.release>
<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- Eclipse RAP -->
+ <dependency>
+ <groupId>org.argeo.tp.rap</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.argeo-distribution}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.rap.addons</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.rap.addons}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.rap.platform</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.rap}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<repositories>
<!-- OSGi -->
<dependency>
- <groupId>org.argeo.tp</groupId>
+ <groupId>org.argeo.tp.rap.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
</dependency>
*/
package org.argeo.jackrabbit;
+import java.util.Hashtable;
import java.util.Properties;
import javax.jcr.Repository;
*/
public class OsgiJackrabbitRepositoryFactory extends
JackrabbitRepositoryFactory {
-// private final static Log log = LogFactory
-// .getLog(OsgiJackrabbitRepositoryFactory.class);
private BundleContext bundleContext;
protected void publish(String alias, Repository repository,
Properties properties) {
if (bundleContext != null) {
// do not modify reference
- Properties props = new Properties(properties);
- props.setProperty(JCR_REPOSITORY_ALIAS, alias);
+ Hashtable<String, String> props = new Hashtable<String, String>();
+ props.putAll(props);
+ props.put(JCR_REPOSITORY_ALIAS, alias);
bundleContext.registerService(Repository.class.getName(),
repository, props);
}