Author: darran.lofthouse(a)jboss.com Date: 2009-09-21 12:05:51 -0400 (Mon, 21 Sep 2009) New Revision: 10728 Modified: spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/pom.xml spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java Log: [JBPAPP-2817] Relax restriction on @WebContext(authMethod). Modified: spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/pom.xml =================================================================== --- spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/pom.xml 2009-09-21 15:29:07 UTC (rev 10727) +++ spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/pom.xml 2009-09-21 16:05:51 UTC (rev 10728) @@ -6,7 +6,7 @@ <artifactId>jbossws-spi</artifactId> <packaging>jar</packaging> - <version>1.1.2.SP1</version> + <version>1.1.2.SP1_JBPAPP-2817</version> <!-- Parent --> <parent> Modified: spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java =================================================================== --- spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java 2009-09-21 15:29:07 UTC (rev 10727) +++ spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/AuthMethod.java 2009-09-21 16:05:51 UTC (rev 10728) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.spi.annotation; +import org.jboss.logging.Logger; + /** * The authMethod is used to configure the authentication mechanism for the web service. * As a prerequisite to gaining access to any web service which are protected by an @@ -30,6 +32,7 @@ */ public final class AuthMethod { + private static final Logger log = Logger.getLogger(AuthMethod.class); /** * Basic authentication. @@ -50,7 +53,7 @@ /** * Returns string representing correct auth method value. - * @param s string to convert, both lowercased and uppercased values are accepted + * @param s string to convert. * @return correct auth method value * @throws IllegalArgumentException if <b>s</b> is <b>null</b> or it contains unknown value. */ @@ -70,6 +73,8 @@ { return AuthMethod.CLIENT_CERT; } + log.warn("Non-standard auth method value: " + s); + return s; } throw new IllegalArgumentException("Illegal auth method value: " + s); Modified: spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java =================================================================== --- spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java 2009-09-21 15:29:07 UTC (rev 10727) +++ spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/TransportGuarantee.java 2009-09-21 16:05:51 UTC (rev 10728) @@ -63,7 +63,7 @@ /** * Returns string representing correct transport guarantee value. - * @param s string to convert, both lowercased and uppercased values are accepted + * @param s string to convert. * @return correct transport guarantee value * @throws IllegalArgumentException if <b>s</b> is <b>null</b> or it contains unknown value. */ Modified: spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java =================================================================== --- spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java 2009-09-21 15:29:07 UTC (rev 10727) +++ spi/branches/jbossws-spi-1.1.2.SP1_JBPAPP-2817/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java 2009-09-21 16:05:51 UTC (rev 10728) @@ -64,7 +64,8 @@ * As a prerequisite to gaining access to any web service which are protected by an authorization * constraint, a user must have authenticated using the configured mechanism. * - * Legal values for this element are "BASIC", or "CLIENT-CERT". + * Standard values for this element are "BASIC", or "CLIENT-CERT", custom authMethods may also + * be specified. * * @see AuthMethod */