[jboss-cvs] JBossAS SVN: r98686 - projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-servlet-api/src/main/javax/servlet.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 22 12:48:11 EST 2009
Author: jaikiran
Date: 2009-12-22 12:48:11 -0500 (Tue, 22 Dec 2009)
New Revision: 98686
Removed:
projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-servlet-api/src/main/javax/servlet/ServletSecurityElement.java
Log:
Autoversioning commit: a non-deltaV client made a change to
/projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-servlet-api/src/main/javax/servlet/ServletSecurityElement.java
Deleted: projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-servlet-api/src/main/javax/servlet/ServletSecurityElement.java
===================================================================
--- projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-servlet-api/src/main/javax/servlet/ServletSecurityElement.java 2009-12-22 17:48:04 UTC (rev 98685)
+++ projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-servlet-api/src/main/javax/servlet/ServletSecurityElement.java 2009-12-22 17:48:11 UTC (rev 98686)
@@ -1,189 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.servlet;
-
-import java.util.*;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-
-/**
- * Java Class represntation of a {@link ServletSecurity} annotation value.
- *
- * @since Servlet 3.0
- */
-public class ServletSecurityElement extends HttpConstraintElement {
-
- private Collection<String> methodNames;
- private Collection<HttpMethodConstraintElement> methodConstraints;
-
- /**
- * Constructs an instance using the default
- * <code>HttpConstraintElement</code> value as the default Constraint
- * element and with no HTTP Method specific constraint elements.
- */
- public ServletSecurityElement() {
- methodConstraints = new HashSet<HttpMethodConstraintElement>();
- methodNames = new HashSet<String>();
- }
-
- /**
- * Constructs an instance with a default Constraint element
- * and with no HTTP Method specific constraint elements.
- *
- * @param constraint the HttpConstraintElement to be
- * applied to all HTTP methods other than those represented in the
- * <tt>methodConstraints</tt>
- */
- public ServletSecurityElement(HttpConstraintElement constraint) {
- super(constraint.getEmptyRoleSemantic(),
- constraint.getTransportGuarantee(),
- constraint.getRolesAllowed());
- methodConstraints = new HashSet<HttpMethodConstraintElement>();
- methodNames = new HashSet<String>();
- }
-
- /**
- * Constructs an instance using the default
- * <code>HttpConstraintElement</code> value as the default Constraint
- * element and with a collection of HTTP Method specific constraint
- * elements.
- *
- * @param methodConstraints the collection of HTTP method specific
- * constraint elements
- *
- * @throws IllegalArgumentException if duplicate method names are
- * detected
- */
- public ServletSecurityElement(
- Collection<HttpMethodConstraintElement> methodConstraints) {
- this.methodConstraints = (methodConstraints == null ?
- new HashSet<HttpMethodConstraintElement>() : methodConstraints);
- methodNames = checkMethodNames(this.methodConstraints);
- }
-
- /**
- * Constructs an instance with a default Constraint element
- * and with a collection of HTTP Method specific constraint elements.
- *
- * @param constraint the HttpConstraintElement to be
- * applied to all HTTP methods other than those represented in the
- * <tt>methodConstraints</tt>
- * @param methodConstraints the collection of HTTP method specific
- * constraint elements.
- *
- * @throws IllegalArgumentException if duplicate method names are
- * detected
- */
- public ServletSecurityElement(HttpConstraintElement constraint,
- Collection<HttpMethodConstraintElement> methodConstraints) {
- super(constraint.getEmptyRoleSemantic(),
- constraint.getTransportGuarantee(),
- constraint.getRolesAllowed());
- this.methodConstraints = (methodConstraints == null ?
- new HashSet<HttpMethodConstraintElement>() : methodConstraints);
- methodNames = checkMethodNames(this.methodConstraints);
- }
-
- /**
- * Constructs an instance from a {@link ServletSecurity} annotation value.
- *
- * @param annotation the annotation value
- *
- * @throws IllegalArgumentException if duplicate method names are
- * detected
- */
- public ServletSecurityElement(ServletSecurity annotation) {
- super(annotation.value().value(),
- annotation.value().transportGuarantee(),
- annotation.value().rolesAllowed());
- this.methodConstraints = new HashSet<HttpMethodConstraintElement>();
- for (HttpMethodConstraint constraint :
- annotation.httpMethodConstraints()) {
- this.methodConstraints.add(
- new HttpMethodConstraintElement(
- constraint.value(),
- new HttpConstraintElement(constraint.emptyRoleSemantic(),
- constraint.transportGuarantee(),
- constraint.rolesAllowed())));
- }
- methodNames = checkMethodNames(this.methodConstraints);
- }
-
- /**
- * Gets the (possibly empty) collection of HTTP Method specific
- * constraint elements.
- *
- * @return the (possibly empty) collection of HttpMethodConstraintElement
- * objects
- */
- public Collection<HttpMethodConstraintElement> getHttpMethodConstraints() {
- return methodConstraints;
- }
-
- /**
- * Gets the set of HTTP methid names named by the HttpMethodConstraints.
- *
- * @return the set of String method names
- */
- public Collection<String> getMethodNames() {
- return methodNames;
- }
-
- /**
- * Checks for duplicate method names in methodConstraints.
- *
- * @param methodConstraints
- *
- * @retrun Set of method names
- *
- * @throws IllegalArgumentException if duplicate method names are
- * detected
- */
- private Collection<String> checkMethodNames(
- Collection<HttpMethodConstraintElement> methodConstraints) {
- Collection<String> methodNames = new HashSet<String>();
- for (HttpMethodConstraintElement methodConstraint :
- methodConstraints) {
- String methodName = methodConstraint.getMethodName();
- if (methodNames.contains(methodName)) {
- throw new IllegalArgumentException(
- "Duplicate HTTP method name: " + methodName);
- }
- methodNames.add(methodName);
- }
- return methodNames;
- }
-}
More information about the jboss-cvs-commits
mailing list