svn commit: r1187013 [2/12] - in /directory/apacheds/branches/apacheds-txns: ./ all/ apache-felix/ apache-felix/bundle/ apache-felix/src/ apache-felix/src/main/ apache-felix/src/main/resources/ core-annotations/ core-annotations/src/main/java/org/apach...

[el...@apache.org]

Propchange: directory/apacheds/branches/apacheds-txns/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -3,5 +3,6 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
 /directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186968
+/directory/apacheds/trunk/interceptors/all:1183435-1186974
 /directory/studio/trunk/all:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 20 19:41:49 2011
@@ -0,0 +1,5 @@
+bin
+target
+.classpath
+.project
+.settings

Added: directory/apacheds/branches/apacheds-txns/apache-felix/ApacheDS-OSGI.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/ApacheDS-OSGI.launch?rev=1187013&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-txns/apache-felix/ApacheDS-OSGI.launch (added)
+++ directory/apacheds/branches/apacheds-txns/apache-felix/ApacheDS-OSGI.launch Thu Oct 20 19:41:49 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/apache-felix"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;folder nest=&amp;quot;false&amp;quot; path=&amp;quot;/shared-ldap-extras-codec/src/main/java/org/apache/directory/shared/ldap/extras&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.folder&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDi
 rector&gt;&#10;"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.felix.main.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="apache-felix"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfelix.config.properties=file:src/main/resources/config.properties"/>
+</launchConfiguration>

Added: directory/apacheds/branches/apacheds-txns/apache-felix/Mvn-On-Trunk.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/Mvn-On-Trunk.launch?rev=1187013&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-txns/apache-felix/Mvn-On-Trunk.launch (added)
+++ directory/apacheds/branches/apacheds-txns/apache-felix/Mvn-On-Trunk.launch Thu Oct 20 19:41:49 2011
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="install"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="skipTests=true"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_25"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/apache-felix}/../.."/>
+</launchConfiguration>

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-collections-3.2.1.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-collections-3.2.1.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-collections-3.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-io-2.0.1.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-io-2.0.1.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-io-2.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-lang-2.6.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-lang-2.6.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-lang-2.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-pool-1.5.6.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-pool-1.5.6.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/commons-pool-1.5.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/jetty-6.1.26.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/jetty-6.1.26.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/jetty-6.1.26.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/jetty-util-6.1.26.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/jetty-util-6.1.26.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/jetty-util-6.1.26.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/mina-core-2.0.4.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/mina-core-2.0.4.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/mina-core-2.0.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.bundlerepository-1.6.6.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.bundlerepository-1.6.6.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.bundlerepository-1.6.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.command-0.12.0.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.command-0.12.0.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.command-0.12.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.runtime-0.10.0.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.runtime-0.10.0.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.runtime-0.10.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.shell-0.10.0.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.shell-0.10.0.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.gogo.shell-0.10.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.ipojo-1.8.0.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.ipojo-1.8.0.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.ipojo-1.8.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.ipojo.arch.gogo-1.0.1.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.ipojo.arch.gogo-1.0.1.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/org.apache.felix.ipojo.arch.gogo-1.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/pax-logging-api-1.6.3.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/pax-logging-api-1.6.3.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/pax-logging-api-1.6.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/pax-logging-service-1.6.3.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/pax-logging-service-1.6.3.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/pax-logging-service-1.6.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/servlet-api-2.5-6.1.14.jar
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/bundle/servlet-api-2.5-6.1.14.jar?rev=1187013&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/bundle/servlet-api-2.5-6.1.14.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/apacheds/branches/apacheds-txns/apache-felix/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/pom.xml?rev=1187013&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-txns/apache-felix/pom.xml (added)
+++ directory/apacheds/branches/apacheds-txns/apache-felix/pom.xml Thu Oct 20 19:41:49 2011
@@ -0,0 +1,173 @@
+<?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.
+-->
+
+<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.server</groupId>
+    <artifactId>apacheds-parent</artifactId>
+    <version>2.0.0-M4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>apache-felix</artifactId>
+  <name>Preconfigured Apache Felix</name>
+  <packaging>jar</packaging>
+
+  <description>Preconfigured Apache Felix Framework for Running and Debugging ApacheDS </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.main</artifactId>
+                  <version>4.0.1</version>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>bin</outputDirectory>
+                  <destFileName>felix.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.gogo.shell</artifactId>
+                  <version>0.10.0</version>
+                  <overWrite>true</overWrite>                  
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.bundlerepository</artifactId>
+                  <version>1.6.6</version>
+                  <overWrite>true</overWrite>                  
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.gogo.command</artifactId>
+                  <version>0.12.0</version>
+                  <overWrite>true</overWrite>                  
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.gogo.runtime</artifactId>
+                  <version>0.10.0</version>
+                  <overWrite>true</overWrite>                  
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.ipojo</artifactId>
+                  <version>1.8.0</version>
+                  <overWrite>true</overWrite>                  
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.ipojo.arch.gogo</artifactId>
+                  <version>1.0.1</version>
+                  <overWrite>true</overWrite>                  
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-io</groupId>
+                  <artifactId>commons-io</artifactId>
+                  <version>2.0.1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-lang</groupId>
+                  <artifactId>commons-lang</artifactId>
+                  <version>2.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-collections</groupId>
+                  <artifactId>commons-collections</artifactId>
+                  <version>3.2.1</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>commons-pool</groupId>
+                  <artifactId>commons-pool</artifactId>
+                  <version>1.5.6</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+                  <version>6.1.26</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+                  <version>6.1.26</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>servlet-api-2.5</artifactId>
+                  <version>6.1.14</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.ops4j.pax.logging</groupId>
+                  <artifactId>pax-logging-api</artifactId>
+                  <version>1.6.3</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.ops4j.pax.logging</groupId>
+                  <artifactId>pax-logging-service</artifactId>
+                  <version>1.6.3</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.mina</groupId>
+                  <artifactId>mina-core</artifactId>
+                  <version>${mina.core.version}</version>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>bundle</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.4.1</version>
+        <configuration>
+          <failOnError>false</failOnError>
+          <filesets>
+            <fileset>
+              <directory>.</directory>
+              <includes>
+                <include>bin/</include>
+                <include>bundle/</include>
+                <include>felix-cache/</include>
+              </includes>
+            </fileset>
+          </filesets>
+          <verbose>true</verbose>
+        </configuration>
+      </plugin>
+      
+    </plugins>
+  </build>
+
+</project>

