.classpath

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

  1. … 2102 more files in changeset.
LDEV-5440 Update Undertow to version 2.3.12

  1. … 669 more files in changeset.
LDEV-5440 Update Hibernate to version 6.4.4

  1. … 6245 more files in changeset.
LDEV-5440 Introduce missing Batik dependency

  1. … 2 more files in changeset.
LDEV-5440 Add compilation parameter for legacy Spring binding

  1. … 14 more files in changeset.
LDEV-5440 Add Elytron security source code for reference

  1. … 285 more files in changeset.
LDEV-5440 Update libraries to new versions

  1. … 70 more files in changeset.
LDEV-5440 Further code upgrade to conform new WF libraries

  1. … 61 more files in changeset.
LDEV-5440 Use WF 31 Final instead of Beta

  1. … 70 more files in changeset.
LDEV-5440 Rewrite config files and library references

  1. … 955 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_central/.classpath

LDEV-5386 Fix dependency problem

LDEV-5386 Modify config files for LAMS v4.8

  1. … 66 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 15 more files in changeset.
LDEV-5386 Library management

  1. … 70 more files in changeset.
LAI-3 Upgrade libraries to work with Word and PDF documents

Some libraries that we used for working with Word documents are outdated and insecure. It is a good idea to update them and their dependencies so we work with modern code when extracting PDF text for AI summarisation.

  1. … 7042 more files in changeset.
LDEV-5386 IntelliJ configuration file maintenance

  1. … 72 more files in changeset.
LDEV-5386 Clean up .classpath files to make them compatible with IntelliJ

  1. … 33 more files in changeset.
LDEV-4997 Renormalize line endings with git

  1. … 420 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

  1. … 463 more files in changeset.
LDEV-4696 Use container provided Hibernate libraries instead of own copy

  1. … 33 more files in changeset.
LDEV-4696 Link persistence API source to in classpaths

  1. … 23 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4691' into lams31

Conflicts:

3rdParty_sources/httpclient/org/apache/http/auth/AUTH.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthOption.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthProtocolState.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthScheme.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeProvider.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeRegistry.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthScope.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthState.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthenticationException.java

3rdParty_sources/httpclient/org/apache/http/auth/BasicUserPrincipal.java

3rdParty_sources/httpclient/org/apache/http/auth/ChallengeState.java

3rdParty_sources/httpclient/org/apache/http/auth/ContextAwareAuthScheme.java

3rdParty_sources/httpclient/org/apache/http/auth/Credentials.java

3rdParty_sources/httpclient/org/apache/http/auth/InvalidCredentialsException.java

3rdParty_sources/httpclient/org/apache/http/auth/KerberosCredentials.java

3rdParty_sources/httpclient/org/apache/http/auth/MalformedChallengeException.java

3rdParty_sources/httpclient/org/apache/http/auth/NTCredentials.java

3rdParty_sources/httpclient/org/apache/http/auth/NTUserPrincipal.java

3rdParty_sources/httpclient/org/apache/http/auth/UsernamePasswordCredentials.java

3rdParty_sources/httpclient/org/apache/http/auth/package-info.java

3rdParty_sources/httpclient/org/apache/http/auth/params/AuthPNames.java

3rdParty_sources/httpclient/org/apache/http/auth/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/AuthCache.java

3rdParty_sources/httpclient/org/apache/http/client/AuthenticationStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/BackoffManager.java

3rdParty_sources/httpclient/org/apache/http/client/CircularRedirectException.java

3rdParty_sources/httpclient/org/apache/http/client/ClientProtocolException.java

3rdParty_sources/httpclient/org/apache/http/client/ConnectionBackoffStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/CookieStore.java

3rdParty_sources/httpclient/org/apache/http/client/CredentialsProvider.java

3rdParty_sources/httpclient/org/apache/http/client/HttpClient.java

3rdParty_sources/httpclient/org/apache/http/client/HttpRequestRetryHandler.java

3rdParty_sources/httpclient/org/apache/http/client/HttpResponseException.java

3rdParty_sources/httpclient/org/apache/http/client/NonRepeatableRequestException.java

3rdParty_sources/httpclient/org/apache/http/client/RedirectException.java

3rdParty_sources/httpclient/org/apache/http/client/RedirectStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/ResponseHandler.java

3rdParty_sources/httpclient/org/apache/http/client/ServiceUnavailableRetryStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/UserTokenHandler.java

3rdParty_sources/httpclient/org/apache/http/client/config/AuthSchemes.java

3rdParty_sources/httpclient/org/apache/http/client/config/CookieSpecs.java

