You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/10/24 14:07:04 UTC
svn commit: r1188103 [1/2] - in /directory/apacheds/branches/apacheds-osgi:
./ all/ apache-felix/ core-annotations/ core-api/ core-avl/ core-constants/
core-integ/
core-integ/src/test/java/org/apache/directory/server/core/collective/
core-integ/src/tes...
Author: pamarcelot
Date: Mon Oct 24 12:07:01 2011
New Revision: 1188103
URL: http://svn.apache.org/viewvc?rev=1188103&view=rev
Log:
Merged latest modifications in trunk with the OSGI branch [rev:1185681:head]
Modified:
directory/apacheds/branches/apacheds-osgi/ (props changed)
directory/apacheds/branches/apacheds-osgi/all/ (props changed)
directory/apacheds/branches/apacheds-osgi/apache-felix/ (props changed)
directory/apacheds/branches/apacheds-osgi/core/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-annotations/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-annotations/pom.xml
directory/apacheds/branches/apacheds-osgi/core-api/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-api/pom.xml
directory/apacheds/branches/apacheds-osgi/core-avl/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-avl/pom.xml
directory/apacheds/branches/apacheds-osgi/core-constants/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-constants/pom.xml
directory/apacheds/branches/apacheds-osgi/core-integ/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (props changed)
directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/core-jndi/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml
directory/apacheds/branches/apacheds-osgi/core-shared/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml
directory/apacheds/branches/apacheds-osgi/core/pom.xml
directory/apacheds/branches/apacheds-osgi/http-directory-bridge/pom.xml
directory/apacheds/branches/apacheds-osgi/http-integration/ (props changed)
directory/apacheds/branches/apacheds-osgi/http-integration/pom.xml
directory/apacheds/branches/apacheds-osgi/i18n/ (props changed)
directory/apacheds/branches/apacheds-osgi/i18n/pom.xml
directory/apacheds/branches/apacheds-osgi/installers/ (props changed)
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/ (props changed)
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight
directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/hash/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/logger/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/referral/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/schema/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/subtree/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/trigger/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/branches/apacheds-osgi/jdbm/ (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm-partition/pom.xml
directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm/pom.xml
directory/apacheds/branches/apacheds-osgi/kerberos-codec/pom.xml
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-test/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldap-client-test/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldif-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldif-partition/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-changepw/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dhcp/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dhcp/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-dns/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dns/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-kerberos/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-kerberos/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-ldap/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ldap/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ntp/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ntp/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-shared/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-shared/pom.xml
directory/apacheds/branches/apacheds-osgi/server-annotations/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-annotations/pom.xml
directory/apacheds/branches/apacheds-osgi/server-config/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/pom.xml
directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/server-integ/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-integ/pom.xml
directory/apacheds/branches/apacheds-osgi/server-jndi/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-jndi/pom.xml
directory/apacheds/branches/apacheds-osgi/server-replication/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-replication/pom.xml
directory/apacheds/branches/apacheds-osgi/server-tools/ (props changed)
directory/apacheds/branches/apacheds-osgi/service/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-builder/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-builder/pom.xml
directory/apacheds/branches/apacheds-osgi/service-osgi/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-osgi/pom.xml
directory/apacheds/branches/apacheds-osgi/test-framework/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml
directory/apacheds/branches/apacheds-osgi/xdbm-tools/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-tools/pom.xml
Propchange: directory/apacheds/branches/apacheds-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree:965203-965686
/directory/apacheds/branches/milestones:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,5 +3,5 @@
/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,1185682-1188093
/directory/studio/trunk/all:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/apache-felix/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 24 12:07:01 2011
@@ -1,7 +1,8 @@
-target
.classpath
.project
.settings
bin
bundle
+default
felix-cache
+target
Propchange: directory/apacheds/branches/apacheds-osgi/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -5,5 +5,5 @@
/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,1185682-1188093
/directory/studio/trunk/core:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -5,5 +5,5 @@
/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,1185682-1188093
/directory/studio/trunk/core-annotations:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-annotations/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-annotations/pom.xml Mon Oct 24 12:07:01 2011
@@ -118,13 +118,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core.annotations</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/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,1185682-1188093
/directory/studio/trunk/core-api:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/pom.xml Mon Oct 24 12:07:01 2011
@@ -148,13 +148,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core.api</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/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,1185682-1188093
/directory/studio/trunk/core-avl:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-avl/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-avl/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-avl/pom.xml Mon Oct 24 12:07:01 2011
@@ -60,13 +60,25 @@
<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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core.avl</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/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,1185682-1188093
/directory/studio/trunk/core-constants:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-constants/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-constants/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-constants/pom.xml Mon Oct 24 12:07:01 2011
@@ -34,13 +34,25 @@
<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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core.constants</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-integ:1160768-1164075
/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/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/core-integ:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
/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/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -8,5 +8,6 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1185682-1188093
/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/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,1185682-1188093
/directory/studio/trunk/core-jndi:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml Mon Oct 24 12:07:01 2011
@@ -123,13 +123,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core.jndi</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/core-shared/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 24 12:07:01 2011
@@ -1,5 +1,6 @@
-target
-.project
.classpath
+.project
.settings
+META-INF
+target
bin
Modified: directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml Mon Oct 24 12:07:01 2011
@@ -140,6 +140,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -151,14 +152,27 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core.shared</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core/pom.xml Mon Oct 24 12:07:01 2011
@@ -251,13 +251,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/http-directory-bridge/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/http-directory-bridge/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/http-directory-bridge/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/http-directory-bridge/pom.xml Mon Oct 24 12:07:01 2011
@@ -50,13 +50,25 @@
<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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.http.directory.bridge</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
/directory/apacheds/branches/milestones/http-integration:1072812-1075328
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/http-integration:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/http-integration/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/http-integration/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/http-integration/pom.xml Mon Oct 24 12:07:01 2011
@@ -106,13 +106,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.http.integration</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
/directory/apacheds/branches/milestones/i18n:1072812-1075328
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/i18n:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/i18n/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/i18n/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/i18n/pom.xml Mon Oct 24 12:07:01 2011
@@ -34,13 +34,25 @@
<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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.i18n</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
/directory/apacheds/branches/milestones/installers:1072812-1075328
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/installers/branches/installers-schema/apacheds:806631-896441
/directory/studio/trunk/installers:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
/directory/apacheds/branches/milestones/installers-maven-plugin:1072812-1075328
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/daemon/branches/daemon-schema/plugin:806630-896441
/directory/studio/trunk/installers-maven-plugin:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java Mon Oct 24 12:07:01 2011
@@ -63,7 +63,7 @@ public class ArchiveInstallerCommand ext
* Performs the following:
* <ol>
* <li>Bail if the archive type is unknown</li>
- * <li>Creates the Archive Installer for Apache DS</li>
+ * <li>Creates the Archive Installer for ApacheDS</li>
* </ol>
*/
public void execute() throws MojoExecutionException, MojoFailureException
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java Mon Oct 24 12:07:01 2011
@@ -66,7 +66,7 @@ public class BinInstallerCommand extends
* Performs the following:
* <ol>
* <li>Bail if target is not for Linux</li>
- * <li>Creates the Mac OS X PKG Installer for Apache DS</li>
+ * <li>Creates the Mac OS X PKG Installer for ApacheDS</li>
* <li>Package it in a Mac OS X DMG (Disk iMaGe)</li>
* </ol>
*/
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java Mon Oct 24 12:07:01 2011
@@ -59,7 +59,7 @@ public class DebInstallerCommand extends
* Performs the following:
* <ol>
* <li>Bail if target is not for linux or the dpkg utility could not be found.</li>
- * <li>Creates the Debian DEB package for Apache DS</li>
+ * <li>Creates the Debian DEB package for ApacheDS</li>
* </ol>
*/
public void execute() throws MojoExecutionException, MojoFailureException
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java Mon Oct 24 12:07:01 2011
@@ -63,7 +63,7 @@ public class MacOsXPkgInstallerCommand e
* Performs the following:
* <ol>
* <li>Bail if target is not for macosx or the PackageMaker or hdiutil utilities can't be found.</li>
- * <li>Creates the Mac OS X PKG Installer for Apache DS</li>
+ * <li>Creates the Mac OS X PKG Installer for ApacheDS</li>
* <li>Package it in a Mac OS X DMG (Disk iMaGe)</li>
* </ol>
*/
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/functions.sh Mon Oct 24 12:07:01 2011
@@ -120,8 +120,8 @@ verifyExitCode()
{
if [ $? -ne 0 ]
then
- echo "An error occurred when installing Apache DS."
- echo "Apache DS installation failed."
+ echo "An error occurred when installing ApacheDS."
+ echo "ApacheDS installation failed."
exit 1
fi
}
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh Mon Oct 24 12:07:01 2011
@@ -38,7 +38,7 @@ done
#if ( test `id -un` != "root" )
#then
# echo "Only root can install this software."
-# echo "Apache DS installation has failed."
+# echo "ApacheDS installation has failed."
# exit 1 ;
#fi
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/variables.sh Mon Oct 24 12:07:01 2011
@@ -17,8 +17,8 @@
# specific language governing permissions and limitations
# under the License.
-Where do you want to install Apache DS|APACHEDS_HOME_DIRECTORY|/opt/apacheds-${APACHEDS_VERSION}||
-Where do you want to install Apache DS instances|INSTANCES_HOME_DIRECTORY|/var/lib/apacheds-${APACHEDS_VERSION}||
+Where do you want to install ApacheDS|APACHEDS_HOME_DIRECTORY|/opt/apacheds-${APACHEDS_VERSION}||
+Where do you want to install ApacheDS instances|INSTANCES_HOME_DIRECTORY|/var/lib/apacheds-${APACHEDS_VERSION}||
What name do you want for the default instance|DEFAULT_INSTANCE_NAME|default||
Where do you want to install the startup script|STARTUP_SCRIPT_DIRECTORY|/etc/init.d||
Which user do you want to run the server with (if not already existing, the specified user will be created)|RUN_AS_USER|apacheds||
Modified: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight (original)
+++ directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/postflight Mon Oct 24 12:07:01 2011
@@ -23,10 +23,10 @@
chmod 644 /Library/LaunchDaemons/org.apache.directory.server.plist
#
-# Launching the Apache DS daemon
+# Launching the ApacheDS daemon
#
#RUNNING=`launchctl list | grep "org.apache.directory.server" | tail -1`
-# Testing if the Apache DS daemon is already running
+# Testing if the ApacheDS daemon is already running
#if [ "X$RUNNING" = "X" ]
#then
# # If it is not running, we load it
Propchange: directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/interceptor-kerberos:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/pom.xml Mon Oct 24 12:07:01 2011
@@ -95,13 +95,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptor.kerberos</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.admin</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.authn</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.authz</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.changelog</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml Mon Oct 24 12:07:01 2011
@@ -164,13 +164,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.collective</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.event</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.exception</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/hash/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/hash/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/hash/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/hash/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.hash</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml Mon Oct 24 12:07:01 2011
@@ -164,13 +164,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.journal</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/logger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/logger/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/logger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/logger/pom.xml Mon Oct 24 12:07:01 2011
@@ -164,13 +164,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.logger</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.normalization</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml Mon Oct 24 12:07:01 2011
@@ -164,13 +164,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.operational</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/referral/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/referral/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/referral/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/referral/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.referral</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/schema/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/schema/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/schema/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.schema</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/subtree/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/subtree/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/subtree/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/subtree/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.subtree</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/trigger/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/trigger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/trigger/pom.xml Mon Oct 24 12:07:01 2011
@@ -169,13 +169,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.interceptors.trigger</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Mon Oct 24 12:07:01 2011
@@ -85,9 +85,6 @@ public class TriggerInterceptor extends
/** a normalizing Trigger Specification parser */
private TriggerSpecificationParser triggerParser;
- /** */
- private InterceptorChain chain;
-
/** whether or not this interceptor is activated */
private boolean enabled = true;
@@ -242,8 +239,6 @@ public class TriggerInterceptor extends
}
} );
- chain = directoryService.getInterceptorChain();
-
//StoredProcEngineConfig javaxScriptSPEngineConfig = new JavaxStoredProcEngineConfig();
StoredProcEngineConfig javaSPEngineConfig = new JavaStoredProcEngineConfig();
List<StoredProcEngineConfig> spEngineConfigs = new ArrayList<StoredProcEngineConfig>();
Propchange: directory/apacheds/branches/apacheds-osgi/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/jdbm:1160768-1164076
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
/directory/apacheds/branches/milestones/jdbm:1072812-1075328
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/jdbm:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/jdbm-partition:1160768-1164080
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
/directory/apacheds/branches/milestones/jdbm-partition:1072812-1075328
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/jdbm-partition:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/jdbm-partition/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/jdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/jdbm-partition/pom.xml Mon Oct 24 12:07:01 2011
@@ -125,13 +125,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.jdbm.partition</Bundle-SymbolicName>
<Export-Package>
org.apache.directory.server.core.partition.impl.btree.jdbm;version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/jdbm/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/jdbm/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/jdbm/pom.xml Mon Oct 24 12:07:01 2011
@@ -61,13 +61,25 @@
</pluginManagement>
<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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.jdbm</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-codec/pom.xml?rev=1188103&r1=1188102&r2=1188103&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-codec/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-codec/pom.xml Mon Oct 24 12:07:01 2011
@@ -106,13 +106,25 @@
</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}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.kerberos.codec</Bundle-SymbolicName>
<Export-Package>
{local-packages};version=${project.version};-noimport:=true
</Export-Package>
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,4 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1185682-1188093
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:07:01 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997