Added: directory/apacheds/branches/apacheds-txns/apache-felix/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/apache-felix/src/main/resources/config.properties?rev=1187013&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-txns/apache-felix/src/main/resources/config.properties (added)
+++ directory/apacheds/branches/apacheds-txns/apache-felix/src/main/resources/config.properties Thu Oct 20 19:41:49 2011
@@ -0,0 +1,163 @@
+# 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.
+
+#
+# Framework config properties.
+#
+
+# To override the packages the framework exports by default from the
+# class path, set this variable.
+#org.osgi.framework.system.packages=
+
+# To append packages to the default set of exported system packages,
+# set this value.
+#org.osgi.framework.system.packages.extra=
+
+# The following property makes specified packages from the class path
+# available to all bundles. You should avoid using this property.
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+# Felix tries to guess when to implicitly boot delegate in certain
+# situations to ease integration without outside code. This feature
+# is enabled by default, uncomment the following line to disable it.
+#felix.bootdelegation.implicit=false
+
+# The following property explicitly specifies the location of the bundle
+# cache, which defaults to "felix-cache" in the current working directory.
+# If this value is not absolute, then the felix.cache.rootdir controls
+# how the absolute location is calculated. (See next property)
+#org.osgi.framework.storage=${felix.cache.rootdir}/felix-cache
+
+# The following property is used to convert a relative bundle cache
+# location into an absolute one by specifying the root to prepend to
+# the relative cache path. The default for this property is the
+# current working directory.
+#felix.cache.rootdir=${user.dir}
+
+# The following property controls whether the bundle cache is flushed
+# the first time the framework is initialized. Possible values are
+# "none" and "onFirstInit"; the default is "none".
+org.osgi.framework.storage.clean=onFirstInit
+
+# The following property determines which actions are performed when
+# processing the auto-deploy directory. It is a comma-delimited list of
+# the following values: 'install', 'start', 'update', and 'uninstall'.
+# An undefined or blank value is equivalent to disabling auto-deploy
+# processing.
+felix.auto.deploy.action=install,start
+
+# The following property specifies the directory to use as the bundle
+# auto-deploy directory; the default is 'bundle' in the working directory.
+#felix.auto.deploy.dir=bundle
+
+# The following property is a space-delimited list of bundle URLs
+# to install when the framework starts. The ending numerical component
+# is the target start level. Any number of these properties may be
+# specified for different start levels.
+#felix.auto.install.1=
+
+# The following property is a space-delimited list of bundle URLs
+# to install and start when the framework starts. The ending numerical
+# component is the target start level. Any number of these properties
+# may be specified for different start levels.
+felix.auto.start.1=\
+file:../../apacheds/dependencies/target/apacheds-dependencies-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/changelog/target/apacheds-interceptors-changelog-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/trigger/target/apacheds-interceptors-trigger-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/hash/target/apacheds-interceptors-hash-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/admin/target/apacheds-interceptors-admin-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/collective/target/apacheds-interceptors-collective-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/operational/target/apacheds-interceptors-operational-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/event/target/apacheds-interceptors-event-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/referral/target/apacheds-interceptors-referral-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/authz/target/apacheds-interceptors-authz-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/schema/target/apacheds-interceptors-schema-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/journal/target/apacheds-interceptors-journal-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/logger/target/apacheds-interceptors-logger-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/subtree/target/apacheds-interceptors-subtree-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/exception/target/apacheds-interceptors-exception-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/authn/target/apacheds-interceptors-authn-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptors/normalization/target/apacheds-interceptors-normalization-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/protocol-kerberos/target/apacheds-protocol-kerberos-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core-jndi/target/apacheds-core-jndi-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/jdbm/target/apacheds-jdbm-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/ldif-partition/target/apacheds-ldif-partition-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/server-jndi/target/apacheds-server-jndi-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/http-directory-bridge/target/apacheds-http-directory-bridge-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/xdbm-tools/target/apacheds-xdbm-tools-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/http-integration/target/apacheds-http-integration-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/xdbm-partition/target/apacheds-xdbm-partition-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/service-builder/target/apacheds-service-builder-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/kerberos-codec/target/apacheds-kerberos-codec-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/protocol-dhcp/target/apacheds-protocol-dhcp-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/protocol-ldap/target/apacheds-protocol-ldap-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core/target/apacheds-core-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/interceptor-kerberos/target/apacheds-interceptor-kerberos-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/protocol-ntp/target/apacheds-protocol-ntp-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/jdbm-partition/target/apacheds-jdbm-partition-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core-api/target/apacheds-core-api-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core-shared/target/apacheds-core-shared-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/server-config/target/apacheds-server-config-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/service-osgi/target/apacheds-service-osgi-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/server-annotations/target/apacheds-server-annotations-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/protocol-shared/target/apacheds-protocol-shared-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core-avl/target/apacheds-core-avl-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/protocol-dns/target/apacheds-protocol-dns-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/server-replication/target/apacheds-server-replication-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core-annotations/target/apacheds-core-annotations-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/core-constants/target/apacheds-core-constants-2.0.0-M4-SNAPSHOT.jar \
+file:../../apacheds/i18n/target/apacheds-i18n-2.0.0-M4-SNAPSHOT.jar \
+file:../../shared/util/target/shared-util-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/codec/standalone/target/shared-ldap-codec-standalone-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/codec/core/target/shared-ldap-codec-core-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/net/mina/target/shared-ldap-net-mina-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/client/api/target/shared-ldap-client-api-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/extras/aci/target/shared-ldap-extras-aci-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/extras/util/target/shared-ldap-extras-util-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/extras/trigger/target/shared-ldap-extras-trigger-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/extras/codec/target/shared-ldap-extras-codec-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/extras/codec-api/target/shared-ldap-extras-codec-api-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/extras/sp/target/shared-ldap-extras-sp-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/schema/data/target/shared-ldap-schema-data-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/schema/converter/target/shared-ldap-schema-converter-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/ldap/model/target/shared-ldap-model-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/asn1/ber/target/shared-asn1-ber-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/asn1/api/target/shared-asn1-api-1.0.0-M9-SNAPSHOT.jar \
+file:../../shared/i18n/target/shared-i18n-1.0.0-M9-SNAPSHOT.jar
+
+felix.log.level=1
+
+# Sets the initial start level of the framework upon startup.
+#org.osgi.framework.startlevel.beginning=1
+
+# Sets the start level of newly installed bundles.
+#felix.startlevel.bundle=1
+
+# Felix installs a stream and content handler factories by default,
+# uncomment the following line to not install them.
+#felix.service.urlhandlers=false
+
+# The launcher registers a shutdown hook to cleanly stop the framework
+# by default, uncomment the following line to disable it.
+#felix.shutdown.hook=false
+
+#
+# Bundle config properties.
+#
+
+org.osgi.service.http.port=8080
+obr.repository.url=http://felix.apache.org/obr/releases.xml
\ No newline at end of file

