From 2f0039bae848ce23be1c8f1f6ed3c00a59affedb Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Sat, 21 Sep 2013 07:25:07 +0200
Subject: Move CDOServer.launch to the server product

---
 .../emf/cdo/server/internal/security/SecurityExtension.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'plugins/org.eclipse.emf.cdo.server.security')

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);
     }
   }
-- 
cgit v1.2.3