directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r660549 - in /directory/studio/branches/apacheds-plugin-branch: apacheds/pom.xml pom.xml repository/pom.xml studio/pom.xml
Date Tue, 27 May 2008 15:03:49 GMT
Author: pamarcelot
Date: Tue May 27 08:03:45 2008
New Revision: 660549

URL: http://svn.apache.org/viewvc?rev=660549&view=rev
Log:
Added the Apache DS plugin to the main build.

Modified:
    directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml
    directory/studio/branches/apacheds-plugin-branch/pom.xml
    directory/studio/branches/apacheds-plugin-branch/repository/pom.xml
    directory/studio/branches/apacheds-plugin-branch/studio/pom.xml

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml?rev=660549&r1=660548&r2=660549&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml Tue May 27 08:03:45
2008
@@ -661,30 +661,22 @@
     <dependency>
       <groupId>org.eclipse.debug</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.2.v20080117_r332</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.debug</groupId>
       <artifactId>ui</artifactId>
-      <version>3.3.2.v20080117_r332</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>launching</artifactId>
-      <version>3.3.2.v20080115_r332</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.directory.installers</groupId>
-        <artifactId>apacheds-noarch-installer</artifactId>
-        <version>1.5.2</version>
-        <scope>provided</scope>
-     </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.configuration</artifactId>
-      </dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>apacheds.configuration</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: directory/studio/branches/apacheds-plugin-branch/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/pom.xml?rev=660549&r1=660548&r2=660549&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/pom.xml Tue May 27 08:03:45 2008
@@ -62,6 +62,7 @@
   <properties>
     <!-- Set versions for subprojects -->
     <aciitemeditor.version>1.2.0.SNAPSHOT</aciitemeditor.version>
+    <apacheds.version>1.2.0.SNAPSHOT</apacheds.version>
     <apacheds.configuration.version>1.2.0.SNAPSHOT</apacheds.configuration.version>
     <apacheds.configuration.feature.version>1.2.0.SNAPSHOT</apacheds.configuration.feature.version>
     <apacheds.configuration.help.version>1.2.0.SNAPSHOT</apacheds.configuration.help.version>
@@ -1028,37 +1029,6 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.ui</groupId>
-        <artifactId>console</artifactId>
-        <version>3.2.1-v20070824_r331</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.eclipse</groupId>
-            <artifactId>ui</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.jface</groupId>
-            <artifactId>text</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.ui.workbench</groupId>
-            <artifactId>texteditor</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>runtime</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>expressions</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>variables</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.ui</groupId>
         <artifactId>externaltools</artifactId>
         <version>3.1.200-v20070416</version>
         <exclusions>
@@ -1540,6 +1510,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>apacheds</artifactId>
+        <version>${apacheds.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>jars</artifactId>
         <version>${jars.version}</version>
       </dependency>
@@ -1699,6 +1674,54 @@
         <artifactId>nlog4j</artifactId>
         <version>1.2.25</version>
       </dependency>
+
+      <!-- Added for the Apache DS plugin -->
+      <dependency>
+        <groupId>org.eclipse.debug</groupId>
+        <artifactId>core</artifactId>
+        <version>3.3.2.v20080117_r332</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.debug</groupId>
+        <artifactId>ui</artifactId>
+        <version>3.3.2.v20080117_r332</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jdt</groupId>
+        <artifactId>launching</artifactId>
+        <version>3.3.2.v20080115_r332</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.ui</groupId>
+        <artifactId>console</artifactId>
+        <version>3.2.2.v20071031_r332</version><exclusions>
+          <exclusion>
+            <groupId>org.eclipse</groupId>
+            <artifactId>ui</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jface</groupId>
+            <artifactId>text</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.ui.workbench</groupId>
+            <artifactId>texteditor</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>runtime</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>expressions</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>variables</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -1727,6 +1750,7 @@
     <module>apacheds-configuration</module>
     <module>apacheds-configuration-feature</module>
     <module>apacheds-configuration-help</module>
+    <module>apacheds</module>
     <module>jars</module>
     <module>updatesite</module>
     <module>studio</module>

Modified: directory/studio/branches/apacheds-plugin-branch/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/repository/pom.xml?rev=660549&r1=660548&r2=660549&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/repository/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/repository/pom.xml Tue May 27 08:03:45
2008
@@ -410,6 +410,24 @@
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>tomcat</artifactId>
+    </dependency>
+
+    <!-- Added for the Apache DS plugin -->
+    <dependency>
+      <groupId>org.eclipse.debug</groupId>
+      <artifactId>core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.debug</groupId>
+      <artifactId>ui</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>launching</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>console</artifactId>
     </dependency>
 
     <!-- Other dependencies -->

Modified: directory/studio/branches/apacheds-plugin-branch/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/studio/pom.xml?rev=660549&r1=660548&r2=660549&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/studio/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/studio/pom.xml Tue May 27 08:03:45 2008
@@ -894,6 +894,10 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
                   <artifactId>jars</artifactId>
                 </artifactItem>
                 <artifactItem>
@@ -1158,6 +1162,22 @@
                     <groupId>org.mortbay</groupId>
                     <artifactId>jetty</artifactId>
                 </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.debug</groupId>
+                    <artifactId>core</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.debug</groupId>
+                    <artifactId>ui</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.jdt</groupId>
+                    <artifactId>launching</artifactId>
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.eclipse.ui</groupId>
+                    <artifactId>console</artifactId>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>



Mime
View raw message