You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/14 23:45:10 UTC
svn commit: r1059193 - in /directory/shared/branches/shared-AP: ./ integ/
integ/src/ integ/src/test/ integ/src/test/java/ integ/src/test/java/org/
integ/src/test/java/org/apache/ integ/src/test/java/org/apache/directory/
integ/src/test/java/org/apache/...
Author: akarasulu
Date: Fri Jan 14 22:45:09 2011
New Revision: 1059193
URL: http://svn.apache.org/viewvc?rev=1059193&view=rev
Log:
OSGi for ldap module and moved a few tests into shared-integ: merge
Added:
directory/shared/branches/shared-AP/integ/ (props changed)
- copied from r1059155, directory/shared/trunk/integ/
directory/shared/branches/shared-AP/integ/pom.xml
- copied unchanged from r1059155, directory/shared/trunk/integ/pom.xml
directory/shared/branches/shared-AP/integ/src/
- copied from r1059155, directory/shared/trunk/integ/src/
directory/shared/branches/shared-AP/integ/src/test/
- copied from r1059155, directory/shared/trunk/integ/src/test/
directory/shared/branches/shared-AP/integ/src/test/java/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/
directory/shared/branches/shared-AP/integ/src/test/java/org/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/aci/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/aci/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemChekerTest.java
- copied unchanged from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemChekerTest.java
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemParserTest.java
- copied unchanged from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemParserTest.java
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/schema/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/schema/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java
- copied unchanged from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxCheckerTest.java
- copied unchanged from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/SubtreeSpecificationSyntaxCheckerTest.java
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/subtree/
- copied from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/
directory/shared/branches/shared-AP/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
- copied unchanged from r1059155, directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
Removed:
directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/
directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/
directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/subtree/
Modified:
directory/shared/branches/shared-AP/ldap/pom.xml
directory/shared/branches/shared-AP/pom.xml
Propchange: directory/shared/branches/shared-AP/integ/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 14 22:45:09 2011
@@ -0,0 +1,15 @@
+.ipr
+.cdtproject
+*.iml
+.deployables
+*.iws
+.wtpmodules
+.settings
+*.log
+target
+.project
+.classpath
+*~
+.fbprefs
+nbproject
+
Modified: directory/shared/branches/shared-AP/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/pom.xml?rev=1059193&r1=1059192&r2=1059193&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/pom.xml (original)
+++ directory/shared/branches/shared-AP/ldap/pom.xml Fri Jan 14 22:45:09 2011
@@ -27,7 +27,7 @@
<artifactId>shared-ldap</artifactId>
<name>Apache Directory Shared LDAP</name>
-
+ <packaging>bundle</packaging>
<description>Common LDAP packages used by clients and servers</description>
<dependencies>
@@ -103,6 +103,21 @@
</excludes>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${pom.artifactId}</Bundle-Name>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Export-Package>org.apache.directory.shared.ldap.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: directory/shared/branches/shared-AP/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/pom.xml?rev=1059193&r1=1059192&r2=1059193&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/pom.xml (original)
+++ directory/shared/branches/shared-AP/pom.xml Fri Jan 14 22:45:09 2011
@@ -70,6 +70,7 @@
</issueManagement>
<modules>
+ <module>integ</module>
<module>i18n</module>
<module>all</module>
<module>ldap</module>