directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1444901 - in /directory/studio/trunk: ./ application/application-plugins/ libraries/ libraries/org.apache.directory.server.config/ libraries/org.apache.directory.server.core.api/ libraries/org.apache.directory.server.core.avl/ libraries/or...
Date Mon, 11 Feb 2013 17:52:20 GMT
Author: pamarcelot
Date: Mon Feb 11 17:52:20 2013
New Revision: 1444901

URL: http://svn.apache.org/r1444901
Log:
Fix for DIRSTUDIO-874 (Remove all ApacheDS libraries plugins).

Removed:
    directory/studio/trunk/libraries/org.apache.directory.server.config/
    directory/studio/trunk/libraries/org.apache.directory.server.core/
    directory/studio/trunk/libraries/org.apache.directory.server.core.api/
    directory/studio/trunk/libraries/org.apache.directory.server.core.avl/
    directory/studio/trunk/libraries/org.apache.directory.server.core.constants/
    directory/studio/trunk/libraries/org.apache.directory.server.i18n/
Modified:
    directory/studio/trunk/application/application-plugins/pom.xml
    directory/studio/trunk/libraries/pom.xml
    directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml
    directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
    directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-plugins/pom.xml?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/application/application-plugins/pom.xml (original)
+++ directory/studio/trunk/application/application-plugins/pom.xml Mon Feb 11 17:52:20 2013
@@ -139,36 +139,36 @@
                   <artifactId>org.apache.commons.pool</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.config</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-server-config</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.core</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.core.api</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-api</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.core.avl</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-avl</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.core.constants</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-core-constants</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.i18n</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-i18n</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.ldif.partition</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-ldif-partition</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-xdbm-partition</artifactId>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>

Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Mon Feb 11 17:52:20 2013
@@ -39,14 +39,6 @@
     <module>org.apache.commons.lang</module>
     <module>org.apache.commons.logging</module>
     <module>org.apache.commons.pool</module>
-    <module>org.apache.directory.server.config</module>
-    <module>org.apache.directory.server.core</module>
-    <module>org.apache.directory.server.core.api</module>
-    <module>org.apache.directory.server.core.avl</module>
-    <module>org.apache.directory.server.core.constants</module>
-    <module>org.apache.directory.server.i18n</module>
-    <module>org.apache.directory.server.ldif.partition</module>
-    <module>org.apache.directory.server.xdbm.partition</module>
     <module>org.apache.httpcomponents.httpclient</module>
     <module>org.apache.httpcomponents.httpcore</module>
     <module>org.apache.logging.log4j</module>

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml Mon Feb 11 17:52:20
2013
@@ -66,10 +66,10 @@
          	     </objectState>
          	     <!-- Special case to handle ApacheDS servers launched via Eclipse -->
          	     <!-- TODO: Should be removed before a release -->
-                 <!--<objectState
+                 <objectState
          	        name="vendorVersion"
          	        value="${project.version}">
-         	     </objectState>-->
+         	     </objectState>
          	   </or>
          	</and>
          </visibility>

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml Mon Feb 11 17:52:20 2013
@@ -213,23 +213,23 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.api</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.config</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-config</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.ldif.partition</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-partition</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
Mon Feb 11 17:52:20 2013
@@ -29,6 +29,8 @@ import org.apache.directory.server.confi
 import org.apache.directory.server.config.beans.InterceptorBean;
 import org.apache.directory.server.config.beans.KdcServerBean;
 import org.apache.directory.server.config.beans.TransportBean;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -39,6 +41,7 @@ import org.eclipse.swt.layout.GridLayout
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
@@ -338,6 +341,11 @@ public class KerberosServerPage extends 
         setGridDataWithDefaultWidth( encryptionTypesText, new GridData( SWT.FILL, SWT.NONE,
true, false ) );
         Label defaultEncryptionTypesLabel = createDefaultValueLabel( toolkit, composite,
"[des-cbc-md5]" ); //$NON-NLS-1$
         defaultEncryptionTypesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true,
false, 2, 1 ) );
+
+        CheckboxTableViewer ctv = new CheckboxTableViewer( new Table( composite, SWT.BORDER
| SWT.CHECK ) );
+        ctv.setContentProvider( new ArrayContentProvider() );
+//        ctv.setInput( new EncryptionType[]
+//            { EncryptionType.AES128_CTS_HMAC_SHA1_96,  EncryptionType.DES3_CBC_MD5 } );
     }
 
 

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml Mon Feb 11 17:52:20 2013
@@ -192,13 +192,13 @@
     
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.config</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-config</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-partition</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1444901&r1=1444900&r2=1444901&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Feb 11 17:52:20 2013
@@ -318,54 +318,6 @@
 
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.config</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.core</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.core.api</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.core.avl</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.core.constants</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.i18n</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.ldif.partition</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
-        <version>${org.apache.directory.server.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.apache.httpcomponents.httpclient</artifactId>
         <version>${org.apache.httpcomponents.version}</version>
       </dependency>



Mime
View raw message