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 2008/06/10 12:01:28 UTC
svn commit: r666053 - in /directory/studio/trunk: pom.xml repository/pom.xml
studio/pom.xml
Author: pamarcelot
Date: Tue Jun 10 03:01:28 2008
New Revision: 666053
URL: http://svn.apache.org/viewvc?rev=666053&view=rev
Log:
Integrated the new Apache DS plugins in the build. Updated repository to load the required plugins to the local repository. Updated the studio build pom.xml file to bundle the appropriate plugins and features.
Modified:
directory/studio/trunk/pom.xml
directory/studio/trunk/repository/pom.xml
directory/studio/trunk/studio/pom.xml
Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=666053&r1=666052&r2=666053&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Tue Jun 10 03:01:28 2008
@@ -62,6 +62,10 @@
<properties>
<!-- Set versions for subprojects -->
<aciitemeditor.version>1.2.0.SNAPSHOT</aciitemeditor.version>
+ <apacheds.launcher.version>1.2.0</apacheds.launcher.version>
+ <apacheds.version>1.2.0.SNAPSHOT</apacheds.version>
+ <apacheds.help.version>1.2.0.SNAPSHOT</apacheds.help.version>
+ <apacheds.feature.version>1.2.0.SNAPSHOT</apacheds.feature.version>
<apacheds.configuration.version>1.2.0.SNAPSHOT</apacheds.configuration.version>
<apacheds.configuration.feature.version>1.2.0.SNAPSHOT</apacheds.configuration.feature.version>
<apacheds.configuration.help.version>1.2.0.SNAPSHOT</apacheds.configuration.help.version>
@@ -1547,6 +1551,16 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds</artifactId>
+ <version>${apacheds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds-launcher</artifactId>
+ <version>${apacheds.launcher.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>jars</artifactId>
<version>${jars.version}</version>
</dependency>
@@ -1587,6 +1601,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.feature</artifactId>
+ <version>${apacheds.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>schemaeditor.help</artifactId>
<version>${schemaeditor.help.version}</version>
</dependency>
@@ -1612,6 +1631,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.help</artifactId>
+ <version>${apacheds.help.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>test.integration.core</artifactId>
<version>${test.integration.core.version}</version>
</dependency>
@@ -1717,6 +1741,7 @@
<version>1.2.25</version>
</dependency>
+ <!-- Dependencies for the Testing Framework -->
<dependency>
<groupId>net.sf.swtbot.eclipse</groupId>
<artifactId>finder</artifactId>
@@ -1728,6 +1753,206 @@
<version>1.0.0.574</version>
</dependency>
+ <!-- Dependencies for the Apache DS plugin -->
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.2.v20080117_r332</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.3.2.v20080117_r332-studio</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>help</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>ide</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ <version>3.3.2.v20080115_r332</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ <version>3.2.2.v20071031_r332</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.3.v_793_R33x</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.team</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ <version>3.3.1.v20070719_r331</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -1756,9 +1981,13 @@
<module>apacheds-configuration</module>
<module>apacheds-configuration-feature</module>
<module>apacheds-configuration-help</module>
+ <module>apacheds-launcher</module>
+ <module>apacheds</module>
+ <module>apacheds-help</module>
+ <module>apacheds-feature</module>
+ <module>jars</module>
<module>test-integration-core</module>
<module>test-integration-ui</module>
- <module>jars</module>
<module>updatesite</module>
<module>studio</module>
</modules>
Modified: directory/studio/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/pom.xml?rev=666053&r1=666052&r2=666053&view=diff
==============================================================================
--- directory/studio/trunk/repository/pom.xml (original)
+++ directory/studio/trunk/repository/pom.xml Tue Jun 10 03:01:28 2008
@@ -66,7 +66,7 @@
</dependency>
<!-- Eclipse RCP artifacts -->
-
+
<dependency>
<groupId>net.sf.swtbot.eclipse</groupId>
<artifactId>finder</artifactId>
@@ -75,7 +75,7 @@
<groupId>net.sf.swtbot</groupId>
<artifactId>finder</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.ibm</groupId>
<artifactId>icu</artifactId>
@@ -425,6 +425,37 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>carbon</artifactId>
</dependency>
+
+ <!-- Dependencies for the Apache DS plugin -->
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </dependency>
+
<!-- Other dependencies -->
<dependency>
Modified: directory/studio/trunk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio/pom.xml?rev=666053&r1=666052&r2=666053&view=diff
==============================================================================
--- directory/studio/trunk/studio/pom.xml (original)
+++ directory/studio/trunk/studio/pom.xml Tue Jun 10 03:01:28 2008
@@ -898,6 +898,10 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>jars</artifactId>
</artifactItem>
<artifactItem>
@@ -920,6 +924,10 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.configuration.help</artifactId>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.help</artifactId>
+ </artifactItem>
<!-- The eclipse plugins -->
<artifactItem>
@@ -1162,6 +1170,37 @@
<groupId>org.mortbay</groupId>
<artifactId>jetty</artifactId>
</artifactItem>
+
+ <!-- Added for the Apache DS plugin -->
+ <artifactItem>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>ui</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </artifactItem>
+
</artifactItems>
</configuration>
</execution>
@@ -1182,6 +1221,10 @@
<groupId>org.eclipse.help</groupId>
<artifactId>webapp</artifactId>
</artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -1240,6 +1283,10 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.configuration.feature</artifactId>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.feature</artifactId>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>