You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by jc...@apache.org on 2006/12/11 22:30:19 UTC
svn commit: r485878 - in /directory/trunks/apacheds/osgi/core-osgi: pom.xml
src/main/java/org/apache/ldap/server/Activator.java
Author: jconlon
Date: Mon Dec 11 13:30:18 2006
New Revision: 485878
URL: http://svn.apache.org/viewvc?view=rev&rev=485878
Log:
Updated to 1.5.0 SNAPSHOT.
Updated pom to use the new felix osgi plugin.
Modified:
directory/trunks/apacheds/osgi/core-osgi/pom.xml
directory/trunks/apacheds/osgi/core-osgi/src/main/java/org/apache/ldap/server/Activator.java
Modified: directory/trunks/apacheds/osgi/core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/osgi/core-osgi/pom.xml?view=diff&rev=485878&r1=485877&r2=485878
==============================================================================
--- directory/trunks/apacheds/osgi/core-osgi/pom.xml (original)
+++ directory/trunks/apacheds/osgi/core-osgi/pom.xml Mon Dec 11 13:30:18 2006
@@ -4,14 +4,14 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>build</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>apacheds-core-osgi</artifactId>
<name>ApacheDS JNDI Backing Store</name>
<description>
The ApacheDS JNDI Backing Store packaged as an OSGi bundle.
</description>
- <packaging>osgi-bundle</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -51,30 +51,19 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <osgiManifest>
- <bundleName>ApacheDS JNDI Backing Store Bundle</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleCategory>Network Service</bundleCategory>
- <bundleDescription>
- A bundle that registers the Apache Directory JNDI provider backing store.
- </bundleDescription>
- <bundleActivator>
- org.apache.ldap.server.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework,com.sun.jndi.ldap,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,org.apache.commons.collections,org.apache.directory.shared.asn1.primitives,org.apache.directory.shared.ldap,org.apache.directory.shared.ldap.aci,org.apache.directory.shared.ldap.codec.util,org.apache.directory.shared.ldap.exception,org.apache.directory.shared.ldap.filter,org.apache.directory.shared.ldap.ldif,org.apache.directory.shared.ldap.message,org.apache.directory.shared.ldap.name,org.apache.directory.shared.ldap.schema,org.apache.directory.shared.ldap.subtree,org.apache.directory.shared.ldap.util,org.slf4j,org.apache.directory.shared.ldap.trigger
- </importPackage>
- <exportPackage>
- org.apache.directory.server.core,org.apache.directory.server.core.authn,org.apache.directory.server.core.configuration,org.apache.directory.server.core.jndi,org.apache.directory.server.core.partition,org.apache.directory.server.core.partition.impl.btree,org.apache.directory.server.core.partition.impl.btree.gui,org.apache.directory.server.core.schema.bootstrap
- </exportPackage>
- </osgiManifest>
- </configuration>
- </plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>*</Export-Package>
+ <Import-Package>!javax.swing,!javax.swing.*,*</Import-Package>
+ <DynamicImport-Package>antlr</DynamicImport-Package>
+ <Bundle-Activator>org.apache.ldap.server.Activator</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: directory/trunks/apacheds/osgi/core-osgi/src/main/java/org/apache/ldap/server/Activator.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/osgi/core-osgi/src/main/java/org/apache/ldap/server/Activator.java?view=diff&rev=485878&r1=485877&r2=485878
==============================================================================
--- directory/trunks/apacheds/osgi/core-osgi/src/main/java/org/apache/ldap/server/Activator.java (original)
+++ directory/trunks/apacheds/osgi/core-osgi/src/main/java/org/apache/ldap/server/Activator.java Mon Dec 11 13:30:18 2006
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.core.jndi.CoreContextFactory;
@@ -124,7 +124,7 @@
{
MutableStartupConfiguration config = new MutableStartupConfiguration();
- MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
+ MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
partConfig.setName( "example" );
HashSet indices = new HashSet();