Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-09-21 01:25:07 -0400
committerEike Stepper2013-09-21 01:39:54 -0400
commit2f0039bae848ce23be1c8f1f6ed3c00a59affedb (patch)
treefa00c8a1f6b63686493cd9570484c974cda2d4d1 /plugins/org.eclipse.emf.cdo.server.security
parente6d22cf187c8aadf303dff23ff620da45b5ff3d3 (diff)
downloadcdo-2f0039bae848ce23be1c8f1f6ed3c00a59affedb.tar.gz
cdo-2f0039bae848ce23be1c8f1f6ed3c00a59affedb.tar.xz
cdo-2f0039bae848ce23be1c8f1f6ed3c00a59affedb.zip
Move CDOServer.launch to the server product
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.security')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java
index 3c8160c314..ba8f4909af 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java
@@ -98,14 +98,19 @@ public class SecurityExtension implements IAppExtension
throw new IllegalStateException("Security manager type not specified for repository " + repository); //$NON-NLS-1$
}
- String realmPath = securityManagerElement.getAttribute("realmPath");
- if (realmPath == null || realmPath.length() == 0)
+ String description = securityManagerElement.getAttribute("description");
+ if (description == null || description.length() == 0)
{
- realmPath = DEFAULT_REALM_PATH;
+ description = securityManagerElement.getAttribute("realmPath");
+ }
+
+ if (description == null || description.length() == 0)
+ {
+ description = DEFAULT_REALM_PATH;
}
InternalSecurityManager securityManager = (InternalSecurityManager)container.getElement(
- SecurityManagerFactory.PRODUCT_GROUP, type, realmPath);
+ SecurityManagerFactory.PRODUCT_GROUP, type, description);
securityManager.setRepository(repository);
}
}

Back to the top