diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml index 3c9c2689b83..ee65e2390cf 100644 --- a/aggregates/jetty-websocket-all/pom.xml +++ b/aggregates/jetty-websocket-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.1.0-SNAPSHOT + 9.1.3-SNAPSHOT ../../pom.xml 4.0.0 @@ -24,7 +24,7 @@ **/MANIFEST.MF - org.slf4j,org.eclipse.jetty.orbit,org.mortbay.jetty.alpn + javax.annotations,org.objectweb.asm,javax.servlet,org.slf4j,org.eclipse.jetty.orbit,org.mortbay.jetty.npn ${project.build.directory}/classes false true diff --git a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties index 4cbd3b5d243..e575db19ec4 100644 --- a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties +++ b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties @@ -19,7 +19,7 @@ cpt=application/mac-compactpro crt=application/x-x509-ca-cert csh=application/x-csh css=text/css -csv=text/comma-separated-values +csv=text/csv dcr=application/x-director dir=application/x-director dll=application/x-msdownload diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java index 4d06aee05b3..7b19b7cb3ad 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java @@ -73,17 +73,11 @@ public class DataSourceLoginService extends AbstractLoginService /** * DBUser - * - * */ public class DBUserPrincipal extends UserPrincipal { private int _key; - /** - * @param name - * @param credential - */ public DBUserPrincipal(String name, Credential credential, int key) { super(name, credential); @@ -291,10 +285,6 @@ public class DataSourceLoginService extends AbstractLoginService /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.security.MappedLoginService#loadUserInfo(java.lang.String) - * @Override - */ public UserPrincipal loadUserInfo (String username) { try @@ -328,10 +318,6 @@ public class DataSourceLoginService extends AbstractLoginService /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.security.MappedLoginService#loadRoleInfo(org.eclipse.jetty.security.UserPrincipal.KnownUser) - * @Override - */ public String[] loadRoleInfo (UserPrincipal user) { DBUserPrincipal dbuser = (DBUserPrincipal)user; @@ -367,10 +353,6 @@ public class DataSourceLoginService extends AbstractLoginService return null; } - - - - /* ------------------------------------------------------------ */ @@ -426,8 +408,6 @@ public class DataSourceLoginService extends AbstractLoginService prepareTables(); } - - /* ------------------------------------------------------------ */ /** * @throws NamingException @@ -533,7 +513,6 @@ public class DataSourceLoginService extends AbstractLoginService } } - /* ------------------------------------------------------------ */ /** * @return @@ -546,5 +525,4 @@ public class DataSourceLoginService extends AbstractLoginService initDb(); return _datasource.getConnection(); } - } diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java index c38a195aa52..696a378662b 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java @@ -34,8 +34,6 @@ import org.eclipse.jetty.util.security.Credential; /** * AbstractLoginService - * - * */ public abstract class AbstractLoginService extends AbstractLifeCycle implements LoginService { @@ -46,14 +44,9 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements protected boolean _fullValidate = false; - - - /* ------------------------------------------------------------ */ /** * RolePrincipal - * - * */ public static class RolePrincipal implements Principal,Serializable { @@ -73,8 +66,6 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements /* ------------------------------------------------------------ */ /** * UserPrincipal - * - * */ public static class UserPrincipal implements Principal,Serializable { @@ -118,19 +109,12 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements } } - - - /* ------------------------------------------------------------ */ protected abstract String[] loadRoleInfo (UserPrincipal user); - /* ------------------------------------------------------------ */ protected abstract UserPrincipal loadUserInfo (String username); - - - /* ------------------------------------------------------------ */ /** * @see org.eclipse.jetty.security.LoginService#getName() @@ -250,18 +234,12 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements } /* ------------------------------------------------------------ */ - /** - * @return - */ public boolean isFullValidate() { return _fullValidate; } /* ------------------------------------------------------------ */ - /** - * @param fullValidate - */ public void setFullValidate(boolean fullValidate) { _fullValidate = fullValidate; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/Authenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/Authenticator.java index 423fcad9412..c509f3741f7 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/Authenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/Authenticator.java @@ -43,7 +43,8 @@ public interface Authenticator /* ------------------------------------------------------------ */ /** * Configure the Authenticator - * @param configuration + * + * @param configuration the configuration */ void setConfiguration(AuthConfiguration configuration); @@ -64,13 +65,16 @@ public interface Authenticator * where the http method of the original request causing authentication * is not the same as the http method resulting from the redirect * after authentication. - * @param request + * + * @param request the request to manipulate */ void prepareRequest(ServletRequest request); /* ------------------------------------------------------------ */ - /** Validate a request + /** + * Validate a request + * * @param request The request * @param response The response * @param mandatory True if authentication is mandatory. @@ -79,18 +83,20 @@ public interface Authenticator * implement {@link org.eclipse.jetty.server.Authentication.ResponseSent}. If Authentication is not manditory, then a * {@link org.eclipse.jetty.server.Authentication.Deferred} may be returned. * - * @throws ServerAuthException + * @throws ServerAuthException if unable to validate request */ Authentication validateRequest(ServletRequest request, ServletResponse response, boolean mandatory) throws ServerAuthException; /* ------------------------------------------------------------ */ /** - * @param request - * @param response - * @param mandatory - * @param validatedUser + * is response secure + * + * @param request the request + * @param response the response + * @param mandatory if security is mandator + * @param validatedUser the user that was validated * @return true if response is secure - * @throws ServerAuthException + * @throws ServerAuthException if unable to test response */ boolean secureResponse(ServletRequest request, ServletResponse response, boolean mandatory, User validatedUser) throws ServerAuthException; @@ -106,7 +112,8 @@ public interface Authenticator String getAuthMethod(); String getRealmName(); - /** Get a SecurityHandler init parameter + /** + * Get a SecurityHandler init parameter * @see SecurityHandler#getInitParameter(String) * @param param parameter name * @return Parameter value or null diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintAware.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintAware.java index 15f64dc4304..d06898e845e 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintAware.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintAware.java @@ -29,15 +29,15 @@ public interface ConstraintAware /* ------------------------------------------------------------ */ /** Set Constraint Mappings and roles. * Can only be called during initialization. - * @param constraintMappings - * @param roles + * @param constraintMappings the mappings + * @param roles the roles */ void setConstraintMappings(List constraintMappings, Set roles); /* ------------------------------------------------------------ */ /** Add a Constraint Mapping. * May be called for running webapplication as an annotated servlet is instantiated. - * @param mapping + * @param mapping the mapping */ void addConstraintMapping(ConstraintMapping mapping); @@ -45,7 +45,7 @@ public interface ConstraintAware /* ------------------------------------------------------------ */ /** Add a Role definition. * May be called on running webapplication as an annotated servlet is instantiated. - * @param role + * @param role the role */ void addRole(String role); @@ -53,7 +53,7 @@ public interface ConstraintAware * See Servlet Spec 31, sec 13.8.4, pg 145 * When true, requests with http methods not explicitly covered either by inclusion or omissions * in constraints, will have access denied. - * @param deny + * @param deny true for denied method access */ void setDenyUncoveredHttpMethods(boolean deny); diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java index f0774a707d4..108ca0ad6f1 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java @@ -57,8 +57,6 @@ public class HashLoginService extends AbstractLoginService protected Resource _configResource; protected boolean hotReload = false; // default is not to reload - - /* ------------------------------------------------------------ */ public HashLoginService() diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java index 09b5df95126..7f38d07a490 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java @@ -41,24 +41,17 @@ import org.eclipse.jetty.util.security.Credential; /* ------------------------------------------------------------ */ /** * HashMapped User Realm with JDBC as data source. - * The login() method checks the inherited Map for the user. If the user is not + * The {@link #login(String, Object, ServletRequest)} method checks the inherited Map for the user. If the user is not * found, it will fetch details from the database and populate the inherited - * Map. It then calls the superclass login() method to perform the actual + * Map. It then calls the superclass {@link #login(String, Object, ServletRequest)} method to perform the actual * authentication. Periodically (controlled by configuration parameter), * internal hashes are cleared. Caching can be disabled by setting cache refresh * interval to zero. Uses one database connection that is initialized at - * startup. Reconnect on failures. authenticate() is 'synchronized'. - * + * startup. Reconnect on failures. + *

* An example properties file for configuration is in - * $JETTY_HOME/etc/jdbcRealm.properties - * - * @version $Id: JDBCLoginService.java 4792 2009-03-18 21:55:52Z gregw $ - * - * - * - * + * ${jetty.home}/etc/jdbcRealm.properties */ - public class JDBCLoginService extends AbstractLoginService { private static final Logger LOG = Log.getLogger(JDBCLoginService.class); @@ -78,17 +71,11 @@ public class JDBCLoginService extends AbstractLoginService /** * JDBCKnownUser - * - * */ public class JDBCUserPrincipal extends UserPrincipal { int _userKey; - /** - * @param name - * @param credential - */ public JDBCUserPrincipal(String name, Credential credential, int key) { super(name, credential); @@ -134,9 +121,6 @@ public class JDBCLoginService extends AbstractLoginService /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.security.MappedLoginService#doStart() - */ @Override protected void doStart() throws Exception { @@ -235,10 +219,6 @@ public class JDBCLoginService extends AbstractLoginService /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.security.MappedLoginService#loadUserInfo(java.lang.String) - * @Override - */ public UserPrincipal loadUserInfo (String username) { try @@ -275,10 +255,6 @@ public class JDBCLoginService extends AbstractLoginService /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.security.MappedLoginService#loadRoleInfo(org.eclipse.jetty.security.UserPrincipal.KnownUser) - * @Override - */ public String[] loadRoleInfo (UserPrincipal user) { JDBCUserPrincipal jdbcUser = (JDBCUserPrincipal)user; @@ -314,9 +290,7 @@ public class JDBCLoginService extends AbstractLoginService return null; } - - - + /* ------------------------------------------------------------ */ /** * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() @@ -341,5 +315,4 @@ public class JDBCLoginService extends AbstractLoginService } _con = null; } - }