directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1227180 - in /directory/studio/trunk: ./ application/application-features/ application/application-updatesite/src/main/resources/ features/ features/apacheds.configuration.v2.feature/
Date Wed, 04 Jan 2012 15:08:34 GMT
Author: pamarcelot
Date: Wed Jan  4 15:08:33 2012
New Revision: 1227180

URL: http://svn.apache.org/viewvc?rev=1227180&view=rev
Log:
Added a feature for ApacheDS 2.0 Configuration Feature.

Added:
    directory/studio/trunk/features/apacheds.configuration.v2.feature/
      - copied from r1226391, directory/studio/trunk/features/apacheds.configuration.feature/
    directory/studio/trunk/features/apacheds.configuration.v2.feature/feature.xml
      - copied, changed from r1226836, directory/studio/trunk/features/apacheds.configuration.feature/feature.xml
Modified:
    directory/studio/trunk/application/application-features/pom.xml
    directory/studio/trunk/application/application-updatesite/src/main/resources/site--xml.html
    directory/studio/trunk/application/application-updatesite/src/main/resources/site.xml
    directory/studio/trunk/features/apacheds.configuration.v2.feature/pom.xml
    directory/studio/trunk/features/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/application/application-features/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-features/pom.xml?rev=1227180&r1=1227179&r2=1227180&view=diff
==============================================================================
--- directory/studio/trunk/application/application-features/pom.xml (original)
+++ directory/studio/trunk/application/application-features/pom.xml Wed Jan  4 15:08:33 2012
@@ -56,6 +56,10 @@
                   </artifactItem>
                   <artifactItem>
                     <groupId>org.apache.directory.studio</groupId>
+                    <artifactId>apacheds.configuration.v2.feature</artifactId>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>org.apache.directory.studio</groupId>
                     <artifactId>ldapbrowser.feature</artifactId>
                   </artifactItem>
                   <artifactItem>
@@ -92,6 +96,10 @@
                   </artifactItem>
                   <artifactItem>
                     <groupId>org.apache.directory.studio</groupId>
+                    <artifactId>apacheds.configuration.v2.feature</artifactId>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>org.apache.directory.studio</groupId>
                     <artifactId>ldapbrowser.feature</artifactId>
                   </artifactItem>
                   <artifactItem>

Modified: directory/studio/trunk/application/application-updatesite/src/main/resources/site--xml.html
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-updatesite/src/main/resources/site--xml.html?rev=1227180&r1=1227179&r2=1227180&view=diff
==============================================================================
--- directory/studio/trunk/application/application-updatesite/src/main/resources/site--xml.html
(original)
+++ directory/studio/trunk/application/application-updatesite/src/main/resources/site--xml.html
Wed Jan  4 15:08:33 2012
@@ -42,6 +42,11 @@
    		id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
       <category name="Apache Directory Studio ApacheDS Configuration"/>
    </feature>
+   <feature 
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.configuration.v2.feature_${pom.version}.jar"

+   		id="org.apache.directory.studio.apacheds.configuration.v2.feature" version="${pom.version}">
+      <category name="Apache Directory Studio ApacheDS 2.0 Configuration"/>
+   </feature>
    <feature url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
        id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
       <category name="Apache Directory Studio LDIF Editor"/>
@@ -130,6 +135,11 @@
          The Apache Directory Studio ApacheDS Configuration category contains all features
related to ApacheDS Configuration .
       </description>
    </category-def>
+   <category-def name="Apache Directory Studio ApacheDS 2.0 Configuration " label="Apache
Directory Studio ApacheDS 2.0 Configuration ">
+      <description>
+         The Apache Directory Studio ApacheDS 2.0 Configuration category contains all features
related to ApacheDS 2.0 Configuration .
+      </description>
+   </category-def>
    <category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio
LDIF Editor">
       <description>
          The Apache Directory Studio LDIF Editor category contains all features related to
the LDIF Editor.