Propchange: directory/apacheds/branches/apacheds-txns/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -5,5 +5,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core:1160768-1164072
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
 /directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186968
+/directory/apacheds/trunk/interceptors/core:1183435-1186974
 /directory/studio/trunk/core:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -5,5 +5,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-annotations:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/interceptors/core-annotations:1183435-1186974
 /directory/studio/trunk/core-annotations:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/pom.xml Thu Oct 20 19:41:49 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-core-annotations</artifactId>
   <name>ApacheDS Core Annotations</name>
+  <packaging>bundle</packaging>
   
   <description>Annotations used to define a DirectoryService</description>
   
@@ -115,6 +116,33 @@
           </systemPropertyVariables>
         </configuration>
       </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>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.annotations</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>  
 </project>

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java Thu Oct 20 19:41:49 2011
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.partition.Partition;
 
 /**
  * An annotation for the Partition creation. A partition is defined by

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Thu Oct 20 19:41:49 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.apache.directory.server.core.partition.index.Index;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Thu Oct 20 19:41:49 2011
@@ -27,7 +27,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.annotations.AnnotationUtils;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
@@ -36,11 +35,12 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.annotations.CreateIndex;
 import org.apache.directory.server.core.annotations.CreatePartition;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.interceptor.Interceptor;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.authn.AuthenticationInterceptor;
 import org.apache.directory.server.core.authn.Authenticator;
 import org.apache.directory.server.core.authn.DelegatingAuthenticator;
-import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.i18n.I18n;
@@ -248,10 +248,12 @@ public class DSAnnotationProcessor
         if ( instance != null )
         {
             dsBuilder = (CreateDS)instance;
-        }
 
-        // Ok, we have found a CreateDS annotation. Process it now.
-        return createDS( dsBuilder );
+            // Ok, we have found a CreateDS annotation. Process it now.
+            return createDS( dsBuilder );
+        }
+        
+        throw new LdapException( I18n.err( I18n.ERR_114 ) );
     }
 
 

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Thu Oct 20 19:41:49 2011
@@ -26,11 +26,11 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DefaultDirectoryService;
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.InstanceLayout;
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.InstanceLayout;
+import org.apache.directory.server.core.api.partition.Partition;
+import org.apache.directory.server.core.api.schema.SchemaPartition;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
-import org.apache.directory.server.core.schema.SchemaPartition;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -117,7 +117,7 @@ public class DefaultDirectoryServiceFact
     /**
      * Build the working directory
      */
