Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-09-19 08:10:00 +0000
committerEike Stepper2013-09-19 08:10:00 +0000
commitf6a700fe7abc8ff07acb9b0c425bc9ac86570bdf (patch)
tree99e0902c1a1d1b24e0563be0ad576aeeb6a2bd9a /plugins/org.eclipse.emf.cdo.workspace.efs
parentc1574d75a9bf1ff76a2a6a56edcda2e1dcad8d72 (diff)
downloadcdo-f6a700fe7abc8ff07acb9b0c425bc9ac86570bdf.tar.gz
cdo-f6a700fe7abc8ff07acb9b0c425bc9ac86570bdf.tar.xz
cdo-f6a700fe7abc8ff07acb9b0c425bc9ac86570bdf.zip
[417566] [Security] Make user ID available in PermissionImpl and
PermissionFilterImpl https://bugs.eclipse.org/bugs/show_bug.cgi?id=417566
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.workspace.efs')
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java6
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF
index 79815b26fc..ddb37bfde2 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.workspace.efs;singleton:=true
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.0.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -16,6 +16,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.workspace;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
Import-Package: org.h2;version="[1.0.0,2.0.0)",
org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.workspace.efs;version="4.0.100",
- org.eclipse.emf.cdo.workspace.internal.efs;version="4.0.100";x-friends:="org.eclipse.emf.cdo.ui.workspace",
- org.eclipse.emf.cdo.workspace.internal.efs.bundle;version="4.0.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.workspace.efs;version="4.0.200",
+ org.eclipse.emf.cdo.workspace.internal.efs;version="4.0.200";x-friends:="org.eclipse.emf.cdo.ui.workspace",
+ org.eclipse.emf.cdo.workspace.internal.efs.bundle;version="4.0.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
index b7f650ff20..b14f6331e8 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
@@ -62,7 +62,7 @@ public final class CDOFS
public static CDOWorkspace open(String projectName, File projectFolder) throws Exception
{
- IDBStore local = creatLocalStore(projectFolder);
+ IDBStore local = createLocalStore(projectFolder);
CDOWorkspaceBase base = createWorkspaceBase(new File(projectFolder, "base"));
IRepositoryLocation remote = readRepositoryLocation(projectFolder);
@@ -101,7 +101,7 @@ public final class CDOFS
private static URI checkout(ICheckoutSource checkoutSource, String projectName, File projectFolder) throws Exception
{
- IDBStore local = creatLocalStore(projectFolder);
+ IDBStore local = createLocalStore(projectFolder);
CDOWorkspaceBase base = createWorkspaceBase(new File(projectFolder, "base"));
IRepositoryLocation remote = checkoutSource.getRepositoryLocation();
@@ -127,7 +127,7 @@ public final class CDOFS
return (CDOWorkspaceFileSystem)EFS.getFileSystem(CDOWorkspaceFileSystem.SCHEME);
}
- private static IDBStore creatLocalStore(File projectFolder)
+ private static IDBStore createLocalStore(File projectFolder)
{
IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(false);
IDBAdapter dbAdapter = createLocalAdapter();

Back to the top