You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2007/12/29 23:57:26 UTC
svn commit: r607487 [9/9] - in /directory/sandbox/felixk: ./
local-repository/com/ local-repository/com/ibm/
local-repository/com/ibm/icu/ local-repository/com/ibm/icu/3.6.1-v20070906/
local-repository/org/apache/ local-repository/org/apache/commons/ l...
Modified: directory/sandbox/felixk/studio-rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,8 @@
<artifactId>parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio</artifactId>
<version>${rcp.version}</version>
<name>Studio RCP</name>
<packaging>jar</packaging>
@@ -108,7 +109,7 @@
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>${swt.platformrelated.groupId}</groupId>
<artifactId>${swt.platformrelated.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
@@ -118,52 +119,52 @@
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface</artifactId>
+ <artifactId>jface</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui</artifactId>
+ <artifactId>ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.workbench</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>workbench</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.commands</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.jobs</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <artifactId>osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.update.core</artifactId>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.update.ui</artifactId>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>ui</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: directory/sandbox/felixk/studio-schemaeditor-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor-feature/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor-feature/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor-feature/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,8 @@
<artifactId>parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.schemaeditor.feature</artifactId>
+ <groupId>org.apache.directory.studio.schemaeditor</groupId>
+ <artifactId>feature</artifactId>
<version>${schemaeditor.feature.version}</version>
<name>Studio Schema Editor Feature</name>
<packaging>jar</packaging>
Modified: directory/sandbox/felixk/studio-schemaeditor-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor-help/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor-help/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,8 @@
<artifactId>parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.schemaeditor.help</artifactId>
+ <groupId>org.apache.directory.studio.schemaeditor</groupId>
+ <artifactId>help</artifactId>
<version>${schemaeditor.help.version}</version>
<name>Studio Schema Editor Help</name>
<packaging>jar</packaging>
Modified: directory/sandbox/felixk/studio-schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,7 @@
<artifactId>parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.schemaeditor</artifactId>
+ <artifactId>schemaeditor</artifactId>
<version>${schemaeditor.version}</version>
<name>Studio Schema Editor</name>
<packaging>jar</packaging>
@@ -118,93 +118,93 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.commands</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.jobs</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface</artifactId>
+ <artifactId>jface</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface.text</artifactId>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.forms</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>forms</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.text</artifactId>
+ <artifactId>text</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.preferences</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.registry</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>registry</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui</artifactId>
+ <artifactId>ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <artifactId>osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.editors</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.workbench</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>workbench</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>${swt.platformrelated.groupId}</groupId>
<artifactId>${swt.platformrelated.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.core</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.ui</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.search</artifactId>
+ <artifactId>search</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: directory/sandbox/felixk/studio-updatesite/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-updatesite/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-updatesite/pom.xml (original)
+++ directory/sandbox/felixk/studio-updatesite/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,7 @@
<artifactId>parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.updatesite</artifactId>
+ <artifactId>updatesite</artifactId>
<version>${updatesite.version}</version>
<name>Studio Update Site</name>
<packaging>pom</packaging>
@@ -78,71 +78,71 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+ <artifactId>aciitemeditor</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.ui</artifactId>
+ <artifactId>jars</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.core</artifactId>
+ <artifactId>ldifeditor</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.valueeditors</artifactId>
+ <artifactId>schemaeditor</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}</artifactId>
+ <artifactId>studio</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifeditor</artifactId>
+ <artifactId>valueeditors</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.schemaeditor</artifactId>
+ <groupId>org.apache.directory.studio.apacheds</groupId>
+ <artifactId>configuration</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.schemaeditor.help</artifactId>
+ <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.ui</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>core</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.apacheds.configuration</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.jars</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>common</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.aciitemeditor</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>core</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.help</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifeditor.help</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.help</artifactId>
+ <groupId>org.apache.directory.studio.ldifeditor</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.apacheds.configuration.help</artifactId>
+ <groupId>org.apache.directory.studio.schemaeditor</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
</artifactItems>
</configuration>
@@ -158,23 +158,23 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.feature</artifactId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.schemaeditor.feature</artifactId>
+ <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.feature</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifeditor.feature</artifactId>
+ <groupId>org.apache.directory.studio.ldifeditor</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.apacheds.configuration.feature</artifactId>
+ <groupId>org.apache.directory.studio.schemaeditor</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
</artifactItems>
</configuration>
Modified: directory/sandbox/felixk/studio-valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-valueeditors/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-valueeditors/pom.xml (original)
+++ directory/sandbox/felixk/studio-valueeditors/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,7 @@
<artifactId>parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.valueeditors</artifactId>
+ <artifactId>valueeditors</artifactId>
<version>${valueeditors.version}</version>
<name>Studio Value Editors</name>
<packaging>jar</packaging>
@@ -108,13 +108,13 @@
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>${swt.platformrelated.groupId}</groupId>
<artifactId>${swt.platformrelated.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <artifactId>osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -123,48 +123,48 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.ui</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.core</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface</artifactId>
+ <artifactId>jface</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.jobs</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.workbench</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>workbench</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: directory/sandbox/felixk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/pom.xml (original)
+++ directory/sandbox/felixk/studio/pom.xml Sat Dec 29 14:56:45 2007
@@ -42,14 +42,6 @@
<!-- Linux i386 GTK-->
<profile>
<id>linux-i386</id>
- <!--
- <activation>
- <os>
- <family>unix</family>
- <arch>i386</arch>
- </os>
- </activation>
- -->
<build>
<plugins>
<plugin>
@@ -150,14 +142,6 @@
<!-- Linux AMD64 GTK-->
<profile>
<id>linux-amd64</id>
- <!--
- <activation>
- <os>
- <family>unix</family>
- <arch>amd64</arch>
- </os>
- </activation>
- -->
<build>
<plugins>
<plugin>
@@ -198,7 +182,7 @@
<delete dir="target/ApacheDirectoryStudio-linux-amd64" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
<delete dir="target/ApacheDirectoryStudio-linux-amd64/about_files" />
<delete dir="target/ApacheDirectoryStudio-linux-amd64/configuration" />
- <delete dir="target/ApacheDirectoryStudio-linux-amd64/feature" />
+ <delete dir="target/ApacheDirectoryStudio-linux-amd64/features" />
<delete>
<fileset dir="target/ApacheDirectoryStudio-linux-amd64/plugins" excludes="**/org.eclipse.swt.gtk.linux.x86_64*" />
</delete>
@@ -259,14 +243,6 @@
<!-- Linux PPC GTK-->
<profile>
<id>linux-ppc</id>
- <!--
- <activation>
- <os>
- <family>unix</family>
- <arch>ppc</arch>
- </os>
- </activation>
- -->
<build>
<plugins>
<plugin>
@@ -307,7 +283,7 @@
<delete dir="target/ApacheDirectoryStudio-linux-ppc" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
<delete dir="target/ApacheDirectoryStudio-linux-ppc/about_files" />
<delete dir="target/ApacheDirectoryStudio-linux-ppc/configuration" />
- <delete dir="target/ApacheDirectoryStudio-linux-ppc/feature" />
+ <delete dir="target/ApacheDirectoryStudio-linux-ppc/features" />
<delete>
<fileset dir="target/ApacheDirectoryStudio-linux-ppc/plugins" excludes="**/org.eclipse.swt.gtk.linux.ppc*" />
</delete>
@@ -368,14 +344,6 @@
<!-- Windows -->
<profile>
<id>windows-x86</id>
- <!--
- <activation>
- <os>
- <family>windows</family>
- <arch>x86</arch>
- </os>
- </activation>
- -->
<build>
<plugins>
<plugin>
@@ -476,14 +444,6 @@
<!-- Windows x86_64 -->
<profile>
<id>windows-amd64</id>
- <!--
- <activation>
- <os>
- <family>windows</family>
- <arch>amd64</arch>
- </os>
- </activation>
- -->
<!-- only available for SDK/RCP >= 3.4 -->
<build>
<plugins>
@@ -586,14 +546,6 @@
<!-- Mac OS X i386 -->
<profile>
<id>mac-os-x-i386</id>
- <!--
- <activation>
- <os>
- <family>mac</family>
- <arch>i386</arch>
- </os>
- </activation>
- -->
<build>
<plugins>
<plugin>
@@ -697,14 +649,6 @@
<!-- Mac OS X PPC -->
<profile>
<id>mac-os-x-ppc</id>
- <!--
- <activation>
- <os>
- <family>mac</family>
- <arch>ppc</arch>
- </os>
- </activation>
- -->
<build>
<plugins>
<plugin>
@@ -809,293 +753,266 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>maven-studio-plugin</artifactId>
<executions>
<execution>
- <id>unpack-eclipse-plugins</id>
+ <id>copy-plugins</id>
<phase>process-resources</phase>
<goals>
- <goal>unpack</goal>
+ <goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <overWrite>false</overWrite>
- <outputDirectory>${studio-dir}/plugins</outputDirectory>
+ <destinationDirectory>${studio-dir}/plugins</destinationDirectory>
<artifactItems>
+ <!-- The directory studio plugins -->
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.apache.lucene</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>core</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>common</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.help.webapp</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.sdk</artifactId>
+ <groupId>org.apache.directory.studio.connection</groupId>
+ <artifactId>core</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.tomcat</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>valueeditors</artifactId>
</artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>maven-studio-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-directory-studio-plugins</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-eclipse-artifact</goal>
- </goals>
- <configuration>
- <destinationDirectory>${studio-dir}/plugins</destinationDirectory>
- <artifactItems>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+ <artifactId>studio</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+ <artifactId>ldifeditor</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.ui</artifactId>
+ <artifactId>ldifparser</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.connection.core</artifactId>
+ <artifactId>schemaeditor</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.valueeditors</artifactId>
+ <groupId>org.apache.directory.studio.schemaeditor</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifeditor</artifactId>
+ <groupId>org.apache.directory.studio.apacheds</groupId>
+ <artifactId>configuration</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifparser</artifactId>
+ <artifactId>jars</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.schemaeditor</artifactId>
+ <artifactId>aciitemeditor</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.schemaeditor.help</artifactId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.ui</artifactId>
+ <groupId>org.apache.directory.studio.ldifeditor</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.apacheds.configuration</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.jars</artifactId>
+ <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+ <artifactId>help</artifactId>
</artifactItem>
+
+ <!-- The eclipse plugins -->
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.aciitemeditor</artifactId>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.help</artifactId>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>core</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifeditor.help</artifactId>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.help</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>views</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.apacheds.configuration.help</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>intro</artifactId>
</artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-eclipse-plugins</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-eclipse-artifact</goal>
- </goals>
- <configuration>
- <destinationDirectory>${studio-dir}/plugins</destinationDirectory>
- <artifactItems>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.update.ui</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>ide</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.update.core</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>forms</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.views</artifactId>
+ <artifactId>text</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.intro</artifactId>
+ <artifactId>search</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.forms</artifactId>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.editors</artifactId>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>base</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.text</artifactId>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>appserver</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.search</artifactId>
+ <groupId>org.eclipse.core.runtime</groupId>
+ <artifactId>compatibility</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface.text</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.help.ui</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.help.base</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.help.appserver</artifactId>
+ <groupId>org.eclipse.core.runtime</groupId>
+ <artifactId>compatibility</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>configurator</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.resources</artifactId>
+ <artifactId>ui</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.filesystem</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>workbench</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.filebuffers</artifactId>
+ <artifactId>swt</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
+ <artifactId>rcp</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.update.configurator</artifactId>
+ <artifactId>osgi</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui</artifactId>
+ <artifactId>jface</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.workbench</artifactId>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>databinding</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.swt</artifactId>
+ <artifactId>help</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.rcp</artifactId>
+ <groupId>com.ibm</groupId>
+ <artifactId>icu</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>contenttype</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.jface.databinding</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.help</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>com.ibm.icu</artifactId>
+ <groupId>org.eclipse.core.runtime.compatibility</groupId>
+ <artifactId>auth</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.commands</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.contenttype</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.expressions</artifactId>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>registry</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.jobs</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
</artifactItem>
+
+ <!-- TODO Do we need to unpack them ? -->
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
+ <groupId>org.apache</groupId>
+ <artifactId>lucene</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
+ <groupId>org.eclipse.core.runtime.compatibility</groupId>
+ <artifactId>registry</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.preferences</artifactId>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>webapp</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.equinox.registry</artifactId>
+ <artifactId>sdk</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
+ <artifactId>tomcat</artifactId>
</artifactItem>
</artifactItems>
</configuration>
@@ -1111,23 +1028,23 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.feature</artifactId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.schemaeditor.feature</artifactId>
+ <groupId>org.apache.directory.studio.schemaeditor</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldapbrowser.feature</artifactId>
+ <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.ldifeditor.feature</artifactId>
+ <groupId>org.apache.directory.studio.ldifeditor</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>${pom.groupId}.apacheds.configuration.feature</artifactId>
+ <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+ <artifactId>feature</artifactId>
</artifactItem>
</artifactItems>
</configuration>
@@ -1146,7 +1063,7 @@
<artifactItems>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.search</artifactId>
+ <artifactId>search</artifactId>
</artifactItem>
</artifactItems>
</configuration>
@@ -1164,8 +1081,8 @@
<outputDirectory>${studio-dir}/plugins</outputDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.editors</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
</artifactItem>
</artifactItems>
</configuration>
@@ -1183,8 +1100,8 @@
<outputDirectory>${studio-dir}/plugins</outputDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>ide</artifactId>
</artifactItem>
</artifactItems>
</configuration>