Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-04-22 12:16:16 -0400
committerEike Stepper2015-04-22 12:16:16 -0400
commitd2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7 (patch)
tree6488f73e26dcddd9b1c7befccf7ba721215edce9 /plugins/org.eclipse.emf.cdo.server.security
parentef5341796d793607c49d863f8607f3193ceb08ae (diff)
downloadcdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.gz
cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.xz
cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.zip
[Releng] Reformat everything with M6 formatter
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.security')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java13
6 files changed, 35 insertions, 43 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
index c85ea4a003..04d3066cb9 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.security;singleton:=true
Bundle-Name: %pluginName
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,15 +12,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.security;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.internal.security;version="4.3.0";
+Export-Package: org.eclipse.emf.cdo.server.internal.security;version="4.3.100";
x-friends:="org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.tests.db,
org.eclipse.emf.cdo.tests.db4o,
org.eclipse.emf.cdo.tests.hibernate,
org.eclipse.emf.cdo.tests.mongodb,
org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.security.bundle;version="4.3.0";x-internal:=true,
- org.eclipse.emf.cdo.server.security;version="4.3.0",
- org.eclipse.emf.cdo.server.spi.security;version="4.3.0"
+ org.eclipse.emf.cdo.server.internal.security.bundle;version="4.3.100";x-internal:=true,
+ org.eclipse.emf.cdo.server.security;version="4.3.100",
+ org.eclipse.emf.cdo.server.spi.security;version="4.3.100"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.cdo.server.internal.security.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
index 2fbaad71ab..8cac8ecdf3 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
@@ -620,26 +620,26 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
// Create roles
Role allReaderRole = realm.addRole(Role.ALL_OBJECTS_READER);
- allReaderRole.getPermissions().add(
- SF.createFilterPermission(Access.READ, SF.createResourceFilter(".*", PatternStyle.REGEX)));
+ allReaderRole.getPermissions()
+ .add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(".*", PatternStyle.REGEX)));
Role allWriterRole = realm.addRole(Role.ALL_OBJECTS_WRITER);
- allWriterRole.getPermissions().add(
- SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(".*", PatternStyle.REGEX)));
+ allWriterRole.getPermissions()
+ .add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(".*", PatternStyle.REGEX)));
Role treeReaderRole = realm.addRole(Role.RESOURCE_TREE_READER);
- treeReaderRole.getPermissions().add(
- SF.createFilterPermission(Access.READ, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
+ treeReaderRole.getPermissions()
+ .add(SF.createFilterPermission(Access.READ, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
Role treeWriterRole = realm.addRole(Role.RESOURCE_TREE_WRITER);
- treeWriterRole.getPermissions().add(
- SF.createFilterPermission(Access.WRITE, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
+ treeWriterRole.getPermissions()
+ .add(SF.createFilterPermission(Access.WRITE, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
Role adminRole = realm.addRole(Role.ADMINISTRATION);
- adminRole.getPermissions().add(
- SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(realmPath, PatternStyle.EXACT, false)));
- adminRole.getPermissions().add(
- SF.createFilterPermission(Access.READ, SF.createResourceFilter(realmPath, PatternStyle.EXACT, true)));
+ adminRole.getPermissions()
+ .add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(realmPath, PatternStyle.EXACT, false)));
+ adminRole.getPermissions()
+ .add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(realmPath, PatternStyle.EXACT, true)));
// Create groups
@@ -1091,7 +1091,8 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
if (permission != CDOPermission.WRITE)
{
- throw new SecurityException("User " + commitContext.getUserID() + " is not allowed to write to " + revision);
+ throw new SecurityException(
+ "User " + commitContext.getUserID() + " is not allowed to write to " + revision);
}
if (securityImpact != CommitNotificationInfo.IMPACT_REALM)
@@ -1180,7 +1181,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
* A write-access handler that checks changes about to be committed to the security realm
* against its well-formedness rules, and rejects the commit if there are any integrity
* errors.
- *
+ *
* @author Christian W. Damus (CEA LIST)
*/
private final class RealmValidationHandler extends ObjectWriteAccessHandler
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
index 8d997c3252..e41e2e5b9f 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -51,7 +51,8 @@ public abstract class SecurityManagerCommand extends CDOCommand.WithRepository
{
public AddUser()
{
- super("adduser", "adds a user to the security realm of a repository", parameter("username"), optional("password"));
+ super("adduser", "adds a user to the security realm of a repository", parameter("username"),
+ optional("password"));
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java
index 7b4d6abb61..1c66bfa044 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java
@@ -1,16 +1,11 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
+ * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the accompanying
+ * materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API and
+ * implementation
*/
/**
* Server integration of the {@link org.eclipse.emf.cdo.security.Realm Security} model.
*/
package org.eclipse.emf.cdo.server.security;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
index 1f80c9d46b..889d589426 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
@@ -87,8 +87,8 @@ public abstract class SecurityManagerFactory extends Factory
if (securityManager instanceof InternalSecurityManager)
{
- ((InternalSecurityManager)securityManager).setRepository((InternalRepository)RepositoryFactory.get(container,
- repositoryName));
+ ((InternalSecurityManager)securityManager)
+ .setRepository((InternalRepository)RepositoryFactory.get(container, repositoryName));
}
return securityManager;
@@ -137,8 +137,8 @@ public abstract class SecurityManagerFactory extends Factory
@Override
public ISecurityManager create(String realmPath) throws ProductCreationException
{
- OM.LOG
- .warn("SecurityManagerFactory.Annotation is deprecated. As of 4.3 use SecurityManagerFactory.Default with a description like \"realmPath:annotation\"");
+ OM.LOG.warn(
+ "SecurityManagerFactory.Annotation is deprecated. As of 4.3 use SecurityManagerFactory.Default with a description like \"realmPath:annotation\"");
InternalSecurityManager securityManager = (InternalSecurityManager)SecurityManagerUtil
.createSecurityManager(realmPath);
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java
index e877501940..14b1bd395f 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java
@@ -1,16 +1,11 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
+ * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the accompanying
+ * materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API and
+ * implementation
*/
/**
* Server provider interfaces (SPI) for the server integration of the {@link org.eclipse.emf.cdo.security.Realm Security} model.
*/
package org.eclipse.emf.cdo.server.spi.security;
-

Back to the top