directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r607487 [8/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...
Date Sat, 29 Dec 2007 22:57:26 GMT
Modified: directory/sandbox/felixk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/pom.xml (original)
+++ directory/sandbox/felixk/pom.xml Sat Dec 29 14:56:45 2007
@@ -131,81 +131,46 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <!--
-                <activation>
-                <os>
-                <family>unix</family>
-                <arch>i386</arch>
-                </os>
-                </activation>
-            -->
             <properties>
-                <swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.x86</swt.platformrelated.artifactId>
+                <swt.platformrelated.groupId>org.eclipse.swt.gtk.linux</swt.platformrelated.groupId>
+                <swt.platformrelated.artifactId>x86</swt.platformrelated.artifactId>
             </properties>
         </profile>
 
         <!-- Linux AMD64 GTK-->
         <profile>
             <id>linux-amd64</id>
-            <!--
-                <activation>
-                <os>
-                <family>unix</family>
-                <arch>amd64</arch>
-                </os>
-                </activation>
-            -->
             <properties>
-                <swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.x86_64</swt.platformrelated.artifactId>
+                <swt.platformrelated.groupId>org.eclipse.swt.gtk.linux</swt.platformrelated.groupId>
+                <swt.platformrelated.artifactId>x86_64</swt.platformrelated.artifactId>
             </properties>
         </profile>
 
         <!-- Linux PPC GTK-->
         <profile>
             <id>linux-ppc</id>
-            <!--
-                <activation>
-                <os>
-                <family>unix</family>
-                <arch>ppc</arch>
-                </os>
-                </activation>
-            -->
             <properties>
-                <swt.platformrelated.artifactId>org.eclipse.swt.gtk.linux.ppc</swt.platformrelated.artifactId>
+                <swt.platformrelated.groupId>org.eclipse.swt.gtk.linux</swt.platformrelated.groupId>
+                <swt.platformrelated.artifactId>ppc</swt.platformrelated.artifactId>
             </properties>
         </profile>
 
         <!-- Windows -->
         <profile>
             <id>windows-x86</id>
-            <!-- 
-                <activation>
-                <os>
-                <family>windows</family>
-                <arch>x86</arch>
-                </os>
-                </activation>
-            -->
             <properties>
-                <swt.platformrelated.artifactId>org.eclipse.swt.win32.win32.x86</swt.platformrelated.artifactId>
+                <swt.platformrelated.groupId>org.eclipse.swt.win32.win32</swt.platformrelated.groupId>
+                <swt.platformrelated.artifactId>x86</swt.platformrelated.artifactId>
             </properties>
         </profile>
 
         <!-- Windows x86_64 -->
         <profile>
             <id>windows-amd64</id>
-            <!--
-                <activation>
-                <os>
-                <family>windows</family>
-                <arch>amd64</arch>
-                </os>
-                </activation>
-            -->
             <properties>
                 <!-- only available for SDK/RCP >= 3.4
-                    <swt.platformrelated.artifactId>org.eclipse.swt.win32.win32.x86</swt.platformrelated.artifactId>
+                    <swt.platformrelated.groupId>org.eclipse.swt.???</swt.platformrelated.groupId>
+                    <swt.platformrelated.artifactId>???</swt.platformrelated.artifactId>
                 -->
             </properties>
         </profile>
@@ -213,32 +178,18 @@
         <!-- Mac OS X i386 -->
         <profile>
             <id>mac-os-x-i386</id>
-            <!--
-                <activation>
-                <os>
-                <family>mac</family>
-                <arch>i386</arch>
-                </os>
-                </activation>
-            -->
             <properties>
-                <swt.platformrelated.artifactId>org.eclipse.swt.carbon.macosx</swt.platformrelated.artifactId>
+                <swt.platformrelated.groupId>org.eclipse.swt.carbon</swt.platformrelated.groupId>
+                <swt.platformrelated.artifactId>macosx</swt.platformrelated.artifactId>
             </properties>
         </profile>
 
         <!-- Mac OS X PPC -->
         <profile>
             <id>mac-os-x-ppc</id>
-            <!--
-                <activation>
-                <os>
-                <family>mac</family>
-                <arch>ppc</arch>
-                </os>
-                </activation>
-            -->
             <properties>
-                <swt.platformrelated.artifactId>org.eclipse.swt.carbon.macosx</swt.platformrelated.artifactId>
+                <swt.platformrelated.groupId>org.eclipse.swt.carbon</swt.platformrelated.groupId>
+                <swt.platformrelated.artifactId>macosx</swt.platformrelated.artifactId>
             </properties>
         </profile>
     </profiles>
@@ -294,247 +245,247 @@
 
             <!-- Eclipse RCP artifacts -->
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>com.ibm.icu</artifactId>
-                <version>3.6.1.v20070906</version>
+                <groupId>com.ibm</groupId>
+                <artifactId>icu</artifactId>
+                <version>3.6.1-v20070906</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.jobs</artifactId>
-                <version>3.3.1.R33x_v20070709</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>jobs</artifactId>
+                <version>3.3.1-R33x_v20070709</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.rcp</artifactId>
-                <version>3.2.0.v20070612</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>filesystem</artifactId>
+                <version>1.1.0-v20070606</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.equinox.common</artifactId>
-                <version>3.3.0.v20070426</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>resources</artifactId>
+                <version>3.3.0-v20070604</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
-                <version>3.3.1.R33x_v20070828</version>
+                <artifactId>rcp</artifactId>
+                <version>3.2.0-v20070612</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-                <version>3.3.2.v3347</version>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>common</artifactId>
+                <version>3.3.0-v20070426</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-                <version>3.3.2.v3347</version>
+                <artifactId>osgi</artifactId>
+                <version>3.3.1-R33x_v20070828</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.swt.gtk.linux.ppc</artifactId>
-                <version>3.3.2.v3347</version>
+                <groupId>org.eclipse.swt.gtk.linux</groupId>
+                <artifactId>x86</artifactId>
+                <version>3.3.2-v3347</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-                <version>3.3.2.v3347a</version>
+                <groupId>org.eclipse.swt.gtk.linux</groupId>
+                <artifactId>x86_64</artifactId>
+                <version>3.3.2-v3347</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.swt.carbon.macosx</artifactId>
-                <version>3.3.2.v3347a</version>
+                <groupId>org.eclipse.swt.gtk.linux</groupId>
+                <artifactId>ppc</artifactId>
+                <version>3.3.2-v3347</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.jface</artifactId>
-                <version>3.3.1.M20070910-0800b</version>
+                <groupId>org.eclipse.swt.win32.win32</groupId>
+                <artifactId>x86</artifactId>
+                <version>3.3.2-v3347a</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui</artifactId>
-                <version>3.3.1.M20070910-0800b</version>
+                <groupId>org.eclipse.swt.carbon</groupId>
+                <artifactId>macosx</artifactId>
+                <version>3.3.2-v3347a</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.runtime</artifactId>
-                <version>3.3.100.v20070530</version>
+                <artifactId>jface</artifactId>
+                <version>3.3.1-M20070910-0800b</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.equinox.preferences</artifactId>
-                <version>3.2.100.v20070522</version>
+                <artifactId>ui</artifactId>
+                <version>3.3.1-M20070910-0800b</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.equinox.registry</artifactId>
-                <version>3.3.1.R33x_v20070802</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>runtime</artifactId>
+                <version>3.3.100-v20070530</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.workbench</artifactId>
-                <version>3.3.1.M20070921-1200</version>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>preferences</artifactId>
+                <version>3.2.100-v20070522</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.commands</artifactId>
-                <version>3.3.0.I20070605-0010</version>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>registry</artifactId>
+                <version>3.3.1-R33x_v20070802</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.contenttype</artifactId>
-                <version>3.2.100.v20070319</version>
+                <groupId>org.eclipse.ui</groupId>
+                <artifactId>workbench</artifactId>
+                <version>3.3.1-M20070921-1200</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.expressions</artifactId>
-                <version>3.3.0.v20070606-0010</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>commands</artifactId>
+                <version>3.3.0-I20070605-0010</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
-                <version>3.2.100.v20070502</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>contenttype</artifactId>
+                <version>3.2.100-v20070319</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.help</artifactId>
-                <version>3.3.1.v20070726_33x</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>expressions</artifactId>
+                <version>3.3.0-v20070606-0010</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.jface.databinding</artifactId>
-                <version>1.1.1.M20070910-0800b</version>
+                <groupId>org.eclipse.core.runtime.compatibility</groupId>
+                <artifactId>auth</artifactId>
+                <version>3.2.100-v20070502</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.swt</artifactId>
-                <version>3.3.2.v3347</version>
+                <artifactId>help</artifactId>
+                <version>3.3.1-v20070726_33x</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.update.configurator</artifactId>
-                <version>3.2.101.R33x_v20070810</version>
+                <groupId>org.eclipse.jface</groupId>
+                <artifactId>databinding</artifactId>
+                <version>1.1.1-M20070910-0800b</version>
             </dependency>
-
-            <!-- Eclipse SDK dependencies -->
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.filebuffers</artifactId>
-                <version>3.3.1.r331_v20070829</version>
+                <artifactId>swt</artifactId>
+                <version>3.3.2-v3347</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.editors</artifactId>
-                <version>3.2.1.r321_v20060721</version>
+                <groupId>org.eclipse.update</groupId>
+                <artifactId>configurator</artifactId>
+                <version>3.2.101-R33x_v20070810</version>
             </dependency>
+
+            <!-- Eclipse SDK dependencies -->
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
-                <version>3.3.1.r331_v20070806</version>
+                <artifactId>search</artifactId>
+                <version>3.3.1-r331_v20070831-0800</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.search</artifactId>
-                <version>3.3.1.r331_v20070831-0800</version>
+                <groupId>org.eclipse.core</groupId>
+                <artifactId>filebuffers</artifactId>
+                <version>3.3.1-r331_v20070829</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.jface.text</artifactId>
-                <version>3.3.1.r331_v20070629</version>
+                <groupId>org.eclipse.jface</groupId>
+                <artifactId>text</artifactId>
+                <version>3.3.1-r331_v20070629</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.text</artifactId>
-                <version>3.3.0.v20070606-0010</version>
+                <groupId>org.eclipse.ui</groupId>
+                <artifactId>editors</artifactId>
+                <version>3.2.1-r321_v20060721</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.forms</artifactId>
-                <version>3.2.0.v20060602</version>
+                <groupId>org.eclipse.ui.workbench</groupId>
+                <artifactId>texteditor</artifactId>
+                <version>3.3.1-r331_v20070806</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.update.ui</artifactId>
-                <version>3.2.1.v20092006</version>
+                <artifactId>text</artifactId>
+                <version>3.3.0-v20070606-0010</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.update.core</artifactId>
-                <version>3.2.101.R33x_v20070911</version>
+                <groupId>org.eclipse.ui</groupId>
+                <artifactId>forms</artifactId>
+                <version>3.2.0-v20060602</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.views</artifactId>
-                <version>3.2.1.M20060906-0800</version>
+                <groupId>org.eclipse.update</groupId>
+                <artifactId>ui</artifactId>
+                <version>3.2.100-v20070615</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.intro</artifactId>
-                <version>3.2.101.v20070827_33x</version>
+                <groupId>org.eclipse.update</groupId>
+                <artifactId>core</artifactId>
+                <version>3.2.101-R33x_v20070911</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.ui.ide</artifactId>
-                <version>3.3.1.M20070910-0800b</version>
+                <groupId>org.eclipse.ui</groupId>
+                <artifactId>views</artifactId>
+                <version>3.2.1-M20060906-0800</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.help.ui</artifactId>
-                <version>3.3.1.v20070726_33x</version>
+                <groupId>org.eclipse.ui</groupId>
+                <artifactId>intro</artifactId>
+                <version>3.2.101-v20070827_33x</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.help.base</artifactId>
-                <version>3.2.1.R321_v20060822</version>
+                <groupId>org.eclipse.ui</groupId>
+                <artifactId>ide</artifactId>
+                <version>3.3.1-M20070910-0800b</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.help.appserver</artifactId>
-                <version>3.1.200.v20070510</version>
+                <groupId>org.eclipse.help</groupId>
+                <artifactId>ui</artifactId>
+                <version>3.3.1-v20070726_33x</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
-                <version>3.1.100.v20060603</version>
+                <groupId>org.eclipse.help</groupId>
+                <artifactId>base</artifactId>
+                <version>3.2.1-R321_v20060822</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.resources</artifactId>
-                <version>3.3.0.v20070604</version>
+                <groupId>org.eclipse.help</groupId>
+                <artifactId>appserver</artifactId>
+                <version>3.1.200-v20070510</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.filesystem</artifactId>
-                <version>1.1.0.v20070606</version>
+                <groupId>org.eclipse.core.runtime</groupId>
+                <artifactId>compatibility</artifactId>
+                <version>3.1.100-v20060603</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.apache.lucene</artifactId>
-                <version>1.9.1.v200706111724</version>
+                <groupId>org.apache</groupId>
+                <artifactId>lucene</artifactId>
+                <version>1.9.1-v200706111724</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
-                <version>3.2.1.R32x_v20060907</version>
+                <groupId>org.eclipse.core.runtime.compatibility</groupId>
+                <artifactId>registry</artifactId>
+                <version>3.2.1-R32x_v20060907</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.help.webapp</artifactId>
-                <version>3.3.1.v20070823_33x</version>
+                <groupId>org.eclipse.help</groupId>
+                <artifactId>webapp</artifactId>
+                <version>3.3.1-v20070823_33x</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.sdk</artifactId>
-                <version>3.3.2.R33x_v20071022</version>
+                <artifactId>sdk</artifactId>
+                <version>3.3.2-R33x_v20071022</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.tomcat</artifactId>
-                <version>4.1.130.v20060601</version>
+                <artifactId>tomcat</artifactId>
+                <version>4.1.130-v20060601</version>
             </dependency>
 
             <!-- Apache Directory Studio -->
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.connection.core</artifactId>
+                <groupId>org.apache.directory.studio.connection</groupId>
+                <artifactId>core</artifactId>
                 <version>${connection.core.version}</version>
             </dependency>
             <dependency>
@@ -543,123 +494,123 @@
                 <version>${studio.dsml.parser.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+                <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+                <artifactId>core</artifactId>
                 <version>${ldapbrowser.core.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+                <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+                <artifactId>common</artifactId>
                 <version>${ldapbrowser.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.connection.ui</artifactId>
+                <groupId>org.apache.directory.studio.connection</groupId>
+                <artifactId>ui</artifactId>
                 <version>${connection.ui.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.connection.core</artifactId>
+                <groupId>org.apache.directory.studio.connection</groupId>
+                <artifactId>core</artifactId>
                 <version>${connection.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.valueeditors</artifactId>
+                <artifactId>valueeditors</artifactId>
                 <version>${valueeditors.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}</artifactId>
+                <artifactId>studio</artifactId>
                 <version>${rcp.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldifeditor</artifactId>
+                <artifactId>ldifeditor</artifactId>
                 <version>${ldifeditor.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldifparser</artifactId>
+                <artifactId>ldifparser</artifactId>
                 <version>${ldifparser.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.schemaeditor</artifactId>
+                <artifactId>schemaeditor</artifactId>
                 <version>${schemaeditor.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldapbrowser.ui</artifactId>
+                <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+                <artifactId>ui</artifactId>
                 <version>${ldapbrowser.ui.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.apacheds.configuration</artifactId>
+                <groupId>org.apache.directory.studio.apacheds</groupId>
+                <artifactId>configuration</artifactId>
                 <version>${apacheds.configuration.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.jars</artifactId>
+                <artifactId>jars</artifactId>
                 <version>${jars.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.updatesite</artifactId>
+                <artifactId>updatesite</artifactId>
                 <version>${updatesite.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.aciitemeditor</artifactId>
+                <artifactId>aciitemeditor</artifactId>
                 <version>${aciitemeditor.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.feature</artifactId>
+                <artifactId>feature</artifactId>
                 <version>${feature.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.schemaeditor.feature</artifactId>
+                <groupId>org.apache.directory.studio.schemaeditor</groupId>
+                <artifactId>feature</artifactId>
                 <version>${schemaeditor.feature.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldapbrowser.feature</artifactId>
+                <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+                <artifactId>feature</artifactId>
                 <version>${ldapbrowser.feature.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldifeditor.feature</artifactId>
+                <groupId>org.apache.directory.studio.ldifeditor</groupId>
+                <artifactId>feature</artifactId>
                 <version>${ldifeditor.feature.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.apacheds.configuration.feature</artifactId>
+                <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+                <artifactId>feature</artifactId>
                 <version>${apacheds.configuration.feature.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.schemaeditor.help</artifactId>
+                <groupId>org.apache.directory.studio.schemaeditor</groupId>
+                <artifactId>help</artifactId>
                 <version>${schemaeditor.help.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.help</artifactId>
+                <artifactId>help</artifactId>
                 <version>${help.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldifeditor.help</artifactId>
+                <groupId>org.apache.directory.studio.ldifeditor</groupId>
+                <artifactId>help</artifactId>
                 <version>${ldifeditor.help.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.ldapbrowser.help</artifactId>
+                <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+                <artifactId>help</artifactId>
                 <version>${ldapbrowser.help.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>${pom.groupId}.apacheds.configuration.help</artifactId>
+                <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+                <artifactId>help</artifactId>
                 <version>${apacheds.configuration.help.version}</version>
             </dependency>
 

Modified: directory/sandbox/felixk/studio-aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-aciitemeditor/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-aciitemeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-aciitemeditor/pom.xml Sat Dec 29 14:56:45 2007
@@ -27,7 +27,7 @@
     <artifactId>parent</artifactId>
     <version>1.0.2-SNAPSHOT</version>
   </parent>
-  <artifactId>${pom.groupId}.aciitemeditor</artifactId>
+  <artifactId>aciitemeditor</artifactId>
   <version>${aciitemeditor.version}</version>
   <name>Studio ACI Item Editor</name>
   <packaging>jar</packaging>
@@ -111,78 +111,78 @@
       <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.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.apache.directory.studio</groupId>
-      <artifactId>${pom.groupId}.valueeditors</artifactId>
+      <artifactId>valueeditors</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.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>
+      <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>
-      <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.core.runtime</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>runtime</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.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>
-      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <groupId>org.eclipse.ui.workbench</groupId>
+      <artifactId>texteditor</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration-feature/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration-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}.apacheds.configuration.feature</artifactId>
+  <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+  <artifactId>feature</artifactId>
   <version>${apacheds.configuration.feature.version}</version>
   <name>Studio Apache DS Configuration Feature</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration-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}.apacheds.configuration.help</artifactId>
+  <groupId>org.apache.directory.studio.apacheds.configuration</groupId>
+  <artifactId>help</artifactId>
   <version>${apacheds.configuration.help.version}</version>
   <name>Studio Apache DS Configuration Help</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration/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}.apacheds.configuration</artifactId>
+  <groupId>org.apache.directory.studio.apacheds</groupId>
+  <artifactId>configuration</artifactId>
   <version>${apacheds.configuration.version}</version>
   <name>Studio Apache DS Configuration</name>
   <packaging>jar</packaging>
@@ -104,68 +105,68 @@
 
   <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.core.contenttype</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>contenttype</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>resources</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.jface</artifactId>
+      <artifactId>jface</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.ui.ide</artifactId>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>ide</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.equinox.common</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>common</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.core.commands</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>commands</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
+      <artifactId>osgi</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/sandbox/felixk/studio-connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-core/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}.connection.core</artifactId>
+  <groupId>org.apache.directory.studio.connection</groupId>
+  <artifactId>core</artifactId>
   <version>${connection.core.version}</version>
   <name>Connection Core</name>
   <packaging>jar</packaging>
@@ -99,27 +100,27 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.studio.ldifparser</artifactId>
+      <artifactId>ldifparser</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.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.equinox.registry</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>registry</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -127,8 +128,8 @@
       <artifactId>commons-io</artifactId>
     </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>

Modified: directory/sandbox/felixk/studio-connection-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-ui/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-ui/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}.connection.ui</artifactId>
+  <groupId>org.apache.directory.studio.connection</groupId>
+  <artifactId>ui</artifactId>
   <version>${connection.ui.version}</version>
   <name>Studio Connection UI</name>
   <packaging>jar</packaging>
@@ -111,68 +112,68 @@
       <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.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.commands</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>commands</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.jobs</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>jobs</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.equinox.common</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>common</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.workbench.texteditor</artifactId>
+      <groupId>org.eclipse.ui.workbench</groupId>
+      <artifactId>texteditor</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.ui</artifactId>
+      <artifactId>ui</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.apache.directory.studio</groupId>
-      <artifactId>${pom.groupId}.connection.core</artifactId>
+      <groupId>org.apache.directory.studio.connection</groupId>
+      <artifactId>core</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: directory/sandbox/felixk/studio-jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-jars/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-jars/pom.xml (original)
+++ directory/sandbox/felixk/studio-jars/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}.jars</artifactId>
+  <artifactId>jars</artifactId>
   <version>${jars.version}</version>
   <name>Studio Jars</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-common/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}.ldapbrowser.common</artifactId>
+  <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+  <artifactId>common</artifactId>
   <version>${ldapbrowser.common.version}</version>
   <name>Studio LDAP Browser Common</name>
   <packaging>jar</packaging>
@@ -104,81 +105,81 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.studio.ldifparser</artifactId>
+      <artifactId>ldifparser</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.text</artifactId>
+      <artifactId>text</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <groupId>org.eclipse.ui.workbench</groupId>
+      <artifactId>texteditor</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.ui.editors</artifactId>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>editors</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.core.runtime</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>runtime</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.osgi</artifactId>
+      <artifactId>osgi</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.registry</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>registry</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>
+      <groupId>${swt.platformrelated.groupId}</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -188,18 +189,18 @@
       <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.apache.directory.studio</groupId>
-      <artifactId>${pom.groupId}.connection.ui</artifactId>
+      <groupId>org.apache.directory.studio.connection</groupId>
+      <artifactId>ui</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF Sat Dec 29 14:56:45 2007
@@ -25,6 +25,6 @@
  org.apache.directory.studio.ldapbrowser.core.propertypageproviders,
  org.apache.directory.studio.ldapbrowser.core.utils
 Bundle-ClassPath: .,
- lib/commons-codec-1.3.jar,
  lib/commons-io-1.3.1.jar,
+ lib/commons-codec-1.3.jar,
  lib/poi-3.0.1-FINAL.jar

Modified: directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/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}.ldapbrowser.core</artifactId>
+  <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+  <artifactId>core</artifactId>
   <version>${ldapbrowser.core.version}</version>
   <name>Studio LDAP Browser Core</name>
   <packaging>jar</packaging>
@@ -92,41 +93,61 @@
 
   <dependencies>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.studio.ldifparser</artifactId>
+      <artifactId>ldifparser</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <artifactId>osgi</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.equinox.common</artifactId>
+      <artifactId>search</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
+      <artifactId>text</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.core.runtime</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>jobs</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.core.jobs</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>common</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>preferences</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
       <scope>provided</scope>
@@ -137,8 +158,8 @@
       <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>
@@ -147,11 +168,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.search</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>provided</scope>
@@ -169,14 +185,6 @@
           <artifactId>log4j</artifactId>
         </exclusion>
       </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/sandbox/felixk/studio-ldapbrowser-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-feature/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-feature/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-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}.ldapbrowser.feature</artifactId>
+  <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+  <artifactId>feature</artifactId>
   <version>${ldapbrowser.feature.version}</version>
   <name>Studio LDAP Browser Feature</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-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}.ldapbrowser.help</artifactId>
+  <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+  <artifactId>help</artifactId>
   <version>${ldapbrowser.help.version}</version>
   <name>Studio LDAP Browser Help</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-ui/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}.ldapbrowser.ui</artifactId>
+  <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+  <artifactId>ui</artifactId>
   <version>${ldapbrowser.ui.version}</version>
   <name>Studio LDAP Browser UI</name>
   <packaging>jar</packaging>
@@ -114,12 +115,12 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.studio.ldifparser</artifactId>
+      <artifactId>ldifparser</artifactId>
       <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>
@@ -128,112 +129,112 @@
       <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.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}.ldifeditor</artifactId>
+      <artifactId>ldifeditor</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.osgi</artifactId>
+      <artifactId>osgi</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.preferences</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>preferences</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.search</artifactId>
+      <artifactId>search</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.core.runtime</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>runtime</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.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.text</artifactId>
+      <artifactId>text</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.ide</artifactId>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>ide</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.ui.views</artifactId>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>views</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.ui.workbench.texteditor</artifactId>
+      <groupId>org.eclipse.ui.workbench</groupId>
+      <artifactId>texteditor</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>${swt.platformrelated.groupId}</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: directory/sandbox/felixk/studio-ldif-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldif-parser/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldif-parser/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldif-parser/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}.ldifparser</artifactId>
+  <artifactId>ldifparser</artifactId>
   <version>${ldifparser.version}</version>
   <name>Studio LDIF Parser</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-ldifeditor-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor-feature/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor-feature/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldifeditor-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}.ldifeditor.feature</artifactId>
+  <groupId>org.apache.directory.studio.ldifeditor</groupId>
+  <artifactId>feature</artifactId>
   <version>${ldifeditor.feature.version}</version>
   <name>Studio LDIF Editor Feature</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-ldifeditor-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor-help/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldifeditor-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}.ldifeditor.help</artifactId>
+  <groupId>org.apache.directory.studio.ldifeditor</groupId>
+  <artifactId>help</artifactId>
   <version>${ldifeditor.help.version}</version>
   <name>Studio LDIF Editor Help</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldifeditor/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}.ldifeditor</artifactId>
+  <artifactId>ldifeditor</artifactId>
   <version>${ldifeditor.version}</version>
   <name>Studio LDIF Editor</name>
   <packaging>jar</packaging>
@@ -111,7 +111,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.studio.ldifparser</artifactId>
+      <artifactId>ldifparser</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -120,108 +120,108 @@
       <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.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}.ldapbrowser.core</artifactId>
+      <groupId>org.apache.directory.studio.ldapbrowser</groupId>
+      <artifactId>core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>${pom.groupId}.valueeditors</artifactId>
+      <artifactId>valueeditors</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.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.equinox.preferences</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>preferences</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.osgi</artifactId>
+      <artifactId>osgi</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.equinox.registry</artifactId>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>registry</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.core.filebuffers</artifactId>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>filebuffers</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.views</artifactId>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>views</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.ui.workbench.texteditor</artifactId>
+      <groupId>org.eclipse.ui.workbench</groupId>
+      <artifactId>texteditor</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
-      <artifactId>org.eclipse.text</artifactId>
+      <artifactId>text</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: directory/sandbox/felixk/studio-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/pom.xml (original)
+++ directory/sandbox/felixk/studio-plugin/pom.xml Sat Dec 29 14:56:45 2007
@@ -107,6 +107,11 @@
       <version>2.0.7</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-osgi</artifactId>
+      <version>0.2.0</version>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
       <version>1.0-alpha-9</version>

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java (original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCopyEclipseDependencyMojo.java Sat Dec 29 14:56:45 2007
@@ -25,6 +25,8 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
+import org.apache.maven.shared.osgi.Maven2OsgiConverter;
 
 /**
  * Copy a set of artifacts to a configured output directory by replacing the
@@ -69,6 +71,8 @@
     }
 
     public void execute() throws MojoExecutionException {
+        final Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter();
+        
         completeArtifactItems(artifactItems);
 
         for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();) {
@@ -76,7 +80,7 @@
             try {
 
                 final File destFile = new File(destinationDirectory.getAbsoluteFile() + File.separator
-                        + item.getArtifactId() + "_" + item.getVersion() + "." + item.getType());
+                        + maven2OsgiConverter.getBundleFileName(item.getArtifact()));
 
                 getLog().info("Copying artifact " + item.getArtifactId() + " to\n               " + destFile.getAbsolutePath());
 

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java (original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java Sat Dec 29 14:56:45 2007
@@ -37,6 +37,8 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
+import org.apache.maven.shared.osgi.Maven2OsgiConverter;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -81,6 +83,11 @@
      */
     public final static String ENTRY_BUNDLE_CLASSPATH = "Bundle-ClassPath:";
 
+    /**
+     * Bundle symbolic name: updated with the artifact id.
+     */
+    public final static String ENTRY_BUNDLE_SYMBOLICNAME = "Bundle-SymbolicName:";
+
     public void execute() throws MojoExecutionException {
         if (!skip) {
             try {
@@ -160,6 +167,7 @@
      */
     private void updateManifest(final List<Artifact> list)
             throws FileNotFoundException, IOException {
+        final Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter();
         final File manifestFile = new File(project.getBasedir(),
                 "META-INF/MANIFEST.MF");
         getLog().info("Update Bundle-Classpath in " + manifestFile);
@@ -192,7 +200,17 @@
             String name = line.substring(0, line.indexOf(":") + 1);
 
             if (!name.equalsIgnoreCase(ENTRY_BUNDLE_CLASSPATH)) {
-                manifestSb.append(line).append(NEWLINE);
+                if (name.equalsIgnoreCase(ENTRY_BUNDLE_SYMBOLICNAME)) {
+                    // get OSGI Bundle Name
+                    manifestSb.append(ENTRY_BUNDLE_SYMBOLICNAME);
+                    manifestSb.append(" ");
+                    manifestSb.append(maven2OsgiConverter
+                            .getBundleSymbolicName(project.getArtifact()));
+                    manifestSb.append(";singleton:=true");
+                    manifestSb.append(NEWLINE);
+                } else {
+                    manifestSb.append(line).append(NEWLINE);
+                }
             } else {
                 inBundleClasspathEntry = true;
             }

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java (original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java Sat Dec 29 14:56:45 2007
@@ -25,6 +25,8 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
+import org.apache.maven.shared.osgi.Maven2OsgiConverter;
 
 /**
  * Add ro replace file in existing, distributed artifact
@@ -92,14 +94,16 @@
     }
 
     public void execute() throws MojoExecutionException {
+        final Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter();
+        
         completeArtifactItems(artifactItems);
 
         // Add file to packed file
         for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();) {
             ArtifactItem item = artifactItem.next();
             try {
-                final File zipFile = new File(destinationDirectory.getAbsolutePath() + File.separator
-                        + item.getArtifactId() + "_" + item.getVersion() + "." + item.getType());
+                final File zipFile = new File(destinationDirectory.getAbsoluteFile() + File.separator
+                        + maven2OsgiConverter.getBundleFileName(item.getArtifact()));
                 final File tmpDir = new File(pluginWorkDir + item.getArtifact().getArtifactId());
                 unpackToLocation(tmpDir, zipFile);
                 getLog().info("Adding " + inputFile + " to\n              " + zipFile);

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java (original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java Sat Dec 29 14:56:45 2007
@@ -24,6 +24,8 @@
 import java.util.Iterator;
 
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
+import org.apache.maven.shared.osgi.Maven2OsgiConverter;
 
 /**
  * Prefixes the unpack of an artifact into a given directory with a directory
@@ -67,12 +69,13 @@
     }
 
     public void execute() throws MojoExecutionException {
+        final Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter();
         completeArtifactItems(artifactItems);
         for (Iterator<ArtifactItem> artifactItem = artifactItems.iterator(); artifactItem.hasNext();) {
             ArtifactItem item = artifactItem.next();
             try {
-                final File tmpDir = new File(outputDirectory.getAbsoluteFile() + File.separator + item.getArtifactId()
-                        + "_" + item.getVersion());
+                final File tmpDir = new File(outputDirectory.getAbsoluteFile() + File.separator + maven2OsgiConverter.getBundleSymbolicName(item.getArtifact())
+                        + "_" + maven2OsgiConverter.getVersion(item.getArtifact()));
                 unpackToLocation(tmpDir, item.getArtifact().getFile());
             } catch (Exception e) {
                 throw new MojoExecutionException("", e);

Modified: directory/sandbox/felixk/studio-rcp-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp-feature/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp-feature/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp-feature/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}.feature</artifactId>
+  <artifactId>feature</artifactId>
   <version>${feature.version}</version>
   <name>Studio RCP Feature</name>
   <packaging>jar</packaging>

Modified: directory/sandbox/felixk/studio-rcp-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp-help/pom.xml?rev=607487&r1=607486&r2=607487&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp-help/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}.help</artifactId>
+  <artifactId>help</artifactId>
   <version>${help.version}</version>
   <name>Studio RCP Help</name>
   <packaging>jar</packaging>



Mime
View raw message