Modified: directory/studio/trunk/application/application-updatesite/src/main/resources/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-updatesite/src/main/resources/site.xml?rev=1227180&r1=1227179&r2=1227180&view=diff
==============================================================================
--- directory/studio/trunk/application/application-updatesite/src/main/resources/site.xml
(original)
+++ directory/studio/trunk/application/application-updatesite/src/main/resources/site.xml
Wed Jan  4 15:08:33 2012
@@ -40,6 +40,10 @@
        id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
       <category name="Apache Directory Studio ApacheDS Configuration"/>
    </feature>
+   <feature url="features/org.apache.directory.studio.apacheds.configuration.v2.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.apacheds.configuration.v2.feature" version="${pom.version}">
+      <category name="Apache Directory Studio ApacheDS 2.0 Configuration"/>
+   </feature>
    <feature url="features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
        id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
       <category name="Apache Directory Studio LDIF Editor"/>
@@ -68,6 +72,11 @@
          The Apache Directory Studio ApacheDS configuration category contains all features
related to ApacheDS Configuration.
       </description>
    </category-def>
+   <category-def name="Apache Directory Studio ApacheDS 2.0 Configuration" label="Apache
Directory Studio ApacheDS 2.0 Configuration">
+      <description>
+         The Apache Directory Studio ApacheDS 2.0 configuration category contains all features
related to ApacheDS 2.0 Configuration.
+      </description>
+   </category-def>
    <category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio
LDIF Editor">
       <description>
          The Apache Directory Studio LDIF Editor category contains all features related to
the LDIF Editor.

Copied: directory/studio/trunk/features/apacheds.configuration.v2.feature/feature.xml (from
r1226836, directory/studio/trunk/features/apacheds.configuration.feature/feature.xml)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.configuration.v2.feature/feature.xml?p2=directory/studio/trunk/features/apacheds.configuration.v2.feature/feature.xml&p1=directory/studio/trunk/features/apacheds.configuration.feature/feature.xml&r1=1226836&r2=1227180&rev=1227180&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.configuration.feature/feature.xml (original)
+++ directory/studio/trunk/features/apacheds.configuration.v2.feature/feature.xml Wed Jan
 4 15:08:33 2012
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.apache.directory.studio.apacheds.configuration.feature"
-      label="Apache Directory Studio Apache DS Configuration"
+      id="org.apache.directory.studio.apacheds.configuration.v2.feature"
+      label="Apache Directory Studio ApacheDS 2.0 Configuration"
       version="${pom.version}"
       provider-name="Apache Software Foundation"
-      plugin="org.apache.directory.studio.apacheds.configuration"
+      plugin="org.apache.directory.studio.apacheds.configuration.v2"
       image="studio.png">
 
    <description>
-      The Apache Directory Studio Apache DS Feature contains all plugins related to Apache
DS.
+      The Apache Directory Studio ApacheDS 2.0 Configuration Feature contains all plugins
related to ApacheDS 2.0 Configuration.
    </description>
 
    <copyright>
@@ -200,10 +200,10 @@ http://www.apache.org/licenses/
    </url>
 
    <requires>
+      <import plugin="org.eclipse.core.contenttype"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui.forms"/>
@@ -212,6 +212,13 @@ http://www.apache.org/licenses/
    </requires>
 
    <plugin
+         id="net.sf.ehcache.core"
+         download-size="0"
+         install-size="0"
+         version="${org.antlr.version}"
+         unpack="false"/>
+
+   <plugin
          id="org.antlr.antlr"
          download-size="0"
          install-size="0"
@@ -219,6 +226,13 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.commons.codec"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.commons.codec.version}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
@@ -226,6 +240,13 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.commons.io"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.commons.io.version}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.commons.lang"
          download-size="0"
          install-size="0"
@@ -233,6 +254,76 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.commons.logging.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.pool"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.commons.pool.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.config"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.api"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.avl"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.core.constants"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.i18n"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.ldif.partition"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.server.xdbm.partition"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.server.validversion}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.directory.shared.asn1.api"
          download-size="0"
          install-size="0"
@@ -247,6 +338,13 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.directory.shared.dsmlv2.parser"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.directory.shared.i18n"
          download-size="0"
          install-size="0"
