You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/03/29 06:20:51 UTC
[42/51] [abbrv] incubator-guacamole-client git commit: GUACAMOLE-1:
Relicense C and JavaScript files.
GUACAMOLE-1: Relicense C and JavaScript files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/1810ec97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/1810ec97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/1810ec97
Branch: refs/heads/master
Commit: 1810ec971ff3a88acaa1d64261831f00051a49da
Parents: 2297dfb
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Mar 25 10:45:21 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Mar 28 20:50:18 2016 -0700
----------------------------------------------------------------------
.../example/DummyGuacamoleTunnelServlet.java | 31 ++++++++---------
.../jdbc/JDBCAuthenticationProviderModule.java | 31 ++++++++---------
.../guacamole/auth/jdbc/JDBCEnvironment.java | 31 ++++++++---------
.../ActiveConnectionDirectory.java | 31 ++++++++---------
.../ActiveConnectionPermissionService.java | 31 ++++++++---------
.../ActiveConnectionPermissionSet.java | 31 ++++++++---------
.../ActiveConnectionService.java | 31 ++++++++---------
.../TrackedActiveConnection.java | 31 ++++++++---------
.../jdbc/activeconnection/package-info.java | 31 ++++++++---------
.../auth/jdbc/base/DirectoryObjectService.java | 31 ++++++++---------
.../auth/jdbc/base/GroupedObjectModel.java | 31 ++++++++---------
.../auth/jdbc/base/ModeledDirectoryObject.java | 31 ++++++++---------
.../jdbc/base/ModeledDirectoryObjectMapper.java | 31 ++++++++---------
.../base/ModeledDirectoryObjectService.java | 31 ++++++++---------
.../base/ModeledGroupedDirectoryObject.java | 31 ++++++++---------
.../ModeledGroupedDirectoryObjectService.java | 31 ++++++++---------
.../guacamole/auth/jdbc/base/ModeledObject.java | 31 ++++++++---------
.../guacamole/auth/jdbc/base/ObjectModel.java | 31 ++++++++---------
.../auth/jdbc/base/RestrictedObject.java | 31 ++++++++---------
.../guacamole/auth/jdbc/base/package-info.java | 31 ++++++++---------
.../jdbc/connection/ConnectionDirectory.java | 31 ++++++++---------
.../auth/jdbc/connection/ConnectionMapper.java | 31 ++++++++---------
.../auth/jdbc/connection/ConnectionModel.java | 31 ++++++++---------
.../jdbc/connection/ConnectionRecordMapper.java | 31 ++++++++---------
.../jdbc/connection/ConnectionRecordModel.java | 31 ++++++++---------
.../connection/ConnectionRecordSearchTerm.java | 31 ++++++++---------
.../jdbc/connection/ConnectionRecordSet.java | 31 ++++++++---------
.../ConnectionRecordSortPredicate.java | 31 ++++++++---------
.../auth/jdbc/connection/ConnectionService.java | 31 ++++++++---------
.../auth/jdbc/connection/ModeledConnection.java | 31 ++++++++---------
.../connection/ModeledConnectionRecord.java | 31 ++++++++---------
.../ModeledGuacamoleConfiguration.java | 31 ++++++++---------
.../auth/jdbc/connection/ParameterMapper.java | 31 ++++++++---------
.../auth/jdbc/connection/ParameterModel.java | 31 ++++++++---------
.../auth/jdbc/connection/package-info.java | 31 ++++++++---------
.../ConnectionGroupDirectory.java | 31 ++++++++---------
.../connectiongroup/ConnectionGroupMapper.java | 31 ++++++++---------
.../connectiongroup/ConnectionGroupModel.java | 31 ++++++++---------
.../connectiongroup/ConnectionGroupService.java | 31 ++++++++---------
.../connectiongroup/ModeledConnectionGroup.java | 31 ++++++++---------
.../connectiongroup/RootConnectionGroup.java | 31 ++++++++---------
.../auth/jdbc/connectiongroup/package-info.java | 31 ++++++++---------
.../guacamole/auth/jdbc/package-info.java | 31 ++++++++---------
.../permission/AbstractPermissionService.java | 31 ++++++++---------
.../ConnectionGroupPermissionMapper.java | 31 ++++++++---------
.../ConnectionGroupPermissionService.java | 31 ++++++++---------
.../ConnectionGroupPermissionSet.java | 31 ++++++++---------
.../permission/ConnectionPermissionMapper.java | 31 ++++++++---------
.../permission/ConnectionPermissionService.java | 31 ++++++++---------
.../permission/ConnectionPermissionSet.java | 31 ++++++++---------
.../ModeledObjectPermissionService.java | 31 ++++++++---------
.../permission/ModeledPermissionService.java | 31 ++++++++---------
.../jdbc/permission/ObjectPermissionMapper.java | 31 ++++++++---------
.../jdbc/permission/ObjectPermissionModel.java | 31 ++++++++---------
.../permission/ObjectPermissionService.java | 31 ++++++++---------
.../jdbc/permission/ObjectPermissionSet.java | 31 ++++++++---------
.../auth/jdbc/permission/PermissionMapper.java | 31 ++++++++---------
.../auth/jdbc/permission/PermissionModel.java | 31 ++++++++---------
.../auth/jdbc/permission/PermissionService.java | 31 ++++++++---------
.../jdbc/permission/SystemPermissionMapper.java | 31 ++++++++---------
.../jdbc/permission/SystemPermissionModel.java | 31 ++++++++---------
.../permission/SystemPermissionService.java | 31 ++++++++---------
.../jdbc/permission/SystemPermissionSet.java | 31 ++++++++---------
.../jdbc/permission/UserPermissionMapper.java | 31 ++++++++---------
.../jdbc/permission/UserPermissionService.java | 31 ++++++++---------
.../auth/jdbc/permission/UserPermissionSet.java | 31 ++++++++---------
.../auth/jdbc/permission/package-info.java | 31 ++++++++---------
.../security/PasswordEncryptionService.java | 31 ++++++++---------
.../SHA256PasswordEncryptionService.java | 31 ++++++++---------
.../auth/jdbc/security/SaltService.java | 31 ++++++++---------
.../jdbc/security/SecureRandomSaltService.java | 31 ++++++++---------
.../auth/jdbc/security/package-info.java | 31 ++++++++---------
.../tunnel/AbstractGuacamoleTunnelService.java | 31 ++++++++---------
.../jdbc/tunnel/ActiveConnectionMultimap.java | 31 ++++++++---------
.../jdbc/tunnel/ActiveConnectionRecord.java | 31 ++++++++---------
.../jdbc/tunnel/GuacamoleTunnelService.java | 31 ++++++++---------
.../jdbc/tunnel/ManagedInetGuacamoleSocket.java | 31 ++++++++---------
.../jdbc/tunnel/ManagedSSLGuacamoleSocket.java | 31 ++++++++---------
.../RestrictedGuacamoleTunnelService.java | 31 ++++++++---------
.../apache/guacamole/auth/jdbc/tunnel/Seat.java | 31 ++++++++---------
.../auth/jdbc/tunnel/package-info.java | 31 ++++++++---------
.../auth/jdbc/user/AuthenticatedUser.java | 31 ++++++++---------
.../user/AuthenticationProviderService.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/ModeledUser.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/UserContext.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/UserDirectory.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/UserMapper.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/UserModel.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/UserService.java | 31 ++++++++---------
.../guacamole/auth/jdbc/user/package-info.java | 31 ++++++++---------
.../auth/mysql/MySQLAuthenticationProvider.java | 31 ++++++++---------
.../MySQLAuthenticationProviderModule.java | 31 ++++++++---------
.../guacamole/auth/mysql/MySQLEnvironment.java | 31 ++++++++---------
.../auth/mysql/MySQLGuacamoleProperties.java | 31 ++++++++---------
.../guacamole/auth/mysql/package-info.java | 31 ++++++++---------
.../PostgreSQLAuthenticationProvider.java | 31 ++++++++---------
.../PostgreSQLAuthenticationProviderModule.java | 31 ++++++++---------
.../auth/postgresql/PostgreSQLEnvironment.java | 31 ++++++++---------
.../PostgreSQLGuacamoleProperties.java | 31 ++++++++---------
.../guacamole/auth/postgresql/package-info.java | 31 ++++++++---------
.../ldap/AuthenticationProviderService.java | 31 ++++++++---------
.../auth/ldap/ConfigurationService.java | 31 ++++++++---------
.../guacamole/auth/ldap/EncryptionMethod.java | 31 ++++++++---------
.../auth/ldap/EncryptionMethodProperty.java | 31 ++++++++---------
.../guacamole/auth/ldap/EscapingService.java | 31 ++++++++---------
.../auth/ldap/LDAPAuthenticationProvider.java | 31 ++++++++---------
.../ldap/LDAPAuthenticationProviderModule.java | 31 ++++++++---------
.../auth/ldap/LDAPConnectionService.java | 31 ++++++++---------
.../auth/ldap/LDAPGuacamoleProperties.java | 31 ++++++++---------
.../guacamole/auth/ldap/StringListProperty.java | 31 ++++++++---------
.../auth/ldap/connection/ConnectionService.java | 31 ++++++++---------
.../auth/ldap/user/AuthenticatedUser.java | 31 ++++++++---------
.../guacamole/auth/ldap/user/UserContext.java | 31 ++++++++---------
.../guacamole/auth/ldap/user/UserService.java | 31 ++++++++---------
.../auth/noauth/NoAuthConfigContentHandler.java | 31 ++++++++---------
.../auth/noauth/NoAuthenticationProvider.java | 31 ++++++++---------
.../src/main/webapp/common/license.js | 33 ++++++++----------
.../main/webapp/modules/ArrayBufferReader.js | 31 ++++++++---------
.../main/webapp/modules/ArrayBufferWriter.js | 31 ++++++++---------
.../src/main/webapp/modules/AudioPlayer.js | 31 ++++++++---------
.../src/main/webapp/modules/BlobReader.js | 31 ++++++++---------
.../src/main/webapp/modules/Client.js | 31 ++++++++---------
.../src/main/webapp/modules/DataURIReader.js | 31 ++++++++---------
.../src/main/webapp/modules/Display.js | 31 ++++++++---------
.../src/main/webapp/modules/InputStream.js | 31 ++++++++---------
.../src/main/webapp/modules/IntegerPool.js | 31 ++++++++---------
.../src/main/webapp/modules/JSONReader.js | 31 ++++++++---------
.../src/main/webapp/modules/Keyboard.js | 31 ++++++++---------
.../src/main/webapp/modules/Layer.js | 31 ++++++++---------
.../src/main/webapp/modules/Mouse.js | 31 ++++++++---------
.../src/main/webapp/modules/Namespace.js | 31 ++++++++---------
.../src/main/webapp/modules/Object.js | 31 ++++++++---------
.../src/main/webapp/modules/OnScreenKeyboard.js | 31 ++++++++---------
.../src/main/webapp/modules/OutputStream.js | 31 ++++++++---------
.../src/main/webapp/modules/Parser.js | 31 ++++++++---------
.../src/main/webapp/modules/Status.js | 31 ++++++++---------
.../src/main/webapp/modules/StringReader.js | 31 ++++++++---------
.../src/main/webapp/modules/StringWriter.js | 31 ++++++++---------
.../src/main/webapp/modules/Tunnel.js | 31 ++++++++---------
.../src/main/webapp/modules/Version.js | 31 ++++++++---------
.../src/main/webapp/modules/VideoPlayer.js | 31 ++++++++---------
.../doc/example/ExampleTunnelServlet.java | 31 ++++++++---------
.../GuacamoleClientBadTypeException.java | 31 ++++++++---------
.../guacamole/GuacamoleClientException.java | 31 ++++++++---------
.../GuacamoleClientOverrunException.java | 31 ++++++++---------
.../GuacamoleClientTimeoutException.java | 31 ++++++++---------
.../GuacamoleClientTooManyException.java | 31 ++++++++---------
.../GuacamoleConnectionClosedException.java | 31 ++++++++---------
.../apache/guacamole/GuacamoleException.java | 31 ++++++++---------
.../GuacamoleResourceConflictException.java | 31 ++++++++---------
.../GuacamoleResourceNotFoundException.java | 31 ++++++++---------
.../guacamole/GuacamoleSecurityException.java | 31 ++++++++---------
.../guacamole/GuacamoleServerBusyException.java | 31 ++++++++---------
.../guacamole/GuacamoleServerException.java | 31 ++++++++---------
.../GuacamoleUnauthorizedException.java | 31 ++++++++---------
.../GuacamoleUnsupportedException.java | 31 ++++++++---------
.../guacamole/GuacamoleUpstreamException.java | 31 ++++++++---------
.../GuacamoleUpstreamTimeoutException.java | 31 ++++++++---------
.../apache/guacamole/io/GuacamoleReader.java | 31 ++++++++---------
.../apache/guacamole/io/GuacamoleWriter.java | 31 ++++++++---------
.../guacamole/io/ReaderGuacamoleReader.java | 31 ++++++++---------
.../guacamole/io/WriterGuacamoleWriter.java | 31 ++++++++---------
.../org/apache/guacamole/io/package-info.java | 31 ++++++++---------
.../guacamole/net/AbstractGuacamoleTunnel.java | 31 ++++++++---------
.../net/DelegatingGuacamoleTunnel.java | 31 ++++++++---------
.../apache/guacamole/net/GuacamoleSocket.java | 31 ++++++++---------
.../apache/guacamole/net/GuacamoleTunnel.java | 31 ++++++++---------
.../guacamole/net/InetGuacamoleSocket.java | 31 ++++++++---------
.../guacamole/net/SSLGuacamoleSocket.java | 31 ++++++++---------
.../guacamole/net/SimpleGuacamoleTunnel.java | 31 ++++++++---------
.../org/apache/guacamole/net/package-info.java | 31 ++++++++---------
.../java/org/apache/guacamole/package-info.java | 31 ++++++++---------
.../protocol/ConfiguredGuacamoleSocket.java | 31 ++++++++---------
.../protocol/FilteredGuacamoleReader.java | 31 ++++++++---------
.../protocol/FilteredGuacamoleSocket.java | 31 ++++++++---------
.../protocol/FilteredGuacamoleWriter.java | 31 ++++++++---------
.../protocol/GuacamoleClientInformation.java | 31 ++++++++---------
.../protocol/GuacamoleConfiguration.java | 31 ++++++++---------
.../guacamole/protocol/GuacamoleFilter.java | 31 ++++++++---------
.../protocol/GuacamoleInstruction.java | 31 ++++++++---------
.../guacamole/protocol/GuacamoleParser.java | 31 ++++++++---------
.../guacamole/protocol/GuacamoleStatus.java | 31 ++++++++---------
.../apache/guacamole/protocol/package-info.java | 31 ++++++++---------
.../guacamole/servlet/GuacamoleHTTPTunnel.java | 31 ++++++++---------
.../servlet/GuacamoleHTTPTunnelMap.java | 31 ++++++++---------
.../servlet/GuacamoleHTTPTunnelServlet.java | 31 ++++++++---------
.../guacamole/servlet/GuacamoleSession.java | 31 ++++++++---------
.../apache/guacamole/servlet/package-info.java | 31 ++++++++---------
.../GuacamoleWebSocketTunnelEndpoint.java | 31 ++++++++---------
.../guacamole/io/ReaderGuacamoleReaderTest.java | 31 ++++++++---------
.../protocol/FilteredGuacamoleReaderTest.java | 31 ++++++++---------
.../protocol/FilteredGuacamoleWriterTest.java | 31 ++++++++---------
.../guacamole/protocol/GuacamoleParserTest.java | 31 ++++++++---------
.../guacamole/environment/Environment.java | 35 +++++++++-----------
.../guacamole/environment/LocalEnvironment.java | 35 +++++++++-----------
.../org/apache/guacamole/form/BooleanField.java | 31 ++++++++---------
.../org/apache/guacamole/form/DateField.java | 31 ++++++++---------
.../org/apache/guacamole/form/EnumField.java | 31 ++++++++---------
.../java/org/apache/guacamole/form/Field.java | 31 ++++++++---------
.../org/apache/guacamole/form/FieldOption.java | 31 ++++++++---------
.../java/org/apache/guacamole/form/Form.java | 31 ++++++++---------
.../apache/guacamole/form/MultilineField.java | 31 ++++++++---------
.../org/apache/guacamole/form/NumericField.java | 31 ++++++++---------
.../apache/guacamole/form/PasswordField.java | 31 ++++++++---------
.../org/apache/guacamole/form/TextField.java | 31 ++++++++---------
.../org/apache/guacamole/form/TimeField.java | 31 ++++++++---------
.../apache/guacamole/form/TimeZoneField.java | 31 ++++++++---------
.../apache/guacamole/form/UsernameField.java | 31 ++++++++---------
.../org/apache/guacamole/form/package-info.java | 31 ++++++++---------
.../net/auth/AbstractActiveConnection.java | 35 +++++++++-----------
.../net/auth/AbstractAuthenticatedUser.java | 31 ++++++++---------
.../guacamole/net/auth/AbstractConnection.java | 35 +++++++++-----------
.../net/auth/AbstractConnectionGroup.java | 35 +++++++++-----------
.../apache/guacamole/net/auth/AbstractUser.java | 35 +++++++++-----------
.../guacamole/net/auth/ActiveConnection.java | 35 +++++++++-----------
.../guacamole/net/auth/AuthenticatedUser.java | 35 +++++++++-----------
.../net/auth/AuthenticationProvider.java | 35 +++++++++-----------
.../apache/guacamole/net/auth/Connectable.java | 35 +++++++++-----------
.../apache/guacamole/net/auth/Connection.java | 35 +++++++++-----------
.../guacamole/net/auth/ConnectionGroup.java | 35 +++++++++-----------
.../guacamole/net/auth/ConnectionRecord.java | 35 +++++++++-----------
.../guacamole/net/auth/ConnectionRecordSet.java | 31 ++++++++---------
.../apache/guacamole/net/auth/Credentials.java | 35 +++++++++-----------
.../apache/guacamole/net/auth/Directory.java | 35 +++++++++-----------
.../apache/guacamole/net/auth/Identifiable.java | 35 +++++++++-----------
.../org/apache/guacamole/net/auth/User.java | 35 +++++++++-----------
.../apache/guacamole/net/auth/UserContext.java | 35 +++++++++-----------
.../net/auth/credentials/CredentialsInfo.java | 35 +++++++++-----------
.../GuacamoleCredentialsException.java | 31 ++++++++---------
...acamoleInsufficientCredentialsException.java | 31 ++++++++---------
.../GuacamoleInvalidCredentialsException.java | 31 ++++++++---------
.../apache/guacamole/net/auth/package-info.java | 35 +++++++++-----------
.../net/auth/permission/ObjectPermission.java | 35 +++++++++-----------
.../auth/permission/ObjectPermissionSet.java | 31 ++++++++---------
.../net/auth/permission/Permission.java | 35 +++++++++-----------
.../net/auth/permission/PermissionSet.java | 31 ++++++++---------
.../net/auth/permission/SystemPermission.java | 35 +++++++++-----------
.../auth/permission/SystemPermissionSet.java | 31 ++++++++---------
.../net/auth/permission/package-info.java | 35 +++++++++-----------
.../simple/SimpleAuthenticationProvider.java | 35 +++++++++-----------
.../net/auth/simple/SimpleConnection.java | 35 +++++++++-----------
.../auth/simple/SimpleConnectionDirectory.java | 35 +++++++++-----------
.../net/auth/simple/SimpleConnectionGroup.java | 35 +++++++++-----------
.../simple/SimpleConnectionGroupDirectory.java | 35 +++++++++-----------
.../auth/simple/SimpleConnectionRecordSet.java | 31 ++++++++---------
.../net/auth/simple/SimpleDirectory.java | 31 ++++++++---------
.../auth/simple/SimpleObjectPermissionSet.java | 31 ++++++++---------
.../auth/simple/SimpleSystemPermissionSet.java | 31 ++++++++---------
.../guacamole/net/auth/simple/SimpleUser.java | 35 +++++++++-----------
.../net/auth/simple/SimpleUserContext.java | 35 +++++++++-----------
.../net/auth/simple/SimpleUserDirectory.java | 35 +++++++++-----------
.../guacamole/net/auth/simple/package-info.java | 35 +++++++++-----------
.../net/event/AuthenticationFailureEvent.java | 35 +++++++++-----------
.../net/event/AuthenticationSuccessEvent.java | 35 +++++++++-----------
.../guacamole/net/event/CredentialEvent.java | 35 +++++++++-----------
.../guacamole/net/event/TunnelCloseEvent.java | 35 +++++++++-----------
.../guacamole/net/event/TunnelConnectEvent.java | 35 +++++++++-----------
.../apache/guacamole/net/event/TunnelEvent.java | 35 +++++++++-----------
.../apache/guacamole/net/event/UserEvent.java | 35 +++++++++-----------
.../listener/AuthenticationFailureListener.java | 35 +++++++++-----------
.../listener/AuthenticationSuccessListener.java | 35 +++++++++-----------
.../net/event/listener/TunnelCloseListener.java | 35 +++++++++-----------
.../event/listener/TunnelConnectListener.java | 35 +++++++++-----------
.../net/event/listener/package-info.java | 35 +++++++++-----------
.../guacamole/net/event/package-info.java | 35 +++++++++-----------
.../properties/BooleanGuacamoleProperty.java | 35 +++++++++-----------
.../properties/FileGuacamoleProperty.java | 35 +++++++++-----------
.../guacamole/properties/GuacamoleHome.java | 35 +++++++++-----------
.../properties/GuacamoleProperties.java | 35 +++++++++-----------
.../guacamole/properties/GuacamoleProperty.java | 35 +++++++++-----------
.../properties/IntegerGuacamoleProperty.java | 35 +++++++++-----------
.../properties/LongGuacamoleProperty.java | 35 +++++++++-----------
.../properties/StringGuacamoleProperty.java | 35 +++++++++-----------
.../guacamole/properties/package-info.java | 35 +++++++++-----------
.../guacamole/protocols/ProtocolInfo.java | 31 ++++++++---------
.../apache/guacamole/token/StandardTokens.java | 31 ++++++++---------
.../org/apache/guacamole/token/TokenFilter.java | 35 +++++++++-----------
.../apache/guacamole/xml/DocumentHandler.java | 31 ++++++++---------
.../org/apache/guacamole/xml/TagHandler.java | 31 ++++++++---------
.../org/apache/guacamole/xml/package-info.java | 31 ++++++++---------
.../apache/guacamole/token/TokenFilterTest.java | 35 +++++++++-----------
.../org/apache/guacamole/EnvironmentModule.java | 31 ++++++++---------
.../GuacamoleServletContextListener.java | 31 ++++++++---------
.../org/apache/guacamole/GuacamoleSession.java | 31 ++++++++---------
.../guacamole/auth/file/Authorization.java | 31 ++++++++---------
.../auth/file/AuthorizeTagHandler.java | 31 ++++++++---------
.../auth/file/ConnectionTagHandler.java | 31 ++++++++---------
.../auth/file/FileAuthenticationProvider.java | 31 ++++++++---------
.../guacamole/auth/file/ParamTagHandler.java | 31 ++++++++---------
.../guacamole/auth/file/ProtocolTagHandler.java | 31 ++++++++---------
.../apache/guacamole/auth/file/UserMapping.java | 31 ++++++++---------
.../auth/file/UserMappingTagHandler.java | 31 ++++++++---------
.../guacamole/auth/file/package-info.java | 31 ++++++++---------
.../extension/AuthenticationProviderFacade.java | 31 ++++++++---------
.../extension/DirectoryClassLoader.java | 31 ++++++++---------
.../apache/guacamole/extension/Extension.java | 31 ++++++++---------
.../guacamole/extension/ExtensionManifest.java | 31 ++++++++---------
.../guacamole/extension/ExtensionModule.java | 31 ++++++++---------
.../extension/LanguageResourceService.java | 31 ++++++++---------
.../extension/PatchResourceService.java | 31 ++++++++---------
.../guacamole/extension/package-info.java | 31 ++++++++---------
.../org/apache/guacamole/log/LogModule.java | 31 ++++++++---------
.../java/org/apache/guacamole/package-info.java | 31 ++++++++---------
.../guacamole/properties/StringSetProperty.java | 31 ++++++++---------
.../guacamole/properties/package-info.java | 31 ++++++++---------
.../guacamole/resource/AbstractResource.java | 31 ++++++++---------
.../guacamole/resource/ByteArrayResource.java | 31 ++++++++---------
.../guacamole/resource/ClassPathResource.java | 31 ++++++++---------
.../org/apache/guacamole/resource/Resource.java | 31 ++++++++---------
.../guacamole/resource/ResourceServlet.java | 31 ++++++++---------
.../guacamole/resource/SequenceResource.java | 31 ++++++++---------
.../resource/WebApplicationResource.java | 31 ++++++++---------
.../apache/guacamole/resource/package-info.java | 31 ++++++++---------
.../org/apache/guacamole/rest/APIError.java | 31 ++++++++---------
.../org/apache/guacamole/rest/APIException.java | 31 ++++++++---------
.../org/apache/guacamole/rest/APIPatch.java | 31 ++++++++---------
.../org/apache/guacamole/rest/APIRequest.java | 31 ++++++++---------
.../guacamole/rest/ObjectRetrievalService.java | 31 ++++++++---------
.../java/org/apache/guacamole/rest/PATCH.java | 31 ++++++++---------
.../guacamole/rest/RESTExceptionWrapper.java | 31 ++++++++---------
.../guacamole/rest/RESTMethodMatcher.java | 31 ++++++++---------
.../guacamole/rest/RESTServiceModule.java | 31 ++++++++---------
.../activeconnection/APIActiveConnection.java | 31 ++++++++---------
.../ActiveConnectionRESTService.java | 31 ++++++++---------
.../rest/auth/APIAuthenticationResponse.java | 31 ++++++++---------
.../rest/auth/APIAuthenticationResult.java | 31 ++++++++---------
.../guacamole/rest/auth/AuthTokenGenerator.java | 31 ++++++++---------
.../rest/auth/AuthenticationService.java | 31 ++++++++---------
.../rest/auth/HashTokenSessionMap.java | 31 ++++++++---------
.../auth/SecureRandomAuthTokenGenerator.java | 31 ++++++++---------
.../guacamole/rest/auth/TokenRESTService.java | 31 ++++++++---------
.../guacamole/rest/auth/TokenSessionMap.java | 31 ++++++++---------
.../guacamole/rest/auth/package-info.java | 31 ++++++++---------
.../rest/connection/APIConnection.java | 31 ++++++++---------
.../rest/connection/APIConnectionWrapper.java | 31 ++++++++---------
.../rest/connection/ConnectionRESTService.java | 31 ++++++++---------
.../guacamole/rest/connection/package-info.java | 31 ++++++++---------
.../connectiongroup/APIConnectionGroup.java | 31 ++++++++---------
.../APIConnectionGroupWrapper.java | 31 ++++++++---------
.../ConnectionGroupRESTService.java | 31 ++++++++---------
.../connectiongroup/ConnectionGroupTree.java | 31 ++++++++---------
.../rest/connectiongroup/package-info.java | 31 ++++++++---------
.../rest/history/APIConnectionRecord.java | 31 ++++++++---------
.../APIConnectionRecordSortPredicate.java | 31 ++++++++---------
.../rest/history/HistoryRESTService.java | 31 ++++++++---------
.../guacamole/rest/history/package-info.java | 31 ++++++++---------
.../rest/language/LanguageRESTService.java | 31 ++++++++---------
.../guacamole/rest/language/package-info.java | 31 ++++++++---------
.../org/apache/guacamole/rest/package-info.java | 31 ++++++++---------
.../guacamole/rest/patch/PatchRESTService.java | 31 ++++++++---------
.../guacamole/rest/patch/package-info.java | 31 ++++++++---------
.../rest/permission/APIPermissionSet.java | 31 ++++++++---------
.../guacamole/rest/permission/package-info.java | 31 ++++++++---------
.../rest/schema/SchemaRESTService.java | 31 ++++++++---------
.../guacamole/rest/schema/package-info.java | 31 ++++++++---------
.../org/apache/guacamole/rest/user/APIUser.java | 31 ++++++++---------
.../rest/user/APIUserPasswordUpdate.java | 31 ++++++++---------
.../guacamole/rest/user/APIUserWrapper.java | 31 ++++++++---------
.../guacamole/rest/user/PermissionSetPatch.java | 31 ++++++++---------
.../guacamole/rest/user/UserRESTService.java | 31 ++++++++---------
.../guacamole/rest/user/package-info.java | 31 ++++++++---------
.../apache/guacamole/tunnel/TunnelLoader.java | 31 ++++++++---------
.../apache/guacamole/tunnel/TunnelModule.java | 31 ++++++++---------
.../apache/guacamole/tunnel/TunnelRequest.java | 31 ++++++++---------
.../guacamole/tunnel/TunnelRequestService.java | 31 ++++++++---------
.../tunnel/http/HTTPTunnelRequest.java | 31 ++++++++---------
.../RestrictedGuacamoleHTTPTunnelServlet.java | 31 ++++++++---------
.../guacamole/tunnel/http/package-info.java | 31 ++++++++---------
.../apache/guacamole/tunnel/package-info.java | 31 ++++++++---------
...trictedGuacamoleWebSocketTunnelEndpoint.java | 31 ++++++++---------
.../tunnel/websocket/WebSocketTunnelModule.java | 31 ++++++++---------
.../websocket/WebSocketTunnelRequest.java | 31 ++++++++---------
.../jetty8/GuacamoleWebSocketTunnelServlet.java | 31 ++++++++---------
...strictedGuacamoleWebSocketTunnelServlet.java | 31 ++++++++---------
.../websocket/jetty8/WebSocketTunnelModule.java | 31 ++++++++---------
.../tunnel/websocket/jetty8/package-info.java | 31 ++++++++---------
.../GuacamoleWebSocketTunnelListener.java | 31 ++++++++---------
.../RestrictedGuacamoleWebSocketCreator.java | 31 ++++++++---------
...trictedGuacamoleWebSocketTunnelListener.java | 31 ++++++++---------
...strictedGuacamoleWebSocketTunnelServlet.java | 31 ++++++++---------
.../websocket/jetty9/WebSocketTunnelModule.java | 31 ++++++++---------
.../jetty9/WebSocketTunnelRequest.java | 31 ++++++++---------
.../tunnel/websocket/jetty9/package-info.java | 31 ++++++++---------
.../tunnel/websocket/package-info.java | 31 ++++++++---------
.../tomcat/GuacamoleWebSocketTunnelServlet.java | 31 ++++++++---------
...strictedGuacamoleWebSocketTunnelServlet.java | 31 ++++++++---------
.../websocket/tomcat/WebSocketTunnelModule.java | 31 ++++++++---------
.../tunnel/websocket/tomcat/package-info.java | 31 ++++++++---------
.../src/main/webapp/app/auth/authModule.js | 31 ++++++++---------
.../app/auth/service/authenticationService.js | 31 ++++++++---------
.../src/main/webapp/app/client/clientModule.js | 31 ++++++++---------
.../app/client/controllers/clientController.js | 31 ++++++++---------
.../webapp/app/client/directives/guacClient.js | 31 ++++++++---------
.../app/client/directives/guacFileBrowser.js | 31 ++++++++---------
.../app/client/directives/guacFileTransfer.js | 31 ++++++++---------
.../directives/guacFileTransferManager.js | 31 ++++++++---------
.../app/client/directives/guacThumbnail.js | 31 ++++++++---------
.../app/client/directives/guacViewport.js | 31 ++++++++---------
.../app/client/services/clipboardService.js | 31 ++++++++---------
.../webapp/app/client/services/guacAudio.js | 31 ++++++++---------
.../app/client/services/guacClientManager.js | 31 ++++++++---------
.../webapp/app/client/services/guacImage.js | 31 ++++++++---------
.../webapp/app/client/services/guacVideo.js | 31 ++++++++---------
.../webapp/app/client/types/ClientProperties.js | 31 ++++++++---------
.../webapp/app/client/types/ManagedClient.js | 31 ++++++++---------
.../app/client/types/ManagedClientState.js | 31 ++++++++---------
.../webapp/app/client/types/ManagedDisplay.js | 31 ++++++++---------
.../app/client/types/ManagedFileDownload.js | 31 ++++++++---------
.../client/types/ManagedFileTransferState.js | 31 ++++++++---------
.../app/client/types/ManagedFileUpload.js | 31 ++++++++---------
.../app/client/types/ManagedFilesystem.js | 31 ++++++++---------
.../webapp/app/element/directives/guacFocus.js | 31 ++++++++---------
.../webapp/app/element/directives/guacMarker.js | 31 ++++++++---------
.../webapp/app/element/directives/guacResize.js | 31 ++++++++---------
.../webapp/app/element/directives/guacScroll.js | 31 ++++++++---------
.../webapp/app/element/directives/guacUpload.js | 31 ++++++++---------
.../main/webapp/app/element/elementModule.js | 31 ++++++++---------
.../src/main/webapp/app/element/types/Marker.js | 31 ++++++++---------
.../webapp/app/element/types/ScrollState.js | 31 ++++++++---------
.../form/controllers/checkboxFieldController.js | 31 ++++++++---------
.../app/form/controllers/dateFieldController.js | 31 ++++++++---------
.../form/controllers/numberFieldController.js | 31 ++++++++---------
.../form/controllers/passwordFieldController.js | 31 ++++++++---------
.../form/controllers/selectFieldController.js | 31 ++++++++---------
.../app/form/controllers/timeFieldController.js | 31 ++++++++---------
.../form/controllers/timeZoneFieldController.js | 31 ++++++++---------
.../src/main/webapp/app/form/directives/form.js | 31 ++++++++---------
.../webapp/app/form/directives/formField.js | 31 ++++++++---------
.../app/form/directives/guacLenientDate.js | 31 ++++++++---------
.../app/form/directives/guacLenientTime.js | 31 ++++++++---------
.../src/main/webapp/app/form/formModule.js | 31 ++++++++---------
.../webapp/app/form/services/formService.js | 31 ++++++++---------
.../src/main/webapp/app/form/types/FieldType.js | 31 ++++++++---------
.../app/groupList/directives/guacGroupList.js | 31 ++++++++---------
.../groupList/directives/guacGroupListFilter.js | 31 ++++++++---------
.../webapp/app/groupList/groupListModule.js | 31 ++++++++---------
.../webapp/app/groupList/types/GroupListItem.js | 31 ++++++++---------
.../main/webapp/app/history/historyModule.js | 31 ++++++++---------
.../webapp/app/history/services/guacHistory.js | 31 ++++++++---------
.../webapp/app/history/types/HistoryEntry.js | 31 ++++++++---------
.../app/home/controllers/homeController.js | 31 ++++++++---------
.../home/directives/guacRecentConnections.js | 31 ++++++++---------
.../src/main/webapp/app/home/homeModule.js | 31 ++++++++---------
.../webapp/app/home/types/ActiveConnection.js | 31 ++++++++---------
.../webapp/app/home/types/RecentConnection.js | 31 ++++++++---------
.../app/index/config/indexHttpPatchConfig.js | 31 ++++++++---------
.../webapp/app/index/config/indexRouteConfig.js | 31 ++++++++---------
.../app/index/config/indexTranslationConfig.js | 31 ++++++++---------
.../index/config/templateRequestDecorator.js | 31 ++++++++---------
.../app/index/controllers/indexController.js | 31 ++++++++---------
.../src/main/webapp/app/index/indexModule.js | 31 ++++++++---------
.../webapp/app/list/directives/guacFilter.js | 31 ++++++++---------
.../webapp/app/list/directives/guacPager.js | 31 ++++++++---------
.../webapp/app/list/directives/guacSortOrder.js | 31 ++++++++---------
.../src/main/webapp/app/list/listModule.js | 31 ++++++++---------
.../main/webapp/app/list/types/FilterPattern.js | 31 ++++++++---------
.../main/webapp/app/list/types/FilterToken.js | 31 ++++++++---------
.../main/webapp/app/list/types/IPv4Network.js | 31 ++++++++---------
.../main/webapp/app/list/types/IPv6Network.js | 31 ++++++++---------
.../src/main/webapp/app/list/types/SortOrder.js | 31 ++++++++---------
.../src/main/webapp/app/locale/localeModule.js | 31 ++++++++---------
.../app/locale/services/translationLoader.js | 31 ++++++++---------
.../locale/services/translationStringService.js | 31 ++++++++---------
.../main/webapp/app/login/directives/login.js | 31 ++++++++---------
.../src/main/webapp/app/login/loginModule.js | 31 ++++++++---------
.../controllers/manageConnectionController.js | 31 ++++++++---------
.../manageConnectionGroupController.js | 31 ++++++++---------
.../manage/controllers/manageUserController.js | 31 ++++++++---------
.../app/manage/directives/locationChooser.js | 31 ++++++++---------
.../src/main/webapp/app/manage/manageModule.js | 31 ++++++++---------
.../app/manage/types/HistoryEntryWrapper.js | 31 ++++++++---------
.../webapp/app/manage/types/ManageableUser.js | 31 ++++++++---------
.../app/navigation/directives/guacPageList.js | 31 ++++++++---------
.../app/navigation/directives/guacUserMenu.js | 31 ++++++++---------
.../webapp/app/navigation/navigationModule.js | 31 ++++++++---------
.../app/navigation/services/userPageService.js | 31 ++++++++---------
.../app/navigation/types/ClientIdentifier.js | 31 ++++++++---------
.../webapp/app/navigation/types/MenuAction.js | 31 ++++++++---------
.../app/navigation/types/PageDefinition.js | 31 ++++++++---------
.../notification/directives/guacNotification.js | 31 ++++++++---------
.../app/notification/notificationModule.js | 31 ++++++++---------
.../notification/services/guacNotification.js | 31 ++++++++---------
.../app/notification/types/Notification.js | 31 ++++++++---------
.../notification/types/NotificationAction.js | 31 ++++++++---------
.../notification/types/NotificationCountdown.js | 31 ++++++++---------
.../notification/types/NotificationProgress.js | 31 ++++++++---------
.../main/webapp/app/osk/directives/guacOsk.js | 31 ++++++++---------
guacamole/src/main/webapp/app/osk/oskModule.js | 31 ++++++++---------
.../src/main/webapp/app/rest/restModule.js | 31 ++++++++---------
.../rest/services/activeConnectionService.js | 31 ++++++++---------
.../webapp/app/rest/services/cacheService.js | 31 ++++++++---------
.../app/rest/services/connectionGroupService.js | 31 ++++++++---------
.../app/rest/services/connectionService.js | 31 ++++++++---------
.../app/rest/services/dataSourceService.js | 31 ++++++++---------
.../webapp/app/rest/services/historyService.js | 31 ++++++++---------
.../webapp/app/rest/services/languageService.js | 31 ++++++++---------
.../webapp/app/rest/services/patchService.js | 31 ++++++++---------
.../app/rest/services/permissionService.js | 31 ++++++++---------
.../webapp/app/rest/services/schemaService.js | 31 ++++++++---------
.../webapp/app/rest/services/userService.js | 31 ++++++++---------
.../webapp/app/rest/types/ActiveConnection.js | 31 ++++++++---------
.../main/webapp/app/rest/types/Connection.js | 31 ++++++++---------
.../webapp/app/rest/types/ConnectionGroup.js | 31 ++++++++---------
.../app/rest/types/ConnectionHistoryEntry.js | 31 ++++++++---------
.../src/main/webapp/app/rest/types/Error.js | 31 ++++++++---------
.../src/main/webapp/app/rest/types/Field.js | 31 ++++++++---------
.../src/main/webapp/app/rest/types/Form.js | 31 ++++++++---------
.../webapp/app/rest/types/PermissionFlagSet.js | 31 ++++++++---------
.../webapp/app/rest/types/PermissionPatch.js | 31 ++++++++---------
.../main/webapp/app/rest/types/PermissionSet.js | 31 ++++++++---------
.../src/main/webapp/app/rest/types/Protocol.js | 31 ++++++++---------
.../src/main/webapp/app/rest/types/User.js | 31 ++++++++---------
.../webapp/app/rest/types/UserPasswordUpdate.js | 31 ++++++++---------
.../settings/controllers/settingsController.js | 31 ++++++++---------
.../directives/guacSettingsConnectionHistory.js | 31 ++++++++---------
.../directives/guacSettingsConnections.js | 31 ++++++++---------
.../directives/guacSettingsPreferences.js | 31 ++++++++---------
.../settings/directives/guacSettingsSessions.js | 31 ++++++++---------
.../settings/directives/guacSettingsUsers.js | 31 ++++++++---------
.../app/settings/services/preferenceService.js | 31 ++++++++---------
.../main/webapp/app/settings/settingsModule.js | 31 ++++++++---------
.../settings/types/ActiveConnectionWrapper.js | 31 ++++++++---------
.../types/ConnectionHistoryEntryWrapper.js | 31 ++++++++---------
.../storage/services/sessionStorageFactory.js | 31 ++++++++---------
.../main/webapp/app/storage/storageModule.js | 31 ++++++++---------
.../webapp/app/textInput/directives/guacKey.js | 31 ++++++++---------
.../app/textInput/directives/guacTextInput.js | 31 ++++++++---------
.../webapp/app/textInput/textInputModule.js | 31 ++++++++---------
.../app/touch/directives/guacTouchDrag.js | 31 ++++++++---------
.../app/touch/directives/guacTouchPinch.js | 31 ++++++++---------
.../src/main/webapp/app/touch/touchModule.js | 31 ++++++++---------
531 files changed, 7548 insertions(+), 9143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java b/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
index 6704934..64f78e4 100644
--- a/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
+++ b/doc/guacamole-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.net.example;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
index 3cf849c..76725a6 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
index 31af41f..f14bc25 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
index cf9e6b7..d7d5081 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionDirectory.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.activeconnection;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
index 8434ead..68bd297 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.activeconnection;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
index 51dd82f..6b92a8d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionSet.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.activeconnection;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
index 8992be8..3d56967 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.activeconnection;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
index ebf142b..c02e54d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.activeconnection;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
index 95f8a67..098b34e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/package-info.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.
*/
/**
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
index 976aff8..11ef2a4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/DirectoryObjectService.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
index 96b57ff..18dffee 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/GroupedObjectModel.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
index db25d63..840f605 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObject.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
index 43e1289..d6c5679 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectMapper.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
index 59b1c0b..6eb615e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledDirectoryObjectService.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
index 5133e33..6aca740 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObject.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
index 44312de..4aecff2 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledGroupedDirectoryObjectService.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1810ec97/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
index 7a41fbc..febe700 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledObject.java
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 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.apache.guacamole.auth.jdbc.base;