You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2007/04/01 23:47:06 UTC
svn commit: r524693 - in /directory/ldapstudio/trunk: ./
ldapstudio-aciitemeditor/ ldapstudio-aciitemeditor/META-INF/
ldapstudio-aciitemeditor/lib/
Author: seelmann
Date: Sun Apr 1 14:47:05 2007
New Revision: 524693
URL: http://svn.apache.org/viewvc?view=rev&rev=524693
Log:
Integrated the ACI Item Editor into the main build
Removed:
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/lib/commons-collections-3.1.jar
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/lib/commons-configuration-1.2.jar
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/lib/commons-lang-2.1.jar
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/lib/commons-logging-1.1.jar
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/lib/nlog4j-1.2.24.jar
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/lib/shared-ldap-0.9.6-SNAPSHOT.jar
Modified:
directory/ldapstudio/trunk/ (props changed)
directory/ldapstudio/trunk/build.xml
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/.classpath
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/META-INF/MANIFEST.MF
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.properties
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/ivy.xml
Modified: directory/ldapstudio/trunk/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/build.xml?view=diff&rev=524693&r1=524692&r2=524693
==============================================================================
--- directory/ldapstudio/trunk/build.xml (original)
+++ directory/ldapstudio/trunk/build.xml Sun Apr 1 14:47:05 2007
@@ -140,6 +140,15 @@
</fileset>
</copy>
+ <!-- Creation of the ACI Item Editor Plugin -->
+ <ant dir="ldapstudio-aciitemeditor" inheritAll="no" />
+ <!-- Copy of the ACI Item Edtior Plugin in the "plugins" folder of the RCP app -->
+ <copy todir="${ldapstudio-complete.build}/plugins">
+ <fileset dir="${basedir}/ldapstudio-aciitemeditor/target">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
+
<!-- Creation of the Jars Plugin -->
<ant dir="ldapstudio-jars" inheritAll="no" />
<!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
@@ -318,6 +327,7 @@
<ant dir="ldapstudio-browser-ui" inheritAll="no" target="clean" />
<ant dir="ldapstudio-browser-help" inheritAll="no" target="clean" />
<ant dir="ldapstudio-browser-feature" inheritAll="no" target="clean"/>
+ <ant dir="ldapstudio-aciitemeditor" inheritAll="no" target="clean" />
<ant dir="ldapstudio-jars" inheritAll="no" target="clean" />
<ant dir="ldapstudio-updatesite" inheritAll="no" target="clean" />
<delete dir="${ldapstudio-complete.output}" />
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/.classpath
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/.classpath?view=diff&rev=524693&r1=524692&r2=524693
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/.classpath (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/.classpath Sun Apr 1 14:47:05 2007
@@ -2,13 +2,11 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry exported="true" kind="lib" path="lib/nlog4j-1.2.24.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/shared-asn1-0.9.6-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/shared-ldap-0.9.6-SNAPSHOT.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-configuration-1.2.jar"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
- <classpathentry kind="lib" path="lib/nlog4j-1.2.24.jar"/>
- <classpathentry kind="lib" path="lib/shared-ldap-0.9.6-SNAPSHOT.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/META-INF/MANIFEST.MF?view=diff&rev=524693&r1=524692&r2=524693
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/META-INF/MANIFEST.MF (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/META-INF/MANIFEST.MF Sun Apr 1 14:47:05 2007
@@ -18,8 +18,6 @@
Eclipse-LazyStart: true
Bundle-ClassPath: .,
lib/shared-ldap-0.9.6-SNAPSHOT.jar,
+ lib/shared-asn1-0.9.6-SNAPSHOT.jar,
lib/commons-collections-3.1.jar,
- lib/commons-configuration-1.2.jar,
- lib/commons-lang-2.1.jar,
- lib/commons-logging-1.1.jar,
lib/nlog4j-1.2.24.jar
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.properties
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.properties?view=diff&rev=524693&r1=524692&r2=524693
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.properties (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.properties Sun Apr 1 14:47:05 2007
@@ -5,8 +5,6 @@
.,\
icons/,\
lib/shared-ldap-0.9.6-SNAPSHOT.jar,\
+ lib/shared-asn1-0.9.6-SNAPSHOT.jar,\
lib/commons-collections-3.1.jar,\
- lib/commons-configuration-1.2.jar,\
- lib/commons-lang-2.1.jar,\
- lib/commons-logging-1.1.jar,\
lib/nlog4j-1.2.24.jar
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml?view=diff&rev=524693&r1=524692&r2=524693
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml Sun Apr 1 14:47:05 2007
@@ -148,7 +148,6 @@
<exclude name="src/**" />
<exclude name="icons/**" />
<exclude name="templates/**" />
- <exclude name="lib/**" />
</fileset>
</delete>
</target>
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/ivy.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/ivy.xml?view=diff&rev=524693&r1=524692&r2=524693
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/ivy.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/ivy.xml Sun Apr 1 14:47:05 2007
@@ -18,4 +18,7 @@
-->
<ivy-module version="1.0">
<info organisation="org.apache.directory.ldapstudio" module="ldapstudio-aciitemeditor"/>
+ <dependencies>
+ <dependency org="org.apache.directory.shared" name="shared-ldap" rev="0.9.6-SNAPSHOT"/>
+ </dependencies>
</ivy-module>