Return-Path: 
 <commits-return-16860-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 43470 invoked from network); 15 Jan 2008 10:51:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Jan 2008 10:51:21 -0000
Received: (qmail 13708 invoked by uid 500); 15 Jan 2008 10:51:11 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 13674 invoked by uid 500); 15 Jan 2008 10:51:11 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 13663 invoked by uid 99); 15 Jan 2008 10:51:11 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2008 02:51:11 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2008 10:50:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7B5121A9832; Tue, 15 Jan 2008 02:50:57 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r612076 - in /directory/sandbox/felixk: pom.xml
 studio/pom.xml
Date: Tue, 15 Jan 2008 10:50:53 -0000
To: commits@directory.apache.org
From: pamarcelot@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080115105059.7B5121A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pamarcelot
Date: Tue Jan 15 02:50:51 2008
New Revision: 612076

URL: http://svn.apache.org/viewvc?rev=612076&view=rev
Log:
Fixing some issues with Maven Build. The application now launches correctly but we have to fix the issue with the repackaged plugins.

Modified:
    directory/sandbox/felixk/pom.xml
    directory/sandbox/felixk/studio/pom.xml

Modified: directory/sandbox/felixk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/pom.xml?rev=612076&r1=612075&r2=612076&view=diff
==============================================================================
--- directory/sandbox/felixk/pom.xml (original)
+++ directory/sandbox/felixk/pom.xml Tue Jan 15 02:50:51 2008
@@ -158,7 +158,7 @@
         <version>2.0.7</version>
       </dependency>
 
-      <!-- Eclipse RCP binaries -->
+      <!-- Apache Directory Studio launchers binaries -->
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>launcher-linux-x86</artifactId>
@@ -197,6 +197,26 @@
         <version>3.6.1-v20070906</version>
       </dependency>
       <dependency>
+        <groupId>javax</groupId>
+        <artifactId>servlet</artifactId>
+        <version>2.4.0.v200706111738</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jsp</artifactId>
+        <version>2.0.0.v200706191603</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>el</artifactId>
+        <version>1.0.0-v200706111724</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>logging</artifactId>
+        <version>1.0.4-v200706111724</version>
+      </dependency>
+      <dependency>
         <groupId>org.eclipse.core</groupId>
         <artifactId>jobs</artifactId>
         <version>3.3.1-R33x_v20070709</version>
@@ -207,6 +227,31 @@
         <version>1.1.0-v20070606</version>
       </dependency>
       <dependency>
+        <groupId>org.eclipse.core.filesystem.linux</groupId>
+        <artifactId>ppc</artifactId>
+        <version>1.0.100-v20070430</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.core.filesystem.linux</groupId>
+        <artifactId>x86</artifactId>
+        <version>1.1.0-v20070416</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.core.filesystem.linux</groupId>
+        <artifactId>x86_64</artifactId>
+        <version>1.0.100-v20070510</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.core.filesystem.win32</groupId>
+        <artifactId>x86</artifactId>
+        <version>1.1.0-v20070510</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.core.filesystem</groupId>
+        <artifactId>macosx</artifactId>
+        <version>1.0.0-v20060603</version>
+      </dependency>
+      <dependency>
         <groupId>org.eclipse.core</groupId>
         <artifactId>resources</artifactId>
         <version>3.3.0-v20070604</version>
@@ -287,6 +332,76 @@
         <version>1.0.2.R331_v20071019</version>
       </dependency>
       <dependency>
+        <groupId>org.apache</groupId>
+        <artifactId>jasper</artifactId>
+        <version>5.5.17.v200706111724</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>analysis</artifactId>
+        <version>1.9.1-v200706181610</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.core.resources</groupId>
+        <artifactId>compatibility</artifactId>
+        <version>3.2.100-v20070502</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.equinox.http</groupId>
+        <artifactId>jetty</artifactId>
+        <version>1.0.1-R33x_v20070816</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.equinox.http</groupId>
+        <artifactId>registry</artifactId>
+        <version>1.0.0-v20070608</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.equinox.http</groupId>
+        <artifactId>servlet</artifactId>
+        <version>1.0.1-R33x_v20070816</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.equinox.jsp</groupId>
+        <artifactId>jasper</artifactId>
+        <version>1.0.1-R33x_v20070816</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.equinox.jsp.jasper</groupId>
+        <artifactId>registry</artifactId>
+        <version>1.0.0-v20070607</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.osgi</groupId>
+        <artifactId>services</artifactId>
+        <version>3.1.200-v20070605</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.osgi</groupId>
+        <artifactId>util</artifactId>
+        <version>3.1.200-v20070605</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.ui.ide</groupId>
+        <artifactId>application</artifactId>
+        <version>1.0.0-I20070530-0100</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.ui.workbench</groupId>
+        <artifactId>compatibility</artifactId>
+        <version>3.2.0-I20070319-0010</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.update</groupId>
+        <artifactId>scheduler</artifactId>
+        <version>3.2.100-v20070615</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay</groupId>
+        <artifactId>jetty</artifactId>
+        <version>5.1.11.v200706111724</version>
+      </dependency>
+      <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>jface</artifactId>
         <version>3.3.1-M20070910-0800b</version>
@@ -464,7 +579,7 @@
       <dependency>
         <groupId>org.eclipse.ui</groupId>
         <artifactId>editors</artifactId>
-        <version>3.2.1-r321_v20060721</version>
+        <version>3.3.1-r331_v20070629</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse</groupId>
@@ -507,7 +622,7 @@
       <dependency>
         <groupId>org.eclipse.ui</groupId>
         <artifactId>forms</artifactId>
