You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by go...@apache.org on 2012/07/06 20:22:28 UTC
svn commit: r1358332 [1/2] - in
/directory/apacheds/branches/apacheds-osgi/service-osgi: components/
components/src/main/java/org/ components/src/main/java/org/apache/
components/src/main/java/org/apache/directory/
components/src/main/java/org/apache/d...
Author: gokturk
Date: Fri Jul 6 18:22:26 2012
New Revision: 1358332
URL: http://svn.apache.org/viewvc?rev=1358332&view=rev
Log:
* Creating commit for osgi launcher layout.
Added:
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AciAuthorizationInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthenticationInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthorizataionInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/CollectiveAttributeInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/EventInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ExceptionInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/KeyDerivationInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/NormalizationInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/OperationalAttributeInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/PasswordHashingInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ReferralInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SchemaInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SubentryInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/TriggerInterceptorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/AnonymousAuthenticatorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/SimpleAuthenticatorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/StringAuthenticatorOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/pPolicyConfigContainerOsgi.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/partitions/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/partitions/jdbm/
directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/servers/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.launch
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.target
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/ApacheDS.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/LdifConfigExtractor.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/Activator.java (with props)
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/resources/
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/resources/config.ldif
Modified:
directory/apacheds/branches/apacheds-osgi/service-osgi/components/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-osgi/components/pom.xml
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/pom.xml
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 6 18:22:26 2012
@@ -0,0 +1,6 @@
+.project
+.classpath
+.settings
+target
+META-INF
+*.log
Modified: directory/apacheds/branches/apacheds-osgi/service-osgi/components/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/pom.xml?rev=1358332&r1=1358331&r2=1358332&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/pom.xml Fri Jul 6 18:22:26 2012
@@ -23,14 +23,84 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-parent</artifactId>
+ <artifactId>apacheds-service-osgi</artifactId>
<version>2.0.0-M7-SNAPSHOT</version>
</parent>
<artifactId>apacheds-osgi-components</artifactId>
<name>ApacheDS OSGI Components</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<description>ApacheDS OSGI Launcher</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptor-kerberos</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-hash</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-hub-connector-ipojo-handler</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <unpackBundle>true</unpackBundle>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.osgi.components</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
+ <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;use-local-schemas=true</_plugin>
+ </instructions>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>bnd-ipojo-plugin</artifactId>
+ <version>${bnd.ipojo.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AciAuthorizationInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AciAuthorizationInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AciAuthorizationInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AciAuthorizationInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,29 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.ACI, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.COMPARE,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.HASENTRY,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME,
+ InterceptorOperation.SEARCH })
+@Component(name = "ads-interceptor-aciauthorization")
+public class AciAuthorizationInterceptorOsgi extends AciAuthorizationInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AciAuthorizationInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthenticationInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthenticationInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthenticationInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthenticationInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,47 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import java.util.Set;
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.component.handler.DirectoryProperty;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authn.Authenticator;
+import org.apache.directory.server.core.authn.ppolicy.PpolicyConfigContainer;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.AUTHN, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.BIND,
+ InterceptorOperation.COMPARE,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.GETROOTDSE,
+ InterceptorOperation.HASENTRY,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME,
+ InterceptorOperation.SEARCH,
+ InterceptorOperation.UNBIND })
+@Component(name = "ads-interceptor-authn")
+public class AuthenticationInterceptorOsgi extends AuthenticationInterceptor
+{
+ @DirectoryProperty(name = "authn-ppolicy", mandatory = true)
+ public void setPwdPolicyContainer( PpolicyConfigContainer pwdPolicyContainer )
+ {
+ super.setPwdPolicyContainer( pwdPolicyContainer );
+ }
+
+
+ @DirectoryProperty(name = "authenticators-set", mandatory = true, containertype = Authenticator.class)
+ public void setAuthenticators( Set<Authenticator> authenticators )
+ {
+ super.setAuthenticators( authenticators );
+ }
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthenticationInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthorizataionInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthorizataionInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthorizataionInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthorizataionInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,25 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.AUTHZ, operations =
+ {
+ InterceptorOperation.DELETE,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME,
+ InterceptorOperation.SEARCH })
+@Component(name = "ads-interceptor-authz")
+public class AuthorizataionInterceptorOsgi extends DefaultAuthorizationInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/AuthorizataionInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/CollectiveAttributeInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/CollectiveAttributeInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/CollectiveAttributeInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/CollectiveAttributeInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,22 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.COLLAT, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.SEARCH })
+@Component(name = "ads-interceptor-collattrib")
+public class CollectiveAttributeInterceptorOsgi extends CollectiveAttributeInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/CollectiveAttributeInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/EventInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/EventInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/EventInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/EventInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,24 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.event.EventInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.EVENT, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME })
+@Component(name = "ads-interceptor-event")
+public class EventInterceptorOsgi extends EventInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/EventInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ExceptionInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ExceptionInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ExceptionInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ExceptionInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,25 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.exception.ExceptionInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.EXCEPTION, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME })
+@Component(name = "ads-interceptor-exception")
+public class ExceptionInterceptorOsgi extends ExceptionInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ExceptionInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/KeyDerivationInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/KeyDerivationInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/KeyDerivationInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/KeyDerivationInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,17 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.KEYDRV, operations =
+ { InterceptorOperation.ADD, InterceptorOperation.MODIFY })
+@Component(name = "ads-interceptor-keydrv")
+public class KeyDerivationInterceptorOsgi extends KeyDerivationInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/KeyDerivationInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/NormalizationInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/NormalizationInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/NormalizationInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/NormalizationInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,29 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.NORM, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.BIND,
+ InterceptorOperation.COMPARE,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.HASENTRY,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME,
+ InterceptorOperation.SEARCH })
+@Component(name = "ads-interceptor-norm")
+public class NormalizationInterceptorOsgi extends NormalizationInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/NormalizationInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/OperationalAttributeInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/OperationalAttributeInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/OperationalAttributeInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/OperationalAttributeInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,25 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.OPERAT, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.LIST,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME,
+ InterceptorOperation.SEARCH })
+@Component(name = "ads-interceptor-operattrib")
+public class OperationalAttributeInterceptorOsgi extends OperationalAttributeInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/OperationalAttributeInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/PasswordHashingInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/PasswordHashingInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/PasswordHashingInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/PasswordHashingInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,30 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.component.handler.DirectoryProperty;
+import org.apache.directory.server.core.hash.PasswordHashingInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.PASSHASH, operations =
+ { InterceptorOperation.ADD, InterceptorOperation.MODIFY })
+@Component(name = "ads-interceptor-passwordhashing")
+public class PasswordHashingInterceptorOsgi extends PasswordHashingInterceptor
+{
+
+ protected PasswordHashingInterceptorOsgi( String name, LdapSecurityConstants algorithm )
+ {
+ super( name, algorithm );
+ }
+
+
+ public PasswordHashingInterceptorOsgi( @DirectoryProperty(name = "ads-hashing-algorithm") String algorithm )
+ {
+ this( "PasswordHashingInterceptorOsgi", LdapSecurityConstants.valueOf( algorithm ) );
+ }
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/PasswordHashingInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ReferralInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ReferralInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ReferralInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ReferralInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,23 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.REFERRAL, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME })
+@Component(name = "ads-interceptor-referral")
+public class ReferralInterceptorOsgi extends ReferralInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/ReferralInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SchemaInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SchemaInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SchemaInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SchemaInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,24 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.SCHEMA, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.COMPARE,
+ InterceptorOperation.LIST,
+ InterceptorOperation.LOOKUP,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.RENAME,
+ InterceptorOperation.SEARCH })
+@Component(name = "ads-interceptor-schema")
+public class SchemaInterceptorOsgi extends SchemaInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SchemaInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SubentryInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SubentryInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SubentryInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SubentryInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,25 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.SUBENTRY, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.LIST,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.SEARCH,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME })
+@Component(name = "ads-interceptor-subentry")
+public class SubentryInterceptorOsgi extends SubentryInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/SubentryInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/TriggerInterceptorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/TriggerInterceptorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/TriggerInterceptorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/TriggerInterceptorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,23 @@
+package org.apache.directory.server.osgi.components.interceptors;
+
+
+import org.apache.directory.server.component.handler.DirectoryInterceptor;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
+import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
+import org.apache.directory.server.hub.api.component.util.InterceptorOperation;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryInterceptor(interceptionPoint = InterceptionPoint.TRIGGER, operations =
+ {
+ InterceptorOperation.ADD,
+ InterceptorOperation.DELETE,
+ InterceptorOperation.MODIFY,
+ InterceptorOperation.MOVE,
+ InterceptorOperation.MOVEANDRENAME,
+ InterceptorOperation.RENAME })
+@Component(name = "ads-interceptor-trigger")
+public class TriggerInterceptorOsgi extends TriggerInterceptor
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/TriggerInterceptorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/AnonymousAuthenticatorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/AnonymousAuthenticatorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/AnonymousAuthenticatorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/AnonymousAuthenticatorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,13 @@
+
+package org.apache.directory.server.osgi.components.interceptors.util;
+
+import org.apache.directory.server.component.handler.DirectoryComponent;
+import org.apache.directory.server.core.authn.AnonymousAuthenticator;
+import org.apache.felix.ipojo.annotations.Component;
+
+@DirectoryComponent
+@Component(name="ads-authenticator-anonymous")
+public class AnonymousAuthenticatorOsgi extends AnonymousAuthenticator
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/AnonymousAuthenticatorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/SimpleAuthenticatorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/SimpleAuthenticatorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/SimpleAuthenticatorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/SimpleAuthenticatorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,13 @@
+
+package org.apache.directory.server.osgi.components.interceptors.util;
+
+import org.apache.directory.server.component.handler.DirectoryComponent;
+import org.apache.directory.server.core.authn.SimpleAuthenticator;
+import org.apache.felix.ipojo.annotations.Component;
+
+@DirectoryComponent
+@Component(name="ads-authenticator-simple")
+public class SimpleAuthenticatorOsgi extends SimpleAuthenticator
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/SimpleAuthenticatorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/StringAuthenticatorOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/StringAuthenticatorOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/StringAuthenticatorOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/StringAuthenticatorOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,13 @@
+
+package org.apache.directory.server.osgi.components.interceptors.util;
+
+import org.apache.directory.server.component.handler.DirectoryComponent;
+import org.apache.directory.server.core.authn.StrongAuthenticator;
+import org.apache.felix.ipojo.annotations.Component;
+
+@DirectoryComponent
+@Component(name="ads-authenticator-strong")
+public class StringAuthenticatorOsgi extends StrongAuthenticator
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/StringAuthenticatorOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/pPolicyConfigContainerOsgi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/pPolicyConfigContainerOsgi.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/pPolicyConfigContainerOsgi.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/pPolicyConfigContainerOsgi.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,14 @@
+package org.apache.directory.server.osgi.components.interceptors.util;
+
+
+import org.apache.directory.server.component.handler.DirectoryComponent;
+import org.apache.directory.server.core.authn.ppolicy.PpolicyConfigContainer;
+import org.apache.felix.ipojo.annotations.Component;
+
+
+@DirectoryComponent
+@Component(name = "ads-ppolicyconfigcontainer")
+public class pPolicyConfigContainerOsgi extends PpolicyConfigContainer
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/components/src/main/java/org/apache/directory/server/osgi/components/interceptors/util/pPolicyConfigContainerOsgi.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 6 18:22:26 2012
@@ -0,0 +1,6 @@
+.project
+.classpath
+.settings
+target
+META-INF
+*.log
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.launch?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.launch (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.launch Fri Jul 6 18:22:26 2012
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/OSGI"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<intAttribute key="default_start_level" value="4"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.apache.directory.server.server.integ"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx384m -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dlog4j.configuration=file:./log4j.properties"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="target_bundles" value="org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.ipojo.arch.gogo@default:default,org.apache.felix.ipojo@default:default,org.apache.mina.core@default:default,org.dom4j.dom4j@default:default,org.hamcrest.core@default:default,org.jdom@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.servlet-api-2.5@default:default,org.mortbay.jetty.util@default:default,org.objectweb.asm@default:default,org.xpp3.xpp3@default:default"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<stringAttribute key="workspace_bundles" value="org.apache.directory.jdbm.jdbm@default:default,org.apache.directory.server.annotations@default:default,org.apache.directory.server.config@default:default,org.apache.directory.server.connector.ds@default:default,org.apache.directory.server.connector.ipojo.handler@default:default,org.apache.directory.server.connector.ipojo@default:default,org.apache.directory.server.core.annotations@default:default,org.apache.directory.server.core.api@default:default,org.apache.directory.server.core.avl@default:default,org.apache.directory.server.core.constants@default:default,org.apache.directory.server.core.jndi@default:default,org.apache.directory.server.core.shared@default:default,org.apache.directory.server.core@default:default,org.apache.directory.server.dependencies@default:default,org.apache.directory.server.http.directory.bridge@default:default,org.apache.directory.server.http.integration@default:default,org.apache.directory.server.hub.a
pi@default:default,org.apache.directory.server.hub.core@default:default,org.apache.directory.server.i18n@default:default,org.apache.directory.server.interceptor.kerberos@default:default,org.apache.directory.server.interceptors.admin@default:default,org.apache.directory.server.interceptors.authn@default:default,org.apache.directory.server.interceptors.authz@default:default,org.apache.directory.server.interceptors.changelog@default:default,org.apache.directory.server.interceptors.collective@default:default,org.apache.directory.server.interceptors.event@default:default,org.apache.directory.server.interceptors.exception@default:default,org.apache.directory.server.interceptors.hash@default:default,org.apache.directory.server.interceptors.journal@default:default,org.apache.directory.server.interceptors.logger@default:default,org.apache.directory.server.interceptors.normalization@default:default,org.apache.directory.server.interceptors.operational@default:default,org.apache.directo
ry.server.interceptors.referral@default:default,org.apache.directory.server.interceptors.schema@default:default,org.apache.directory.server.interceptors.subtree@default:default,org.apache.directory.server.interceptors.trigger@default:default,org.apache.directory.server.jdbm.partition@default:default,org.apache.directory.server.jndi@default:default,org.apache.directory.server.kerberos.codec@default:default,org.apache.directory.server.ldif.partition@default:default,org.apache.directory.server.osgi.components@default:default,org.apache.directory.server.osgi.launcher@default:default,org.apache.directory.server.protocol.dhcp@default:default,org.apache.directory.server.protocol.dns@default:default,org.apache.directory.server.protocol.kerberos@default:default,org.apache.directory.server.protocol.ldap@default:default,org.apache.directory.server.protocol.ntp@default:default,org.apache.directory.server.protocol.shared@default:default,org.apache.directory.server.replication@default:def
ault,org.apache.directory.server.service.builder@default:default,org.apache.directory.server.xdbm.partition@default:default,org.apache.directory.server.xdbm.tools@default:default,org.apache.directory.shared.asn1.api@default:default,org.apache.directory.shared.asn1.ber@default:default,org.apache.directory.shared.dsmlv2.engine@default:default,org.apache.directory.shared.dsmlv2.parser@default:default,org.apache.directory.shared.i18n@default:default,org.apache.directory.shared.ipojo.manager@default:default,org.apache.directory.shared.ldap.client.api@default:default,org.apache.directory.shared.ldap.codec.core@default:default,org.apache.directory.shared.ldap.extras.aci@default:default,org.apache.directory.shared.ldap.extras.codec.api@default:default,org.apache.directory.shared.ldap.extras.codec@default:default,org.apache.directory.shared.ldap.extras.sp@default:default,org.apache.directory.shared.ldap.extras.trigger@default:default,org.apache.directory.shared.ldap.extras.util@defau
lt:default,org.apache.directory.shared.ldap.model@default:default,org.apache.directory.shared.ldap.net.mina@default:default,org.apache.directory.shared.ldap.schema.converter@default:default,org.apache.directory.shared.ldap.schema@default:default,org.apache.directory.shared.util@default:default"/>
+</launchConfiguration>
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.target
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.target?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.target (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/OSGI.target Fri Jul 6 18:22:26 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="ApacheDS OSGI Platform" sequenceNumber="18">
+<locations>
+<location path="${eclipse_home}" type="Profile"/>
+<location path="${workspace_loc:apacheds-dependencies/bundles}" type="Directory"/>
+</locations>
+<includeBundles>
+<plugin id="org.apache.commons.lang" version="2.6"/>
+<plugin id="org.apache.commons.io"/>
+<plugin id="org.apache.felix.gogo.command"/>
+<plugin id="org.dom4j.dom4j"/>
+<plugin id="org.mortbay.jetty.server" version="6.1.26"/>
+<plugin id="org.xpp3.xpp3"/>
+<plugin id="org.apache.commons.collections"/>
+<plugin id="org.apache.felix.gogo.runtime"/>
+<plugin id="org.ops4j.pax.logging.pax-logging-api"/>
+<plugin id="org.apache.felix.gogo.shell"/>
+<plugin id="org.apache.commons.pool"/>
+<plugin id="org.jdom"/>
+<plugin id="org.apache.felix.ipojo.arch.gogo"/>
+<plugin id="org.apache.felix.bundlerepository"/>
+<plugin id="org.mortbay.jetty.servlet-api-2.5"/>
+<plugin id="org.objectweb.asm"/>
+<plugin id="org.hamcrest.core"/>
+<plugin id="org.apache.felix.ipojo"/>
+<plugin id="org.mortbay.jetty.util" version="6.1.26"/>
+<plugin id="org.apache.mina.core"/>
+<plugin id="org.ops4j.pax.logging.pax-logging-service"/>
+</includeBundles>
+<launcherArgs>
+<vmArgs>-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx384m</vmArgs>
+</launcherArgs>
+</target>
Modified: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/pom.xml?rev=1358332&r1=1358331&r2=1358332&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/pom.xml Fri Jul 6 18:22:26 2012
@@ -23,14 +23,80 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-parent</artifactId>
+ <artifactId>apacheds-service-osgi</artifactId>
<version>2.0.0-M7-SNAPSHOT</version>
</parent>
<artifactId>apacheds-osgi-launcher</artifactId>
<name>ApacheDS OSGI Launcher</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<description>ApacheDS OSGI Launcher</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-hub-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-hub-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-data</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <unpackBundle>true</unpackBundle>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.osgi.launcher</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/ApacheDS.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/ApacheDS.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/ApacheDS.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,7 @@
+
+package org.apache.directory.server.osgi;
+
+public class ApacheDS
+{
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/ApacheDS.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/LdifConfigExtractor.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/LdifConfigExtractor.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/LdifConfigExtractor.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,342 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.directory.server.osgi.config;
+
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Stack;
+import java.util.regex.Pattern;
+
+import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.shared.ldap.schemaextractor.impl.ResourceMap;
+import org.apache.directory.shared.util.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A class to copy the default config to the work directory of a DirectoryService instance.
+ *
+ * NOTE: much of this class code is duplicated from DefaultSchemaLdifExtractor class
+ * We should create a AbstractLdifExtractor class and move the reusable code there
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LdifConfigExtractor
+{
+
+ public static final String LDIF_CONFIG_FILE = "config.ldif";
+
+ private static final String CONFIG_SUBDIR = "config";
+
+ private static final Logger LOG = LoggerFactory.getLogger( LdifConfigExtractor.class );
+
+ // java.util.regex.Pattern is immutable so only one instance is needed for all uses.
+ private static final Pattern EXTRACT_PATTERN = Pattern.compile( ".*config"
+ + "[/\\Q\\\\E]" + "ou=config.*\\.ldif" );
+
+
+ /**
+ * Extracts the LDIF files from a Jar file or copies exploded LDIF resources.
+ *
+ * @param overwrite over write extracted structure if true, false otherwise
+ * @throws IOException if schema already extracted and on IO errors
+ */
+ public static void extract( File outputDirectory, boolean overwrite ) throws IOException
+ {
+ if ( !outputDirectory.exists() )
+ {
+ LOG.debug( "creating non existing output directory {}", outputDirectory.getAbsolutePath() );
+ if ( !outputDirectory.mkdir() )
+ {
+ throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, outputDirectory ) );
+ }
+ }
+
+ File configDirectory = new File( outputDirectory, CONFIG_SUBDIR );
+
+ if ( !configDirectory.exists() )
+ {
+ LOG.debug( "creating non existing config directory {}", configDirectory.getAbsolutePath() );
+ if ( !configDirectory.mkdir() )
+ {
+ throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, configDirectory ) );
+ }
+ }
+ else if ( !overwrite )
+ {
+ throw new IOException( I18n.err( I18n.ERR_508, configDirectory.getAbsolutePath() ) );
+ }
+
+ LOG.debug( "extracting the configuration to the directory at {}", configDirectory.getAbsolutePath() );
+
+ Map<String, Boolean> list = ResourceMap.getResources( EXTRACT_PATTERN );
+
+ for ( Entry<String, Boolean> entry : list.entrySet() )
+ {
+ if ( entry.getValue() )
+ {
+ extractFromJar( outputDirectory, entry.getKey() );
+ }
+ else
+ {
+ File resource = new File( entry.getKey() );
+ copyFile( resource, getDestinationFile( outputDirectory, resource ) );
+ }
+ }
+ }
+
+
+ /**
+ * Copies a file line by line from the source file argument to the
+ * destination file argument.
+ *
+ * @param source the source file to copy
+ * @param destination the destination to copy the source to
+ * @throws IOException if there are IO errors or the source does not exist
+ */
+ private static void copyFile( File source, File destination ) throws IOException
+ {
+ LOG.debug( "copyFile(): source = {}, destination = {}", source, destination );
+
+ if ( !destination.getParentFile().exists() )
+ {
+ if ( !destination.getParentFile().mkdirs() )
+ {
+ throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, destination.getParentFile() ) );
+ }
+ }
+
+ if ( !source.getParentFile().exists() )
+ {
+ throw new FileNotFoundException( I18n.err( I18n.ERR_509, source.getAbsolutePath() ) );
+ }
+
+ FileWriter out = new FileWriter( destination );
+ BufferedReader in = new BufferedReader( new FileReader( source ) );
+ String line;
+ while ( null != ( line = in.readLine() ) )
+ {
+ out.write( line + "\n" );
+ }
+
+ in.close();
+ out.flush();
+ out.close();
+ }
+
+
+ /**
+ * Extracts the LDIF schema resource from a Jar.
+ *
+ * @param resource the LDIF schema resource
+ * @throws IOException if there are IO errors
+ */
+ private static void extractFromJar( File outputDirectory, String resource ) throws IOException
+ {
+ byte[] buf = new byte[512];
+ InputStream in = DefaultSchemaLdifExtractor.getUniqueResourceAsStream( resource,
+ "LDIF file in config repository" );
+
+ try
+ {
+ File destination = new File( outputDirectory, resource );
+
+ /*
+ * Do not overwrite an LDIF file if it has already been extracted.
+ */
+ if ( destination.exists() )
+ {
+ return;
+ }
+
+ if ( !destination.getParentFile().exists() )
+ {
+ if ( !destination.getParentFile().mkdirs() )
+ {
+ throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
+ destination.getParentFile() ) );
+ }
+ }
+
+ FileOutputStream out = new FileOutputStream( destination );
+ try
+ {
+ while ( in.available() > 0 )
+ {
+ int readCount = in.read( buf );
+ out.write( buf, 0, readCount );
+ }
+ out.flush();
+ }
+ finally
+ {
+ out.close();
+ }
+ }
+ finally
+ {
+ in.close();
+ }
+ }
+
+
+ /**
+ * Calculates the destination file.
+ *
+ * @param resource the source file
+ * @return the destination file's parent directory
+ */
+ private static File getDestinationFile( File outputDirectory, File resource )
+ {
+ File parent = resource.getParentFile();
+ Stack<String> fileComponentStack = new Stack<String>();
+ fileComponentStack.push( resource.getName() );
+
+ while ( parent != null )
+ {
+ if ( parent.getName().equals( "config" ) )
+ {
+ // All LDIF files besides the config.ldif are under the
+ // config/config base path. So we need to add one more
+ // schema component to all LDIF files minus this config.ldif
+ fileComponentStack.push( "config" );
+
+ return assembleDestinationFile( outputDirectory, fileComponentStack );
+ }
+
+ fileComponentStack.push( parent.getName() );
+
+ if ( parent.equals( parent.getParentFile() ) || parent.getParentFile() == null )
+ {
+ throw new IllegalStateException( I18n.err( I18n.ERR_510 ) );
+ }
+
+ parent = parent.getParentFile();
+ }
+
+ throw new IllegalStateException( I18n.err( I18n.ERR_511 ) );
+ }
+
+
+ /**
+ * Assembles the destination file by appending file components previously
+ * pushed on the fileComponentStack argument.
+ *
+ * @param fileComponentStack stack containing pushed file components
+ * @return the assembled destination file
+ */
+ private static File assembleDestinationFile( File outputDirectory, Stack<String> fileComponentStack )
+ {
+ File destinationFile = outputDirectory.getAbsoluteFile();
+
+ while ( !fileComponentStack.isEmpty() )
+ {
+ destinationFile = new File( destinationFile, fileComponentStack.pop() );
+ }
+
+ return destinationFile;
+ }
+
+
+ /**
+ * extracts or overwrites the configuration LDIF file and returns the absolute path of this file
+ *
+ * @param configDir the directory where the config file should be extracted to
+ * @param overwrite flag to indicate to overwrite the config file if already present in the given config directory
+ * @return complete path of the config file on disk
+ */
+ public static String extractSingleFileConfig( File configDir, String file, boolean overwrite )
+ {
+ if ( file == null )
+ {
+ file = LDIF_CONFIG_FILE;
+ }
+
+ File configFile = new File( configDir, file );
+
+ if ( !configDir.exists() )
+ {
+ LOG.debug( "creating non existing config directory {}", configDir.getAbsolutePath() );
+ if ( !configDir.mkdir() )
+ {
+ throw new RuntimeException(
+ new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, configDir ) ) );
+ }
+ }
+ else
+ {
+ if ( configFile.exists() && !overwrite )
+ {
+ LOG.warn( "config file already exists, returning, cause overwrite flag was set to false" );
+ return configFile.getAbsolutePath();
+ }
+ }
+
+ try
+ {
+
+ URL configUrl = LdifConfigExtractor.class.getClassLoader().getResource( file );
+
+ LOG.debug( "URL of the config ldif file {}", configUrl );
+
+ InputStream in = configUrl.openStream();
+ byte[] buf = new byte[1024 * 1024];
+
+ FileWriter fw = new FileWriter( configFile );
+
+ while ( true )
+ {
+ int read = in.read( buf );
+
+ if ( read <= 0 )
+ {
+ break;
+ }
+
+ String s = Strings.utf8ToString( buf, 0, read );
+ fw.write( s );
+ }
+
+ fw.close();
+ in.close();
+
+ LOG.info( "successfully extracted the config file {}", configFile.getAbsoluteFile() );
+
+ return configFile.getAbsolutePath();
+ }
+ catch ( Exception e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/config/LdifConfigExtractor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/Activator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/Activator.java?rev=1358332&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/Activator.java (added)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/Activator.java Fri Jul 6 18:22:26 2012
@@ -0,0 +1,26 @@
+package org.apache.directory.server.osgi.launcher;
+
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+
+public class Activator implements BundleActivator
+{
+
+ @Override
+ public void start( BundleContext context ) throws Exception
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void stop( BundleContext context ) throws Exception
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/launcher/src/main/java/org/apache/directory/server/osgi/launcher/Activator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain