You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/04/01 00:24:41 UTC

svn commit: r1670500 - in /directory/studio/trunk: features/apacheds.feature/ plugins/ldapservers.apacheds.v200/ plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ plugins/ldapservers.apacheds.v200/src/mai...

Author: seelmann
Date: Tue Mar 31 22:24:41 2015
New Revision: 1670500

URL: http://svn.apache.org/r1670500
Log:
Rename ldapservers.apacheds.v200 to ldapservers.apacheds, part 1 (DIRSTUDIO-1005)

Added:
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java
      - copied, changed from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200Plugin.java
      - copied, changed from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200Plugin.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/CreateConnectionAction.java
      - copied, changed from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/Messages.java
      - copied, changed from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/Messages.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/messages.properties
      - copied unchanged from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages.properties
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/messages_de.properties
      - copied unchanged from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_de.properties
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/messages_fr.properties
      - copied unchanged from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_fr.properties
Removed:
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/
Modified:
    directory/studio/trunk/features/apacheds.feature/feature.xml
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.properties
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.xml
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom-first.xml
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml
    directory/studio/trunk/tests/test.integration.ui/pom-first.xml

Modified: directory/studio/trunk/features/apacheds.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.feature/feature.xml?rev=1670500&r1=1670499&r2=1670500&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.feature/feature.xml (original)
+++ directory/studio/trunk/features/apacheds.feature/feature.xml Tue Mar 31 22:24:41 2015
@@ -207,7 +207,7 @@ http://www.apache.org/licenses/
          unpack="false"/>
 
    <plugin