-        <version>3.2.0-v20060602</version>
+        <version>3.3.0-v20070511</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.update</groupId>
@@ -538,7 +653,7 @@
       <dependency>
         <groupId>org.eclipse.ui</groupId>
         <artifactId>views</artifactId>
-        <version>3.2.1-M20060906-0800</version>
+        <version>3.2.101.M20070910-0800b</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse</groupId>
@@ -586,7 +701,7 @@
       <dependency>
         <groupId>org.eclipse.help</groupId>
         <artifactId>base</artifactId>
-        <version>3.2.1-R321_v20060822</version>
+        <version>3.3.1.v20070813_33x</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.help</groupId>
@@ -596,7 +711,7 @@
       <dependency>
         <groupId>org.eclipse.core.runtime</groupId>
         <artifactId>compatibility</artifactId>
-        <version>3.1.100-v20060603</version>
+        <version>3.1.200.v20070502</version>
       </dependency>
       <dependency>
         <groupId>org.apache</groupId>
@@ -606,7 +721,7 @@
       <dependency>
         <groupId>org.eclipse.core.runtime.compatibility</groupId>
         <artifactId>registry</artifactId>
-        <version>3.2.1-R32x_v20060907</version>
+        <version>3.2.100-v20070316</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.help</groupId>

Modified: directory/sandbox/felixk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/pom.xml?rev=612076&r1=612075&r2=612076&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/pom.xml (original)
+++ directory/sandbox/felixk/studio/pom.xml Tue Jan 15 02:50:51 2008
@@ -121,6 +121,10 @@
                       <groupId>org.eclipse.swt.gtk.linux</groupId>
                       <artifactId>x86</artifactId>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.core.filesystem.linux</groupId>
+                      <artifactId>x86</artifactId>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -246,6 +250,10 @@
                       <groupId>org.eclipse.swt.gtk.linux</groupId>
                       <artifactId>x86_64</artifactId>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.core.filesystem.linux</groupId>
+                      <artifactId>x86_64</artifactId>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -371,6 +379,10 @@
                       <groupId>org.eclipse.swt.gtk.linux</groupId>
                       <artifactId>ppc</artifactId>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.core.filesystem.linux</groupId>
+                      <artifactId>ppc</artifactId>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -495,6 +507,10 @@
                       <groupId>org.eclipse.swt.win32.win32</groupId>
                       <artifactId>x86</artifactId>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.core.filesystem.win</groupId>
+                      <artifactId>x86</artifactId>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -619,6 +635,10 @@
                       <groupId>org.eclipse.swt.carbon</groupId>
                       <artifactId>macosx</artifactId>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.core.filesystem</groupId>
+                      <artifactId>macosx</artifactId>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -941,7 +961,77 @@
                   <groupId>org.eclipse.core</groupId>
                   <artifactId>runtime</artifactId>
                 </artifactItem>
-
+                
+                
+                <artifactItem>
+                    <groupId>javax</groupId>
+                    <artifactId>servlet</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>jsp</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>el</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>logging</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.apache</groupId>
+                    <artifactId>jasper</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.apache.lucene</groupId>
+                    <artifactId>analysis</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.core.resources</groupId>
+                    <artifactId>compatibility</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.equinox.http</groupId>
+                    <artifactId>jetty</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.equinox.http</groupId>
+                    <artifactId>registry</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.equinox.http</groupId>
+                    <artifactId>servlet</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.equinox.jsp</groupId>
+                    <artifactId>jasper</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.equinox.jsp.jasper</groupId>
+                    <artifactId>registry</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.osgi</groupId>
+                    <artifactId>services</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.osgi</groupId>
+                    <artifactId>util</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.ui.ide</groupId>
+                    <artifactId>application</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.update</groupId>
+                    <artifactId>scheduler</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.mortbay</groupId>
+                    <artifactId>jetty</artifactId>
+                </artifactItem>
+                
               </artifactItems>
             </configuration>
           </execution>
@@ -959,24 +1049,38 @@
                   <artifactId>lucene</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.eclipse.core.runtime.compatibility</groupId>
-                  <artifactId>registry</artifactId>
-                </artifactItem>
-                <artifactItem>
                   <groupId>org.eclipse.help</groupId>
                   <artifactId>webapp</artifactId>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          
+          <execution>
+            <id>unpack-plugins</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>unpack-with-artifactid-prefix</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${studio-dir}/plugins</outputDirectory>
+              <artifactItems>
                 <artifactItem>
                   <groupId>org.eclipse</groupId>
                   <artifactId>sdk</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.eclipse</groupId>
-                  <artifactId>tomcat</artifactId>
+                  <groupId>org.eclipse.core.runtime.compatibility</groupId>
+                  <artifactId>registry</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.ui.workbench</groupId>
+                    <artifactId>compatibility</artifactId>
                 </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
+          
           <execution>
             <id>unpack-features-with-artifactid-prefix</id>
             <phase>process-resources</phase>
@@ -1009,7 +1113,8 @@
               </artifactItems>
             </configuration>
           </execution>
-          <execution>
+          
+          <!--<execution>
             <id>replace-plugin.xml-in-org.eclipse.search</id>
             <phase>process-resources</phase>
             <goals>
@@ -1065,7 +1170,7 @@
                 </artifactItem>
               </artifactItems>
             </configuration>
-          </execution>
+          </execution>-->
         </executions>
       </plugin>
       <!-- No tests to run -->