Merge https://www.argeo.org/bugzilla/show_bug.cgi?id=141

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / NodeAuthenticationToken.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java
index 17b1d48bca5cbf9dff35457f46115d84a7bfe24e..1870675d81cf9075fb5e496f7b059c4dc14f24fe 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/NodeAuthenticationToken.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security;
 
 import org.springframework.security.GrantedAuthority;
@@ -8,21 +23,18 @@ public class NodeAuthenticationToken extends
                UsernamePasswordAuthenticationToken {
        private static final long serialVersionUID = 1955222132884795213L;
        private final String url;
-       private final String securityWorkspace;
 
        /** Non authenticated local constructor */
        public NodeAuthenticationToken(Object principal, Object credentials) {
                super(principal, credentials);
                this.url = null;
-               this.securityWorkspace = null;
        }
 
        /** Non authenticated remote constructor */
        public NodeAuthenticationToken(Object principal, Object credentials,
-                       String url, String workspace) {
+                       String url) {
                super(principal, credentials);
                this.url = url;
-               this.securityWorkspace = workspace;
        }
 
        /** Authenticated constructor */
@@ -30,17 +42,12 @@ public class NodeAuthenticationToken extends
                        GrantedAuthority[] authorities) {
                super(sat.getPrincipal(), sat.getCredentials(), authorities);
                this.url = sat.getUrl();
-               this.securityWorkspace = sat.getSecurityWorkspace();
        }
 
        public String getUrl() {
                return url;
        }
 
-       public String getSecurityWorkspace() {
-               return securityWorkspace;
-       }
-
        public Boolean isRemote() {
                return url != null;
        }