You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/11/22 18:30:53 UTC
svn commit: r1205092 - in /directory/studio/branches/studio-osgi: ./
libraries/ libraries/org.apache.directory.server.config/
libraries/org.apache.directory.server.core.api/
libraries/org.apache.directory.server.core.avl/
libraries/org.apache.directory...
Author: pamarcelot
Date: Tue Nov 22 17:30:50 2011
New Revision: 1205092
URL: http://svn.apache.org/viewvc?rev=1205092&view=rev
Log:
Reworked the pom.xml of ApacheDS rebranded plugins.Added two new libraries plugins:
- org.apache.felix.ipojo
- org.apache.felix.ipojo.annotations
Added:
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo.annotations/
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo.annotations/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml
Modified:
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.config/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.api/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.avl/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.constants/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.i18n/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.ldif.partition/pom.xml
directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.xdbm.partition/pom.xml
directory/studio/branches/studio-osgi/libraries/pom.xml
directory/studio/branches/studio-osgi/pom.xml
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.config/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.config/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.config/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.config/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,20 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.config.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
@@ -192,6 +186,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.ldif.partition</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.xdbm.partition</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.api/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.api/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,26 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.core.api.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
@@ -134,6 +122,10 @@
<artifactId>apacheds-core-api</artifactId>
<exclusions>
<exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
</exclusion>
@@ -142,22 +134,6 @@
<artifactId>apacheds-i18n</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-api</artifactId>
</exclusion>
@@ -167,7 +143,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>shared-ldap-client-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
@@ -175,6 +151,10 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</exclusion>
<exclusion>
@@ -186,8 +166,8 @@
<artifactId>shared-util</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
@@ -206,27 +186,27 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.collections</artifactId>
+ <artifactId>org.apache.commons.lang</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.io</artifactId>
+ <artifactId>org.apache.directory.server.core.constants</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
+ <artifactId>org.apache.directory.server.i18n</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.server.core.constants</artifactId>
+ <artifactId>org.apache.mina.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.server.i18n</artifactId>
+ <artifactId>org.slf4j.api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -236,22 +216,22 @@
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>shared-i18n</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
+ <artifactId>shared-ldap-client-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>shared-ldap-codec-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>shared-ldap-extras-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -269,16 +249,6 @@
<artifactId>shared-util</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.avl/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.avl/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.avl/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,16 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.core.avl.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.constants/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.constants/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core.constants/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,12 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.constants.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.core/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,27 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.extras.trigger;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.bouncycastle.bcprov.jdk15;bundle-version="${org.bouncycastle.bcprov.jdk15.version}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.core.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.i18n/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.i18n/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.i18n/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,12 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.i18n.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.ldif.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.ldif.partition/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.ldif.partition/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.ldif.partition/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,22 +86,14 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.server.core;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.core.partition.ldif.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
Modified: directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.xdbm.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.xdbm.partition/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.xdbm.partition/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.directory.server.xdbm.partition/pom.xml Tue Nov 22 17:30:50 2011
@@ -86,20 +86,17 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.core.avl;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <_exportcontents>!lib,*</_exportcontents>
- <Import-Package>!</Import-Package>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.directory.server.core.partition.impl.avl.*;version=${project.version};-noimport:=true,
+ org.apache.directory.server.core.partition.impl.btree.*;version=${project.version};-noimport:=true,
+ org.apache.directory.server.log.*;version=${project.version};-noimport:=true,
+ org.apache.directory.server.xdbm.*;version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
<executions>
@@ -164,6 +161,10 @@
<artifactId>shared-util</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
Added: directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo.annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo.annotations/pom.xml?rev=1205092&view=auto
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo.annotations/pom.xml (added)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo.annotations/pom.xml Tue Nov 22 17:30:50 2011
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.apache.directory.studio</groupId>
+ <artifactId>parent-libraries</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <version>${org.apache.felix.ipojo.annotations.version}</version>
+
+ <name>Apache Felix iPOJO Annotations (for Apache Directory Studio)</name>
+ <packaging>jar</packaging>
+
+ <description />
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <createManifest>true</createManifest>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-jar-package</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- MANIFEST.MF Generation -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Directory>lib</Embed-Directory>
+ <Embed-StripGroup>true</Embed-StripGroup>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>
+ org.apache.felix.ipojo.annotations.*;version=${project.version};-noimport:=true,
+ org.apache.felix.ipojo.handler.temporal.*;version=${project.version};-noimport:=true,
+ org.apache.felix.ipojo.handlers.jmx.*;version=${project.version};-noimport:=true,
+ org.apache.felix.ipojo.extender.*;version=${project.version};-noimport:=true,
+ org.apache.felix.ipojo.whiteboard.*;version=${project.version};-noimport:=true,
+ org.apache.felix.ipojo.handlers.event.*;version=${project.version};-noimport:=true,
+ org.apache.felix.ipojo.transaction.*;version=${project.version};-noimport:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- No tests to run -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml?rev=1205092&view=auto
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml (added)
+++ directory/studio/branches/studio-osgi/libraries/org.apache.felix.ipojo/pom.xml Tue Nov 22 17:30:50 2011
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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.apache.directory.studio</groupId>
+ <artifactId>parent-libraries</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>${org.apache.felix.ipojo.version}</version>
+
+ <name>Apache Felix iPOJO (for Apache Directory Studio)</name>
+ <packaging>jar</packaging>
+
+ <description />
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <pde>true</pde>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <createManifest>true</createManifest>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-jar-package</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- MANIFEST.MF Generation -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Directory>lib</Embed-Directory>
+ <Embed-StripGroup>true</Embed-StripGroup>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Bundle-Activator>org.apache.felix.ipojo.Extender</Bundle-Activator>
+ <Import-Package>
+ org.osgi.framework;version=1.3, <!-- To support KF 2 -->
+ org.osgi.service.cm,
+ org.osgi.service.log,
+ !net.sourceforge.cobertura.* <!-- To support code coverage -->
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.ipojo.handlers.architecture,
+ org.apache.felix.ipojo.handlers.lifecycle.callback,
+ org.apache.felix.ipojo.handlers.lifecycle.controller
+ </Private-Package>
+ <Export-Package>
+ org.apache.felix.ipojo; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.metadata; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.architecture; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.parser; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.util; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.handlers.dependency; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.handlers.providedservice.*; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.handlers.configuration; version="${org.apache.felix.ipojo.version}",
+ org.apache.felix.ipojo.context; version="${org.apache.felix.ipojo.version}",
+ org.osgi.service.cm,
+ org.osgi.service.log,
+ org.objectweb.asm; version=3.0
+ </Export-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- No tests to run -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: directory/studio/branches/studio-osgi/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/libraries/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/libraries/pom.xml (original)
+++ directory/studio/branches/studio-osgi/libraries/pom.xml Tue Nov 22 17:30:50 2011
@@ -47,6 +47,8 @@
<module>org.apache.directory.server.i18n</module>
<module>org.apache.directory.server.ldif.partition</module>
<module>org.apache.directory.server.xdbm.partition</module>
+ <module>org.apache.felix.ipojo</module>
+ <module>org.apache.felix.ipojo.annotations</module>
<module>org.apache.httpcomponents.httpclient</module>
<module>org.apache.httpcomponents.httpcore</module>
<module>org.apache.logging.log4j</module>
Modified: directory/studio/branches/studio-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-osgi/pom.xml?rev=1205092&r1=1205091&r2=1205092&view=diff
==============================================================================
--- directory/studio/branches/studio-osgi/pom.xml (original)
+++ directory/studio/branches/studio-osgi/pom.xml Tue Nov 22 17:30:50 2011
@@ -76,9 +76,14 @@
<org.apache.directory.shared.validversion>1.0.0.M9-SNAPSHOT</org.apache.directory.shared.validversion>
<org.apache.directory.server.version>2.0.0-M4-SNAPSHOT</org.apache.directory.server.version>
<org.apache.directory.server.validversion>2.0.0.M4-SNAPSHOT</org.apache.directory.server.validversion>
+ <org.apache.felix.ipojo.version>1.8.0</org.apache.felix.ipojo.version>
+ <org.apache.felix.ipojo.annotations.version>1.8.0</org.apache.felix.ipojo.annotations.version>
+ <org.apache.felix.ipojo.metadata.version>1.4.0</org.apache.felix.ipojo.metadata.version>
<org.apache.mina.core.version>2.0.4</org.apache.mina.core.version>
<org.bouncycastle.bcprov.jdk15.version>140</org.bouncycastle.bcprov.jdk15.version>
<org.dom4j.version>1.6.1</org.dom4j.version>
+ <org.objectweb.asm.version>3.0</org.objectweb.asm.version>
+ <org.osgi.compendium.version>4.0.0</org.osgi.compendium.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<org.xpp3.version>1.1.3.4.O</org.xpp3.version>
<org.xpp3.validversion>1.1.340</org.xpp3.validversion>
@@ -1618,6 +1623,31 @@
<version>${org.apache.httpcomponents.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>${org.apache.felix.ipojo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <version>${org.apache.felix.ipojo.annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ <version>${org.apache.felix.ipojo.metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>${org.objectweb.asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${org.osgi.compendium.version}</version>
+ </dependency>
+ <dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>${org.xpp3.version}</version>