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 2018/03/18 21:46:48 UTC
[directory-studio] branch master updated (7575d35 -> ef9a9df)
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git.
from 7575d35 Add note
new 1e142b3 Remove all explicit listed controls and extended operations, they are loaded by default by CodecFactoryUtil anyway
new b64e413 Fix changed method signature
new c826dc4 Update to latest Tycho version
new ef9a9df Update to Eclispe Oxygen and latest SWTBot release
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 2 +-
...directory.studio.eclipse-trgt-platform.template | 30 +++++++++++-----------
.../jobs/EntryBasedConfigurationPartition.java | 4 +--
.../apacheds/ApacheDS200LdapServerAdapter.java | 25 ++----------------
.../jobs/EntryBasedConfigurationPartition.java | 2 +-
pom.xml | 2 +-
.../test/integration/ui/bots/ShowViewsBot.java | 2 +-
7 files changed, 22 insertions(+), 45 deletions(-)
--
To stop receiving notification emails like this one, please contact
seelmann@apache.org.
[directory-studio] 04/04: Update to Eclispe Oxygen and latest
SWTBot release
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit ef9a9df93b855a1c96c2e76f40667844efd7ba82
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Mar 18 22:46:06 2018 +0100
Update to Eclispe Oxygen and latest SWTBot release
---
README.md | 2 +-
...directory.studio.eclipse-trgt-platform.template | 30 +++++++++++-----------
.../test/integration/ui/bots/ShowViewsBot.java | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 842ef7f..fbc9113 100644
--- a/README.md
+++ b/README.md
@@ -310,6 +310,6 @@ Start OSGi console:
List all IUs within a repository:
- provliu http://download.eclipse.org/eclipse/updates/4.5/ *
+ provliu http://download.eclipse.org/eclipse/updates/4.7/ *
diff --git a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
index 4750f95..8544139 100644
--- a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
+++ b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
@@ -19,7 +19,7 @@
@author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-->
<?pde version="3.8"?>
-<target name="Apache Directory Studio Platform" sequenceNumber="311">
+<target name="Apache Directory Studio Platform" sequenceNumber="321">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -105,17 +105,17 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.rcp.feature.group" version="4.6.3.v20170301-0400"/>
- <unit id="org.eclipse.rcp.source.feature.group" version="4.6.3.v20170301-0400"/>
- <unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>
- <unit id="org.eclipse.platform.source.feature.group" version="4.6.3.v20170301-0400"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>
- <unit id="org.eclipse.jdt.source.feature.group" version="3.12.3.v20170301-0400"/>
- <unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>
- <unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.2.203.v20170131-1444"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.2.v20171130-0510"/>
+ <unit id="org.eclipse.rcp.source.feature.group" version="4.7.2.v20171130-0510"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
+ <unit id="org.eclipse.platform.source.feature.group" version="4.7.2.v20171130-0510"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.2.v20171130-0906"/>
+ <unit id="org.eclipse.jdt.source.feature.group" version="3.13.2.v20171130-0906"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.13.2.v20171130-0510"/>
+ <unit id="org.eclipse.pde.source.feature.group" version="3.13.2.v20171130-0510"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.3.2.v20171108-1343"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -126,17 +126,17 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.6.0.201706141832"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0/"/>
+ <repository location="http://download.eclipse.org/technology/swtbot/releases/2.6.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_eclipse_fr.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/technology/babel/update-site/R0.14.1/neon"/>
+ <repository location="http://download.eclipse.org/technology/babel/update-site/R0.15.1/oxygen"/>
</location>
</locations>
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ShowViewsBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ShowViewsBot.java
index ad366d8..742cc5b 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ShowViewsBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ShowViewsBot.java
@@ -49,6 +49,6 @@ public class ShowViewsBot extends DialogBot
public void openView( String category, String view )
{
bot.tree().expandNode( category ).select( view );
- clickOkButton();
+ clickButton( "Open" );
}
}
--
To stop receiving notification emails like this one, please contact
seelmann@apache.org.
[directory-studio] 02/04: Fix changed method signature
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit b64e4130ca983c8cd0def5fc0359eb09b9437873
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Mar 18 22:44:49 2018 +0100
Fix changed method signature
---
.../apacheds/configuration/jobs/EntryBasedConfigurationPartition.java | 4 +---
.../studio/openldap/config/jobs/EntryBasedConfigurationPartition.java | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java
index 4458b7d..d04a88c 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java
@@ -22,8 +22,6 @@ package org.apache.directory.studio.apacheds.configuration.jobs;
import java.util.UUID;
-import javax.naming.InvalidNameException;
-
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -56,7 +54,7 @@ public class EntryBasedConfigurationPartition extends AbstractLdifPartition
/**
* {@inheritDoc}
*/
- protected void doInit() throws InvalidNameException, Exception
+ protected void doInit() throws LdapException
{
setId( "config" ); //$NON-NLS-1$
setSuffixDn( new Dn( ServerDNConstants.CONFIG_DN ) ); //$NON-NLS-1$
diff --git a/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/EntryBasedConfigurationPartition.java b/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/EntryBasedConfigurationPartition.java
index ee44c59..5973865 100644
--- a/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/EntryBasedConfigurationPartition.java
+++ b/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/EntryBasedConfigurationPartition.java
@@ -55,7 +55,7 @@ public class EntryBasedConfigurationPartition extends AbstractLdifPartition
* {@inheritDoc}
*/
@Override
- protected void doInit() throws Exception
+ protected void doInit() throws LdapException
{
setId( "config" );
setSuffixDn( new Dn( "cn=config" ) );
--
To stop receiving notification emails like this one, please contact
seelmann@apache.org.
[directory-studio] 01/04: Remove all explicit listed controls and
extended operations, they are loaded by default by CodecFactoryUtil anyway
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit 1e142b3d5400d71592538b8d1a529f30c906ecdc
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Mar 18 22:43:41 2018 +0100
Remove all explicit listed controls and extended operations, they are loaded by default by CodecFactoryUtil anyway
---
.../apacheds/ApacheDS200LdapServerAdapter.java | 25 ++--------------------
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java b/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java
index ffc2d2b..c0cefe6 100644
--- a/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java
@@ -305,30 +305,9 @@ public class ApacheDS200LdapServerAdapter implements LdapServerAdapter
vmArguments.append( " " ); //$NON-NLS-1$
vmArguments.append( "-Dapacheds.instance=\"" + server.getName() + "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
vmArguments.append( " " ); //$NON-NLS-1$
- vmArguments
- .append( "-Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.codec.controls.proxiedauthz.ProxiedAuthzFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.controls.ad_impl.AdDirSyncFactory" ); //$NON-NLS-1$
+ vmArguments.append( "-Dapacheds.controls=" ); //$NON-NLS-1$
vmArguments.append( " " ); //$NON-NLS-1$
- vmArguments
- .append( "-Dapacheds.extendedOperations=org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory," + //$NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.whoAmI.WhoAmIFactory," + // $NON-NLS-1$
- "org.apache.directory.api.ldap.extras.extended.ads_impl.startTls.StartTlsFactory" ); // $NON-NLS-1$
+ vmArguments.append( "-Dapacheds.extendedOperations=" ); // $NON-NLS-1$
// Setting the VM arguments attribute
workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArguments.toString() );
--
To stop receiving notification emails like this one, please contact
seelmann@apache.org.
[directory-studio] 03/04: Update to latest Tycho version
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit c826dc42ea78e1371a94f800ff8a5a4696a30cce
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Mar 18 22:45:35 2018 +0100
Update to latest Tycho version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 490d8c0..99dc586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <tycho.version>0.24.0</tycho.version>
+ <tycho.version>1.1.0</tycho.version>
<!-- Set versions for dependencies -->
<antlr.version>2.7.7</antlr.version>
--
To stop receiving notification emails like this one, please contact
seelmann@apache.org.