@@ -254,6 +352,34 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.directory.shared.ldap.client.api"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.shared.ldap.codec.core"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.shared.ldap.extras.aci"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.shared.ldap.extras.util"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.directory.shared.ldap.model"
          download-size="0"
          install-size="0"
@@ -261,6 +387,20 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.directory.shared.ldap.net.mina"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.shared.ldap.schema"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.directory.shared.validversion}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.directory.shared.util"
          download-size="0"
          install-size="0"
@@ -268,6 +408,20 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
+         id="org.apache.directory.studio.apacheds.configuration.v2"
+         download-size="0"
+         install-size="0"
+         version="${pom.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.common.core"
+         download-size="0"
+         install-size="0"
+         version="${pom.version}"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
@@ -275,18 +429,67 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
-         id="org.apache.directory.studio.apacheds.configuration"
+         id="org.apache.directory.studio.connection.core"
          download-size="0"
          install-size="0"
          version="${pom.version}"
          unpack="false"/>
 
    <plugin
-         id="org.apache.directory.studio.apacheds.configuration.help"
+         id="org.apache.directory.studio.connection.ui"
          download-size="0"
          install-size="0"
          version="${pom.version}"
          unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.ldapbrowser.core"
+         download-size="0"
+         install-size="0"
+         version="${pom.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.directory.studio.ldifparser"
+         download-size="0"
+         install-size="0"
+         version="${pom.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.httpcomponents.httpclient"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.httpcomponents.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.httpcomponents.httpcore"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.httpcomponents.version}"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.logging.log4j"
+         download-size="0"
+         install-size="0"
+         version="${pom.version}"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.mina.core"
+         download-size="0"
+         install-size="0"
+         version="${org.apache.mina.core.version}"
+         unpack="false"/>
+         
+   <plugin
+         id="org.bouncycastle.bcprov.jdk15"
+         download-size="0"
+         install-size="0"
+         version="${org.bouncycastle.bcprov.jdk15.version}"
+         unpack="false"/>
          
    <plugin
          id="org.dom4j.dom4j"
@@ -301,5 +504,12 @@ http://www.apache.org/licenses/
          install-size="0"
          version="${org.slf4j.version}"
          unpack="false"/>
+         
+   <plugin
+         id="org.xpp3.xpp3"
+         download-size="0"
+         install-size="0"
+         version="${org.xpp3.validversion}"
+         unpack="false"/>
 
 </feature>

Modified: directory/studio/trunk/features/apacheds.configuration.v2.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.configuration.v2.feature/pom.xml?rev=1227180&r1=1226391&r2=1227180&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.configuration.v2.feature/pom.xml (original)
+++ directory/studio/trunk/features/apacheds.configuration.v2.feature/pom.xml Wed Jan  4 15:08:33
2012
@@ -26,8 +26,8 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>apacheds.configuration.feature</artifactId>
-  <name>Apache Directory Studio Apache DS Configuration Feature</name>
+  <artifactId>apacheds.configuration.v2.feature</artifactId>
+  <name>Apache Directory Studio ApacheDS 2.0 Configuration Feature</name>
   <packaging>jar</packaging>
 
   <description />

Modified: directory/studio/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/pom.xml?rev=1227180&r1=1227179&r2=1227180&view=diff
==============================================================================
--- directory/studio/trunk/features/pom.xml (original)
+++ directory/studio/trunk/features/pom.xml Wed Jan  4 15:08:33 2012
@@ -32,6 +32,7 @@
 
   <modules>
     <module>apacheds.configuration.feature</module>
+    <module>apacheds.configuration.v2.feature</module>
     <module>apacheds.feature</module>
     <module>ldapbrowser.feature</module>
     <module>ldapservers.feature</module>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1227180&r1=1227179&r2=1227180&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Jan  4 15:08:33 2012
@@ -392,12 +392,17 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>apacheds.configuration.feature</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds.configuration.v2</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>apacheds.configuration.feature</artifactId>
+        <artifactId>apacheds.configuration.v2.feature</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>



Mime
View raw message