-    private void buildInstanceDirectory( String name )
+    private void buildInstanceDirectory( String name ) throws IOException
     {
         String instanceDirectory = System.getProperty( "workingDirectory" );
 

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java Thu Oct 20 19:41:49 2011
@@ -19,7 +19,7 @@
 package org.apache.directory.server.core.factory;
 
 
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.api.DirectoryService;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Thu Oct 20 19:41:49 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.core.partition.index.Index;

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Thu Oct 20 19:41:49 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.core.partition.index.Index;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java Thu Oct 20 19:41:49 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 
 import java.io.File;
 
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.index.Index;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java Thu Oct 20 19:41:49 2011
@@ -27,12 +27,12 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.annotations.ContextEntry;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.annotations.CreateIndex;
 import org.apache.directory.server.core.annotations.CreatePartition;
-import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.junit.Test;
 

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java Thu Oct 20 19:41:49 2011
@@ -25,7 +25,8 @@ import static org.junit.Assert.assertTru
 import org.apache.commons.io.FileUtils;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.server.core.DirectoryService;
+
+import org.apache.directory.server.core.api.DirectoryService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Propchange: directory/apacheds/branches/apacheds-txns/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -4,5 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-api:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
 /directory/apacheds/branches/milestones/core-api:1072812-1075328
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/interceptors/core-api:1183435-1186974
 /directory/studio/trunk/core-api:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/pom.xml?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/pom.xml Thu Oct 20 19:41:49 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-core-api</artifactId>
   <name>ApacheDS Core API</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Contains interfaces and helper classes that are part of the ApacheDS Core API.
@@ -146,6 +146,33 @@
           </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>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.api</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: directory/apacheds/branches/apacheds-txns/core-api/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/test/resources/log4j.properties?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/test/resources/log4j.properties (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/test/resources/log4j.properties Thu Oct 20 19:41:49 2011
@@ -17,7 +17,7 @@
 log4j.rootCategory=OFF, stdout
 
 log4j.appender.stdout=org.apache.log4j.RollingFileAppender
-log4j.appender.stdout.File=apacheds-rolling.log
+log4j.appender.stdout.File=target/apacheds-rolling.log
 
 log4j.appender.stdout.MaxFileSize=1024KB
 # Keep some backup files

Propchange: directory/apacheds/branches/apacheds-txns/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -4,5 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-avl:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
 /directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/interceptors/core-avl:1183435-1186974
 /directory/studio/trunk/core-avl:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-avl/pom.xml?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-avl/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-avl/pom.xml Thu Oct 20 19:41:49 2011
@@ -25,6 +25,7 @@
   
   <artifactId>apacheds-core-avl</artifactId>
   <name>ApacheDS Core AVL</name>
+  <packaging>bundle</packaging>
   
   <description>A linked in memory AVL tree implementation with Cursor</description>
 
@@ -55,4 +56,35 @@
       <artifactId>shared-util</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.avl</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Propchange: directory/apacheds/branches/apacheds-txns/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -4,5 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-constants:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
 /directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/interceptors/core-constants:1183435-1186974
 /directory/studio/trunk/core-constants:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-constants/pom.xml?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-constants/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-constants/pom.xml Thu Oct 20 19:41:49 2011
@@ -27,6 +27,38 @@
   
   <artifactId>apacheds-core-constants</artifactId>
   <name>ApacheDS Core Constants</name>
+  <packaging>bundle</packaging>
 
   <description>Contains classes that store interfaces with various constants in ApacheDS.</description>
+  
+  <build>
+    <plugins>
+      <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>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.constants</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Propchange: directory/apacheds/branches/apacheds-txns/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -5,4 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
 /directory/apacheds/branches/milestones/core-integ:1072812-1075328
 /directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/interceptors/core-integ:1183435-1186974
 /directory/studio/trunk/core-integ:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Thu Oct 20 19:41:49 2011
@@ -24,7 +24,9 @@ import static org.apache.directory.serve
 import static org.apache.directory.server.core.integ.IntegrationUtils.getNetworkConnectionAs;
 import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.INSUFFICIENT_PASSWORD_QUALITY;
 import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_SHORT;
+import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_EXPIRED;
 import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_TOO_YOUNG;
+import static org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum.PASSWORD_IN_HISTORY;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -41,11 +43,14 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
+import org.apache.directory.server.core.api.authn.ppolicy.PasswordPolicyConfiguration;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
+import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
+import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 import org.apache.directory.shared.ldap.model.constants.PasswordPolicySchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -58,6 +63,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.AddResponse;
 import org.apache.directory.shared.ldap.model.message.BindRequest;
 import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
+import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
@@ -109,11 +115,11 @@ public class PasswordPolicyTest extends 
 
         PpolicyConfigContainer policyContainer = new PpolicyConfigContainer();
         policyContainer.setDefaultPolicy( policyConfig );
-        AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)getService().getInterceptor( AuthenticationInterceptor.class.getName() );
+        AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)getService().getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
         authenticationInterceptor.setPwdPolicies( policyContainer );
         
         AuthenticationInterceptor authInterceptor = ( AuthenticationInterceptor ) getService()