3rdParty_sources/httpclient/org/apache/http/client/config/RequestConfig.java

3rdParty_sources/httpclient/org/apache/http/client/config/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/entity/DecompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/DeflateDecompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/DeflateInputStream.java

3rdParty_sources/httpclient/org/apache/http/client/entity/EntityBuilder.java

3rdParty_sources/httpclient/org/apache/http/client/entity/GzipCompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/GzipDecompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/InputStreamFactory.java

3rdParty_sources/httpclient/org/apache/http/client/entity/LazyDecompressingInputStream.java

3rdParty_sources/httpclient/org/apache/http/client/entity/UrlEncodedFormEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/methods/AbortableHttpRequest.java

3rdParty_sources/httpclient/org/apache/http/client/methods/AbstractExecutionAwareRequest.java

3rdParty_sources/httpclient/org/apache/http/client/methods/CloseableHttpResponse.java

3rdParty_sources/httpclient/org/apache/http/client/methods/Configurable.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpDelete.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpExecutionAware.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpGet.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpHead.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpOptions.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpPatch.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpPost.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpPut.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpRequestBase.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpRequestWrapper.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpTrace.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpUriRequest.java

3rdParty_sources/httpclient/org/apache/http/client/methods/RequestBuilder.java

3rdParty_sources/httpclient/org/apache/http/client/methods/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/params/AllClientPNames.java

3rdParty_sources/httpclient/org/apache/http/client/params/ClientPNames.java

3rdParty_sources/httpclient/org/apache/http/client/params/HttpClientParamConfig.java

3rdParty_sources/httpclient/org/apache/http/client/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/HttpClientContext.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestAcceptEncoding.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestAddCookies.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestAuthCache.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestClientConnControl.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestDefaultHeaders.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestExpectContinue.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/ResponseContentEncoding.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/ResponseProcessCookies.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/utils/CloneUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/DateUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/HttpClientUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/URIBuilder.java

3rdParty_sources/httpclient/org/apache/http/client/utils/URIUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/URLEncodedUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/ClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/conn/ClientConnectionRequest.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectTimeoutException.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionKeepAliveStrategy.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionPoolTimeoutException.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionReleaseTrigger.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionRequest.java

3rdParty_sources/httpclient/org/apache/http/conn/DnsResolver.java

3rdParty_sources/httpclient/org/apache/http/conn/EofSensorInputStream.java

3rdParty_sources/httpclient/org/apache/http/conn/EofSensorWatcher.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpClientConnectionOperator.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpConnectionFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpHostConnectException.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpInetSocketAddress.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpRoutedConnection.java

3rdParty_sources/httpclient/org/apache/http/conn/ManagedClientConnection.java

3rdParty_sources/httpclient/org/apache/http/conn/ManagedHttpClientConnection.java

3rdParty_sources/httpclient/org/apache/http/conn/SchemePortResolver.java

3rdParty_sources/httpclient/org/apache/http/conn/UnsupportedSchemeException.java

3rdParty_sources/httpclient/org/apache/http/conn/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/params/ConnConnectionPNames.java

3rdParty_sources/httpclient/org/apache/http/conn/params/ConnManagerPNames.java

3rdParty_sources/httpclient/org/apache/http/conn/params/ConnRoutePNames.java

3rdParty_sources/httpclient/org/apache/http/conn/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/BasicRouteDirector.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/HttpRoute.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/HttpRouteDirector.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/HttpRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/RouteInfo.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/RouteTracker.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/LayeredSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/Scheme.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeRegistry.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/ConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/LayeredConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/PlainConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/AbstractVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/DefaultHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/NoopHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLInitializationException.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/StrictHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/TrustStrategy.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/X509HostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/util/DomainType.java

3rdParty_sources/httpclient/org/apache/http/conn/util/InetAddressUtils.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixList.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixListParser.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixMatcher.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixMatcherLoader.java

3rdParty_sources/httpclient/org/apache/http/conn/util/package-info.java

3rdParty_sources/httpclient/org/apache/http/cookie/ClientCookie.java

3rdParty_sources/httpclient/org/apache/http/cookie/CommonCookieAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/cookie/Cookie.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieIdentityComparator.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieOrigin.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookiePathComparator.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookiePriorityComparator.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieRestrictionViolationException.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpec.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpecFactory.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpecRegistry.java

3rdParty_sources/httpclient/org/apache/http/cookie/MalformedCookieException.java

3rdParty_sources/httpclient/org/apache/http/cookie/SM.java

3rdParty_sources/httpclient/org/apache/http/cookie/SetCookie.java

