Attachment 224055 Details for Bug 395254 – Adds right properties to localemfstore, fixes certificate comparison

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Adds right properties to localemfstore, fixes certificate comparison

logon (text/plain), 1.46 KB, created by Tobias Verhoeven

on 2012-11-28 08:37:58 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Verhoeven

Created: 2012-11-28 08:37:58 EST

Size: 1.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.ecp.emfstore.core
>diff --git src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>index 2107f82..e1f07d6 100644
>--- src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>+++ src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>@@ -297,7 +297,7 @@
> 					internalRepository.getProperties().getValue(EMFStoreProvider.PROP_CERTIFICATE));
> 				workspace.addServerInfo(serverInfo);
> 				workspace.save();
>-			} else {
>+			} else if (!foundExisting && !internalRepository.getProperties().hasProperties()) {
> 				serverInfo = EMFStoreClientUtil.giveServerInfo("localhost", 8080);
> 			}
> 			internalRepository.setProviderSpecificData(serverInfo);
>#P org.eclipse.emf.ecp.emfstore.localserver
>diff --git plugin.xml plugin.xml
>index 6571318..4c5e482 100644
>--- plugin.xml
>+++ plugin.xml
>@@ -8,6 +8,18 @@
>       <repository
>             description="Default EMFStore"
>             provider="org.eclipse.emf.ecp.emfstore.provider">
>+         <property
>+               key="repositoryUrl"
>+               value="localhost">
>+         </property>
>+         <property
>+               key="port"
>+               value="8080">
>+         </property>
>+         <property
>+               key="certificate"
>+               value="emfstore test certificate (do not use in production!)">
>+         </property>
>       </repository>
>    </extension>
>

Flags:

eneufeld: iplog+

Actions: View | Diff

Attachments on bug 395254: 224055