-        .getInterceptor( AuthenticationInterceptor.class.getName() );
+        .getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
         
         authInterceptor.loadPwdPolicyStateAtributeTypes();
     }
@@ -313,7 +319,190 @@ public class PasswordPolicyTest extends 
         assertTrue( userConnection.isAuthenticated() );
     }
 
+    
+    @Test
+    public void testPwdHistory() throws Exception
+    {
+        policyConfig.setPwdInHistory( 2 );
+        
+        LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
+
+        Dn userDn = new Dn( "cn=userPwdHist,ou=system" );
+        Entry userEntry = new DefaultEntry(
+            userDn.toString(), 
+            "ObjectClass: top", 
+            "ObjectClass: person", 
+            "cn: userPwdHist",
+            "sn: userPwdHist_sn", 
+            "userPassword: 12345" );
+
+        AddRequest addRequest = new AddRequestImpl();
+        addRequest.setEntry( userEntry );
+        addRequest.addControl( PP_REQ_CTRL );
+
+        connection.add( addRequest );
+        
+        Entry entry = connection.lookup( userDn, "*", "+" );
+        
+        Attribute pwdHistAt = entry.get( PasswordPolicySchemaConstants.PWD_HISTORY_AT );
+        assertNotNull( pwdHistAt );
+        assertEquals( 1, pwdHistAt.size() );
+        
+        Thread.sleep( 1000 );// to avoid creating a history value with the same timestamp
+        ModifyRequest modReq = new ModifyRequestImpl();
+        modReq.setName( userDn );
+        modReq.addControl( PP_REQ_CTRL );
+        modReq.replace( SchemaConstants.USER_PASSWORD_AT, "67891" );
 
+        connection.modify( modReq );
+        
+        entry = connection.lookup( userDn, "*", "+" );
+        
+        pwdHistAt = entry.get( PasswordPolicySchemaConstants.PWD_HISTORY_AT );
+        assertNotNull( pwdHistAt );
+        assertEquals( 2, pwdHistAt.size() );
+        
+        Thread.sleep( 1000 );// to avoid creating a history value with the same timestamp
+        modReq = new ModifyRequestImpl();
+        modReq.setName( userDn );
+        modReq.addControl( PP_REQ_CTRL );
+        modReq.replace( SchemaConstants.USER_PASSWORD_AT, "abcde" );
+
+        ModifyResponse modResp = connection.modify( modReq );
+        assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
+        
+        entry = connection.lookup( userDn, "*", "+" );
+        pwdHistAt = entry.get( PasswordPolicySchemaConstants.PWD_HISTORY_AT );
+        assertNotNull( pwdHistAt );
+        
+        // it should still hold only 2 values
+        assertEquals( 2, pwdHistAt.size() );
+        
+        // try to reuse the password, should fail
+        modResp = connection.modify( modReq );
+        assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, modResp.getLdapResult().getResultCode() );
+        
+        PasswordPolicy respCtrl = getPwdRespCtrl( modResp );
+        assertEquals( PASSWORD_IN_HISTORY, respCtrl.getResponse().getPasswordPolicyError() );
+    }
+    
+    
+    @Test
+    public void testPwdLength() throws Exception
+    {
+       policyConfig.setPwdMinLength( 5 );
+       policyConfig.setPwdMaxLength( 7 );
+       policyConfig.setPwdCheckQuality( 2 );
+       
+        LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
+
+        Dn userDn = new Dn( "cn=userLen,ou=system" );
+        Entry userEntry = new DefaultEntry(
+            userDn.toString(), 
+            "ObjectClass: top", 
+            "ObjectClass: person", 
+            "cn: userLen",
+            "sn: userLen_sn", 
+            "userPassword: 1234");
+
+        AddRequest addRequest = new AddRequestImpl();
+        addRequest.setEntry( userEntry );
+        addRequest.addControl( PP_REQ_CTRL );
+
+        AddResponse addResp = connection.add( addRequest );
+        assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, addResp.getLdapResult().getResultCode() );
+
+        PasswordPolicy respCtrl = getPwdRespCtrl( addResp );
+        assertNotNull( respCtrl );
+        assertEquals( PASSWORD_TOO_SHORT, respCtrl.getResponse().getPasswordPolicyError() );
+        
+        Attribute pwdAt = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
+        pwdAt.clear();
+        pwdAt.add( "12345678" );
+        
+        addResp = connection.add( addRequest );
+        assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, addResp.getLdapResult().getResultCode() );
+        
+        respCtrl = getPwdRespCtrl( addResp );
+        assertNotNull( respCtrl );
+        assertEquals( INSUFFICIENT_PASSWORD_QUALITY, respCtrl.getResponse().getPasswordPolicyError() );
+        
+        pwdAt = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
+        pwdAt.clear();
+        pwdAt.add( "123456" );
+        
+        addResp = connection.add( addRequest );
+        assertEquals( ResultCodeEnum.SUCCESS, addResp.getLdapResult().getResultCode() );
+    }
+     
+
+    @Test
+    public void testPwdMaxAgeAndGraceAuth() throws Exception
+    {
+        policyConfig.setPwdMaxAge( 5 );
+        policyConfig.setPwdExpireWarning( 4 );
+        policyConfig.setPwdGraceAuthNLimit( 2 );
+        
+        LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
+
+        Dn userDn = new Dn( "cn=userMaxAge,ou=system" );
+        String password = "12345";
+        Entry userEntry = new DefaultEntry(
+            userDn.toString(), 
+            "ObjectClass: top", 
+            "ObjectClass: person", 
+            "cn: userMaxAge",
+            "sn: userMaxAge_sn", 
+            "userPassword: " + password );
+
+        AddRequest addRequest = new AddRequestImpl();
+        addRequest.setEntry( userEntry );
+        addRequest.addControl( PP_REQ_CTRL );
+
+        connection.add( addRequest );
+
+        BindRequest bindReq = new BindRequestImpl();
+        bindReq.setName( userDn );
+        bindReq.setCredentials( password.getBytes() );
+        bindReq.addControl( PP_REQ_CTRL );
+        
+        LdapConnection userCon= new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+        userCon.setTimeOut(0);
+
+        Thread.sleep( 1000 ); // sleep for one second so that the password expire warning will be sent
+        
+        BindResponse bindResp = userCon.bind( bindReq );
+        assertEquals( ResultCodeEnum.SUCCESS, bindResp.getLdapResult().getResultCode() );
+        
+        PasswordPolicy respCtrl = getPwdRespCtrl( bindResp );
+        assertNotNull( respCtrl );
+        assertTrue( respCtrl.getResponse().getTimeBeforeExpiration() > 0 );
+        
+        Thread.sleep( 4000 ); // sleep for four seconds so that the password expires
+        
+        // bind for two more times, should succeed
+        bindResp = userCon.bind( bindReq );
+        assertEquals( ResultCodeEnum.SUCCESS, bindResp.getLdapResult().getResultCode() );
+        respCtrl = getPwdRespCtrl( bindResp );
+        assertNotNull( respCtrl );
+        assertEquals( 1, respCtrl.getResponse().getGraceAuthNsRemaining() );
+        
+        // this extra second sleep is necessary to modify pwdGraceUseTime attribute with a different timestamp
+        Thread.sleep( 1000 );
+        bindResp = userCon.bind( bindReq );
+        assertEquals( ResultCodeEnum.SUCCESS, bindResp.getLdapResult().getResultCode() );
+        respCtrl = getPwdRespCtrl( bindResp );
+        assertEquals( 0, respCtrl.getResponse().getGraceAuthNsRemaining() );
+        
+        // this time it should fail
+        bindResp = userCon.bind( bindReq );
+        assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
+
+        respCtrl = getPwdRespCtrl( bindResp );
+        assertEquals( PASSWORD_EXPIRED, respCtrl.getResponse().getPasswordPolicyError() );
+    }
+
+    
     private PasswordPolicy getPwdRespCtrl( Response resp ) throws Exception
     {
         Control control = resp.getControls().get( PP_REQ_CTRL.getOid() );

Propchange: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -10,4 +10,5 @@
 /directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
 /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/interceptors/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1183435-1186974
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 19:41:49 2011
@@ -4,5 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-jndi:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/interceptors/core-jndi:1183435-1186974
 /directory/studio/trunk/core-jndi:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/pom.xml?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/pom.xml Thu Oct 20 19:41:49 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-core-jndi</artifactId>
   <name>ApacheDS Core JNDI</name>
+  <packaging>bundle</packaging>
 
   <description>
      Contains a JNDI provider implementation which wraps the core so existing 
@@ -120,6 +121,33 @@
           </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>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.jndi</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
 
     <resources>

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Thu Oct 20 19:41:49 2011
@@ -20,7 +20,8 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.api.DirectoryService;
+
 import javax.naming.InitialContext;
 import javax.naming.spi.InitialContextFactory;
 

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java Thu Oct 20 19:41:49 2011
@@ -29,8 +29,8 @@ import javax.naming.NamingException;
 import javax.naming.ldap.LdapName;
 import javax.naming.spi.InitialContextFactory;
 
-import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java Thu Oct 20 19:41:49 2011
@@ -29,15 +29,15 @@ import javax.naming.event.NamingExceptio
 import javax.naming.event.NamingListener;
 import javax.naming.event.ObjectChangeListener;
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.event.DirectoryListener;
-import org.apache.directory.server.core.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
-import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
-import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.api.entry.ClonedServerEntry;
+import org.apache.directory.server.core.api.entry.ServerEntryUtils;
+import org.apache.directory.server.core.api.event.DirectoryListener;
+import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java Thu Oct 20 19:41:49 2011
@@ -26,8 +26,8 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.SearchResult;
 
-import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.server.core.api.entry.ServerEntryUtils;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Oct 20 19:41:49 2011
@@ -46,30 +46,30 @@ import javax.naming.ldap.LdapName;
 import javax.naming.spi.DirStateFactory;
 import javax.naming.spi.DirectoryManager;
 
-import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DefaultCoreSession;
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.LdapPrincipal;
-import org.apache.directory.server.core.OperationManager;
-import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.event.DirectoryListener;
-import org.apache.directory.server.core.event.NotificationCriteria;
-import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
-import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
-import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
-import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
-import org.apache.directory.server.core.interceptor.context.ListOperationContext;
-import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
-import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
-import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
-import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
-import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
+import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.LdapPrincipal;
+import org.apache.directory.server.core.api.OperationManager;
+import org.apache.directory.server.core.api.entry.ServerEntryUtils;
+import org.apache.directory.server.core.api.event.DirectoryListener;
+import org.apache.directory.server.core.api.event.NotificationCriteria;
+import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
+import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.OperationContext;
+import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
+import org.apache.directory.server.core.shared.DefaultCoreSession;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Thu Oct 20 19:41:49 2011
@@ -46,14 +46,14 @@ import javax.naming.ldap.LdapName;
 import javax.naming.spi.DirStateFactory;
 import javax.naming.spi.DirectoryManager;
 
-import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.LdapPrincipal;
-import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.event.DirectoryListener;
-import org.apache.directory.server.core.event.NotificationCriteria;
-import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.LdapPrincipal;
+import org.apache.directory.server.core.api.entry.ServerEntryUtils;
+import org.apache.directory.server.core.api.event.DirectoryListener;
+import org.apache.directory.server.core.api.event.NotificationCriteria;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
+import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.AttributeUtils;

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=1187013&r1=1187012&r2=1187013&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Thu Oct 20 19:41:49 2011
@@ -31,11 +31,11 @@ import javax.naming.ldap.ExtendedRespons
 import javax.naming.ldap.LdapContext;
 import javax.naming.ldap.LdapName;
 
-import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.LdapPrincipal;
-import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
-import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.LdapPrincipal;
+import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;

Propchange: directory/apacheds/branches/apacheds-txns/core-shared/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 20 19:41:49 2011
@@ -0,0 +1,5 @@
+bin
+target
+.classpath
+.project
+.settings