3rdParty_sources/httpclient/org/apache/http/cookie/SetCookie2.java

3rdParty_sources/httpclient/org/apache/http/cookie/package-info.java

3rdParty_sources/httpclient/org/apache/http/cookie/params/CookieSpecPNames.java

3rdParty_sources/httpclient/org/apache/http/cookie/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/AuthSchemeBase.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/BasicScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/BasicSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/DigestScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/DigestSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/GGSSchemeBase.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/HttpAuthenticator.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/HttpEntityDigester.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/KerberosScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/KerberosSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMEngine.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMEngineException.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMEngineImpl.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/RFC2617Scheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/SPNegoScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/SPNegoSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/client/AIMDBackoffManager.java

3rdParty_sources/httpclient/org/apache/http/impl/client/AbstractResponseHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/AuthenticationStrategyImpl.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicAuthCache.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicCookieStore.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicCredentialsProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicResponseHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/Clock.java

3rdParty_sources/httpclient/org/apache/http/impl/client/CloseableHttpClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/CookieSpecRegistries.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultBackoffStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultRedirectStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultUserTokenHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java

3rdParty_sources/httpclient/org/apache/http/impl/client/FutureRequestExecutionMetrics.java

3rdParty_sources/httpclient/org/apache/http/impl/client/FutureRequestExecutionService.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpClientBuilder.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpClients.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpRequestFutureTask.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpRequestTaskCallable.java

3rdParty_sources/httpclient/org/apache/http/impl/client/IdleConnectionEvictor.java

3rdParty_sources/httpclient/org/apache/http/impl/client/InternalHttpClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/LaxRedirectStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/MinimalHttpClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/NoopUserTokenHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/NullBackoffStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/ProxyAuthenticationStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/ProxyClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/RedirectLocations.java

3rdParty_sources/httpclient/org/apache/http/impl/client/RequestWrapper.java

3rdParty_sources/httpclient/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/SystemClock.java

3rdParty_sources/httpclient/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/client/TargetAuthenticationStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/CPool.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/CPoolEntry.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/CPoolProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/ConnectionShutdownException.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultHttpResponseParser.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultProxyRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultSchemePortResolver.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/InMemoryDnsResolver.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/LoggingInputStream.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/LoggingOutputStream.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/SystemDefaultDnsResolver.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/Wire.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/AbstractCookieSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicClientCookie.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicClientCookie2.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicCommentHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicDomainHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicExpiresHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicMaxAgeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicPathHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicSecureHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/CookieSpecBase.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/DefaultCookieSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/DefaultCookieSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/IgnoreSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/IgnoreSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/LaxExpiresHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/LaxMaxAgeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDomainHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDraftSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/PublicSuffixDomainFilter.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109DomainHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109Spec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109SpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109VersionHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965Spec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965SpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265CookieSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265LaxSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265StrictSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/BackoffStrategyExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ClientExecChain.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ConnectionHolder.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/HttpResponseProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/MainClientExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/MinimalClientExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ProtocolExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RedirectExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RequestAbortedException.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RequestEntityProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ResponseEntityProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RetryExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/TunnelRefusedException.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/package-info.java

3rdParty_sources/httpcore/org/apache/http/entity/BufferedHttpEntity.java

3rdParty_sources/httpcore/org/apache/http/impl/BHttpConnectionBase.java

3rdParty_sources/httpcore/org/apache/http/impl/DefaultConnectionReuseStrategy.java

3rdParty_sources/httpcore/org/apache/http/message/HeaderGroup.java

3rdParty_sources/httpcore/org/apache/http/pool/PoolStats.java

lams_build/build_base.xml

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_central/.classpath

  1. … 14 more files in changeset.
LDEV-4698 Stop using Apache httpcomponents library in LAMS

  1. … 4 more files in changeset.
LDEV-4691 Make Hibernate a part of LAMS libraries

WildFly 14 provides Hibernate 5.3. Migrating LAMS from 5.0.10 will

require some effort. For now we provide our own version of Hibernate to

keep compatible.

  1. … 44 more files in changeset.
LDEV-4691 Update libraries provided by WildFly

  1. … 47 more files in changeset.
LDEV-4440 All projects start using solely 3rdParty.userlibraries

  1. … 35 more files in changeset.
Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

  1. … 648 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/.classpath

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/.classpath

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_lamc/.classpath

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

lams_tool_sbmt/.classpath

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/.classpath

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/.classpath

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_wiki/.classpath

  1. … 103 more files in changeset.
LDEV-4440 Central noStruts Library

  1. … 13 more files in changeset.