-         id="org.apache.directory.studio.ldapservers.apacheds.v200"
+         id="org.apache.directory.studio.ldapservers.apacheds"
          download-size="0"
          install-size="0"
          version="0.0.0"

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.properties?rev=1670500&r1=1670499&r2=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.properties (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.properties Tue Mar 31 22:24:41 2015
@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-Plugin_id=org.apache.directory.studio.ldapservers.apacheds.v200
+Plugin_id=org.apache.directory.studio.ldapservers.apacheds
 
 LdapServerAdapter_id=org.apache.directory.server.2.0.0
 LdapServerAdapter_name=ApacheDS
 LdapServerAdapter_vendor=Apache Software Foundation
 LdapServerAdapter_version=2.0.0
 
-ActionCreateConnection_id=org.apache.directory.studio.ldapservers.apacheds.v200.CreateConnectionAction
+ActionCreateConnection_id=org.apache.directory.studio.ldapservers.apacheds.CreateConnectionAction
 ActionCreateConnection_label=Create a Connection
\ No newline at end of file

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.xml?rev=1670500&r1=1670499&r2=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/plugin.xml Tue Mar 31 22:24:41 2015
@@ -22,7 +22,7 @@
    <extension
          point="org.apache.directory.studio.ldapservers.ldapServerAdapters">
       <ldapServerAdapter
-            class="org.apache.directory.studio.ldapservers.apacheds.v200.ApacheDS200LdapServerAdapter"
+            class="org.apache.directory.studio.ldapservers.apacheds.ApacheDS200LdapServerAdapter"
             id="%LdapServerAdapter_id"
             name="%LdapServerAdapter_name"
             vendor="%LdapServerAdapter_vendor"
@@ -36,7 +36,7 @@
             objectClass="org.apache.directory.studio.ldapservers.model.LdapServer"
             id="org.apache.directory.studio.ldapservers.model.LdapServer">
          <action
-               class="org.apache.directory.studio.ldapservers.apacheds.v200.CreateConnectionAction"
+               class="org.apache.directory.studio.ldapservers.apacheds.CreateConnectionAction"
                enablesFor="1"
                id="%ActionCreateConnection_id"
                label="%ActionCreateConnection_label"

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom-first.xml?rev=1670500&r1=1670499&r2=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom-first.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom-first.xml Tue Mar 31 22:24:41 2015
@@ -27,7 +27,7 @@
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
-  <artifactId>org.apache.directory.studio.ldapservers.apacheds.v200</artifactId>
+  <artifactId>org.apache.directory.studio.ldapservers.apacheds</artifactId>
   <name>Apache Directory Studio ApacheDS 2.0.0 LDAP Server Adapter</name>
   <description/>
   <packaging>bundle</packaging>
@@ -45,9 +45,9 @@
             <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
-            <Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v200.ApacheDS200Plugin</Bundle-Activator>
+            <Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.ApacheDS200Plugin</Bundle-Activator>
             
-            <Export-Package>org.apache.directory.studio.ldapservers.apacheds.v200</Export-Package>
+            <Export-Package>org.apache.directory.studio.ldapservers.apacheds</Export-Package>
  
             <Import-Package>org.apache.directory.server.core.api,
  org.dom4j,

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=1670500&r1=1670499&r2=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml Tue Mar 31 22:24:41 2015
@@ -27,7 +27,7 @@
     <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>org.apache.directory.studio.ldapservers.apacheds.v200</artifactId>
+  <artifactId>org.apache.directory.studio.ldapservers.apacheds</artifactId>
   <name>Apache Directory Studio ApacheDS 2.0.0 LDAP Server Adapter</name>
   <packaging>eclipse-plugin</packaging>
 

Copied: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java (from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java?p2=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java&p1=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java&r1=1670493&r2=1670500&rev=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java Tue Mar 31 22:24:41 2015
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.studio.ldapservers.apacheds.v200;
+package org.apache.directory.studio.ldapservers.apacheds;
 
 
 import java.io.File;

Copied: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200Plugin.java (from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200Plugin.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200Plugin.java?p2=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200Plugin.java&p1=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200Plugin.java&r1=1670493&r2=1670500&rev=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200Plugin.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200Plugin.java Tue Mar 31 22:24:41 2015
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.studio.ldapservers.apacheds.v200;
+package org.apache.directory.studio.ldapservers.apacheds;
 
 
 import java.io.IOException;
@@ -158,7 +158,7 @@ public class ApacheDS200Plugin extends A
                 // We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
                 // So we're using a default plugin id.
                 getLog().log(
-                    new Status( Status.ERROR, "org.apache.directory.studio.ldapservers.apacheds.v200", Status.OK, //$NON-NLS-1$
+                    new Status( Status.ERROR, "org.apache.directory.studio.ldapservers.apacheds", Status.OK, //$NON-NLS-1$
                         Messages.getString( "ApacheDS200Plugin.UnableGetPluginProperties" ), e ) ); //$NON-NLS-1$
             }
         }

Copied: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/CreateConnectionAction.java (from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/CreateConnectionAction.java?p2=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/CreateConnectionAction.java&p1=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java&r1=1670493&r2=1670500&rev=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/CreateConnectionAction.java Tue Mar 31 22:24:41 2015
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.studio.ldapservers.apacheds.v200;
+package org.apache.directory.studio.ldapservers.apacheds;
 
 
 import org.apache.directory.server.config.beans.ConfigBean;

Copied: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/Messages.java (from r1670493, directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/Messages.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/Messages.java?p2=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/Messages.java&p1=directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/Messages.java&r1=1670493&r2=1670500&rev=1670500&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/Messages.java Tue Mar 31 22:24:41 2015
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.studio.ldapservers.apacheds.v200;
+package org.apache.directory.studio.ldapservers.apacheds;
 
 
 import java.util.MissingResourceException;

Modified: directory/studio/trunk/tests/test.integration.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom-first.xml?rev=1670500&r1=1670499&r2=1670500&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom-first.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom-first.xml Tue Mar 31 22:24:41 2015
@@ -86,7 +86,7 @@
  org.apache.directory.studio.ldapbrowser.help,
  org.apache.directory.studio.ldapbrowser.ui,
  org.apache.directory.studio.ldapservers,
- org.apache.directory.studio.ldapservers.apacheds.v200,
+ org.apache.directory.studio.ldapservers.apacheds,
  org.apache.directory.studio.ldifeditor,
  org.apache.directory.studio.ldifeditor.help,
  org.apache.directory.studio.ldifparser,