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 2010/10/08 18:33:35 UTC
svn commit: r1005885 - in /directory/studio/trunk/libraries: ./
org.apache.directory.shared.asn1/ org.apache.directory.shared.dsmlparser/
org.apache.directory.shared.i18n/ org.apache.directory.shared.ldap/
org.apache.directory.shared.ldapconstants/ org...
Author: pamarcelot
Date: Fri Oct 8 16:33:35 2010
New Revision: 1005885
URL: http://svn.apache.org/viewvc?rev=1005885&view=rev
Log:
Merged the 'shared-trunk-merge' branch back into trunk.
It includes all changes related to the use of the current Shared trunk into Studio (which was stuck at version 0.9.17 until now).
Added:
directory/studio/trunk/libraries/org.apache.directory.shared.i18n/ (props changed)
- copied from r1005876, directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/
directory/studio/trunk/libraries/org.apache.directory.shared.i18n/pom.xml
- copied unchanged from r1005876, directory/studio/branches/shared-trunk-merge/libraries/org.apache.directory.shared.i18n/pom.xml
Removed:
directory/studio/trunk/libraries/org.apache.directory.shared.asn1/
directory/studio/trunk/libraries/org.apache.directory.shared.ldapconstants/
directory/studio/trunk/libraries/org.apache.logging.log4j/.classpath
Modified:
directory/studio/trunk/libraries/org.apache.directory.shared.dsmlparser/pom.xml
directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml
directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
directory/studio/trunk/libraries/pom.xml
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.dsmlparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.dsmlparser/pom.xml?rev=1005885&r1=1005884&r2=1005885&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.dsmlparser/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.dsmlparser/pom.xml Fri Oct 8 16:33:35 2010
@@ -86,11 +86,9 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ <Require-Bundle>org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
@@ -129,20 +127,12 @@
<artifactId>shared-dsml-parser</artifactId>
<exclusions>
<exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
+ <artifactId>shared-i18n</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
@@ -153,6 +143,10 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
</exclusion>
Propchange: directory/studio/trunk/libraries/org.apache.directory.shared.i18n/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 8 16:33:35 2010
@@ -0,0 +1,6 @@
+.settings
+lib
+META-INF
+target
+.classpath
+.project
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml?rev=1005885&r1=1005884&r2=1005885&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml Fri Oct 8 16:33:35 2010
@@ -88,8 +88,8 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.slf4j.api;bundle-version="${org.slf4j.version}",
org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
@@ -139,7 +139,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
+ <artifactId>shared-i18n</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
Modified: directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.mina.core/pom.xml?rev=1005885&r1=1005884&r2=1005885&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.mina.core/pom.xml Fri Oct 8 16:33:35 2010
@@ -27,7 +27,7 @@
</parent>
<artifactId>org.apache.mina.core</artifactId>
- <version>${org.apache.mina.core.validversion}</version>
+ <version>${org.apache.mina.core.version}</version>
<name>Apache MINA Core (for Apache Directory Studio)</name>
<packaging>jar</packaging>
Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1005885&r1=1005884&r2=1005885&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Fri Oct 8 16:33:35 2010
@@ -37,10 +37,9 @@
<module>org.apache.commons.io</module>
<module>org.apache.commons.lang</module>
<module>org.apache.commons.logging</module>
- <module>org.apache.directory.shared.asn1</module>
<module>org.apache.directory.shared.dsmlparser</module>
+ <module>org.apache.directory.shared.i18n</module>
<module>org.apache.directory.shared.ldap</module>
- <module>org.apache.directory.shared.ldapconstants</module>
<module>org.apache.httpcomponents.httpclient</module>
<module>org.apache.httpcomponents.httpcore</module>
<module>org.apache.logging.log4j</module>