HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai.
This commit is contained in:
Haohui Mai
parent
e5e3f86c64
commit
aa09c4c342
|
|
@ -39,22 +39,10 @@
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>servlet-api</artifactId>
|
<artifactId>servlet-api</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>commons-logging</groupId>
|
<groupId>commons-logging</groupId>
|
||||||
<artifactId>commons-logging-api</artifactId>
|
<artifactId>commons-logging-api</artifactId>
|
||||||
|
|
@ -71,10 +59,6 @@
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty-util</artifactId>
|
<artifactId>jetty-util</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-api-2.1</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>servlet-api-2.5</artifactId>
|
<artifactId>servlet-api-2.5</artifactId>
|
||||||
|
|
@ -111,10 +95,6 @@
|
||||||
<groupId>com.jcraft</groupId>
|
<groupId>com.jcraft</groupId>
|
||||||
<artifactId>jsch</artifactId>
|
<artifactId>jsch</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
@ -147,14 +127,6 @@
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>servlet-api</artifactId>
|
<artifactId>servlet-api</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,21 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>jdk1.8</id>
|
||||||
|
<activation>
|
||||||
|
<jdk>1.8</jdk>
|
||||||
|
</activation>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>jdk.tools</groupId>
|
||||||
|
<artifactId>jdk.tools</artifactId>
|
||||||
|
<version>1.8</version>
|
||||||
|
<scope>system</scope>
|
||||||
|
<systemPath>${java.home}/../lib/tools.jar</systemPath>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@ Release 2.7.0 - UNRELEASED
|
||||||
HADOOP-10847. Remove the usage of sun.security.x509.* in testing code.
|
HADOOP-10847. Remove the usage of sun.security.x509.* in testing code.
|
||||||
(Pascal Oliva via wheat9)
|
(Pascal Oliva via wheat9)
|
||||||
|
|
||||||
|
HADOOP-10563. Remove the dependency of jsp in trunk. (wheat9)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
@ -163,193 +165,6 @@ Release 2.6.0 - UNRELEASED
|
||||||
HADOOP-10534. KeyProvider getKeysMetadata should take a list of names
|
HADOOP-10534. KeyProvider getKeysMetadata should take a list of names
|
||||||
rather than returning all keys. (omalley)
|
rather than returning all keys. (omalley)
|
||||||
|
|
||||||
HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey
|
|
||||||
methods to KeyProvider. (asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10817. ProxyUsers configuration should support configurable
|
|
||||||
prefixes. (tucu)
|
|
||||||
|
|
||||||
HADOOP-10881. Clarify usage of encryption and encrypted encryption
|
|
||||||
key in KeyProviderCryptoExtension. (wang)
|
|
||||||
|
|
||||||
HADOOP-10770. KMS add delegation token support. (tucu)
|
|
||||||
|
|
||||||
HADOOP-10698. KMS, add proxyuser support. (tucu)
|
|
||||||
|
|
||||||
HADOOP-8896. Javadoc points to Wrong Reader and Writer classes
|
|
||||||
in SequenceFile (Ray Chiang via aw)
|
|
||||||
|
|
||||||
HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw)
|
|
||||||
|
|
||||||
HADOOP-10880. Move HTTP delegation tokens out of URL querystring to
|
|
||||||
a header. (tucu)
|
|
||||||
|
|
||||||
HADOOP-11005. Fix HTTP content type for ReconfigurationServlet.
|
|
||||||
(Lei Xu via wang)
|
|
||||||
|
|
||||||
HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest
|
|
||||||
6.x version. (rkanter via tucu)
|
|
||||||
|
|
||||||
HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for
|
|
||||||
generation/decryption of keys. (tucu)
|
|
||||||
|
|
||||||
HADOOP-11021. Configurable replication factor in the hadoop archive
|
|
||||||
command. (Zhe Zhang via wang)
|
|
||||||
|
|
||||||
HADOOP-11030. Define a variable jackson.version instead of using constant
|
|
||||||
at multiple places. (Juan Yu via kasha)
|
|
||||||
|
|
||||||
HADOOP-10990. Add missed NFSv3 request and response classes (brandonli)
|
|
||||||
|
|
||||||
HADOOP-10863. KMS should have a blacklist for decrypting EEKs.
|
|
||||||
(asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu)
|
|
||||||
|
|
||||||
HADOOP-11015. Http server/client utils to propagate and recreate
|
|
||||||
Exceptions from server to client. (tucu)
|
|
||||||
|
|
||||||
HADOOP-11060. Create a CryptoCodec test that verifies interoperability
|
|
||||||
between the JCE and OpenSSL implementations. (hitliuyi via tucu)
|
|
||||||
|
|
||||||
HADOOP-11070. Create MiniKMS for testing. (tucu)
|
|
||||||
|
|
||||||
HADOOP-11057. checknative command to probe for winutils.exe on windows.
|
|
||||||
(Xiaoyu Yao via cnauroth)
|
|
||||||
|
|
||||||
HADOOP-10758. KMS: add ACLs on per key basis. (tucu)
|
|
||||||
|
|
||||||
HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations
|
|
||||||
for Unit testing. (Steve Lougran)
|
|
||||||
|
|
||||||
HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
|
|
||||||
|
|
||||||
HADOOP-11074. Move s3-related FS connector code to hadoop-aws (David S.
|
|
||||||
Wang via Colin Patrick McCabe)
|
|
||||||
|
|
||||||
HADOOP-11091. Eliminate old configuration parameter names from s3a (David
|
|
||||||
S. Wang via Colin Patrick McCabe)
|
|
||||||
|
|
||||||
HADOOP-10868. AuthenticationFilter should support externalizing the
|
|
||||||
secret for signing and provide rotation support. (rkanter via tucu)
|
|
||||||
|
|
||||||
HADOOP-10922. User documentation for CredentialShell. (Larry McCay via wang)
|
|
||||||
|
|
||||||
HADOOP-11016. KMS should support signing cookies with zookeeper secret
|
|
||||||
manager. (tucu)
|
|
||||||
|
|
||||||
HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang)
|
|
||||||
|
|
||||||
HADOOP-10970. Cleanup KMS configuration keys. (wang)
|
|
||||||
|
|
||||||
HADOOP-11017. KMS delegation token secret manager should be able to use
|
|
||||||
zookeeper as store. (asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw)
|
|
||||||
|
|
||||||
HADOOP-11101. How about inputstream close statement from catch block to
|
|
||||||
finally block in FileContext#copy() ( skrho via vinayakumarb )
|
|
||||||
|
|
||||||
HADOOP-8808. Update FsShell documentation to mention deprecation of some
|
|
||||||
of the commands, and mention alternatives (Akira AJISAKA via aw)
|
|
||||||
|
|
||||||
HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki
|
|
||||||
via aw)
|
|
||||||
|
|
||||||
HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry
|
|
||||||
Saputra via aw)
|
|
||||||
|
|
||||||
HADOOP-11153. Make number of KMS threads configurable. (wang)
|
|
||||||
|
|
||||||
HADOOP-11007. Reinstate building of ant tasks support. (jlowe via kihwal)
|
|
||||||
|
|
||||||
HADOOP-11178. Fix findbugs exclude file. (Arun Suresh via wang)
|
|
||||||
|
|
||||||
HADOOP-11174. Delegation token for KMS should only be got once if it
|
|
||||||
already exists. (Yi Liu via wang)
|
|
||||||
|
|
||||||
HADOOP-11184. Update Hadoop's lz4 to version r123. (cmccabe)
|
|
||||||
|
|
||||||
HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all
|
|
||||||
sub-classes of AbstractDelegationTokenIdentifier. (zjshen)
|
|
||||||
|
|
||||||
HADOOP-11207. Enhanced common DelegationTokenAuthenticationHandler to support
|
|
||||||
proxy-users on Delegation-token management operations. (Zhijie Shen via
|
|
||||||
vinodkv)
|
|
||||||
|
|
||||||
HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu)
|
|
||||||
|
|
||||||
HADOOP-11254. Changed visibility of AccessControlList to be public for
|
|
||||||
consumption by ecosystem. (Zhijie Shen via vinodkv)
|
|
||||||
|
|
||||||
OPTIMIZATIONS
|
|
||||||
|
|
||||||
HADOOP-10838. Byte array native checksumming. (James Thomas via todd)
|
|
||||||
|
|
||||||
HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata.
|
|
||||||
(tucu)
|
|
||||||
|
|
||||||
HADOOP-10695. KMSClientProvider should respect a configurable timeout.
|
|
||||||
(yoderme via tucu)
|
|
||||||
|
|
||||||
HADOOP-10757. KeyProvider KeyVersion should provide the key name.
|
|
||||||
(asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10769. Create KeyProvider extension to handle delegation tokens.
|
|
||||||
(Arun Suresh via atm)
|
|
||||||
|
|
||||||
HADOOP-10812. Delegate KeyProviderExtension#toString to underlying
|
|
||||||
KeyProvider. (wang)
|
|
||||||
|
|
||||||
HADOOP-10736. Add key attributes to the key shell. (Mike Yoder via wang)
|
|
||||||
|
|
||||||
HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh)
|
|
||||||
|
|
||||||
HADOOP-10841. EncryptedKeyVersion should have a key name property.
|
|
||||||
(asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10842. CryptoExtension generateEncryptedKey method should
|
|
||||||
receive the key name. (asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10750. KMSKeyProviderCache should be in hadoop-common.
|
|
||||||
(asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey
|
|
||||||
in the REST API. (asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10891. Add EncryptedKeyVersion factory method to
|
|
||||||
KeyProviderCryptoExtension. (wang)
|
|
||||||
|
|
||||||
HADOOP-10756. KMS audit log should consolidate successful similar requests.
|
|
||||||
(asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10793. KeyShell args should use single-dash style. (wang)
|
|
||||||
|
|
||||||
HADOOP-10936. Change default KeyProvider bitlength to 128. (wang)
|
|
||||||
|
|
||||||
HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting
|
|
||||||
underlying store. (asuresh via tucu)
|
|
||||||
|
|
||||||
HADOOP-10282. Create a FairCallQueue: a multi-level call queue which
|
|
||||||
schedules incoming calls and multiplexes outgoing calls. (Chris Li via
|
|
||||||
Arpit Agarwal)
|
|
||||||
|
|
||||||
HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony)
|
|
||||||
|
|
||||||
HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang)
|
|
||||||
|
|
||||||
HADOOP-11111 MiniKDC to use locale EN_US for case conversions. (stevel)
|
|
||||||
|
|
||||||
HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib
|
|
||||||
codecs. (Gopal Vijayaraghavan via acmurthy)
|
|
||||||
|
|
||||||
HADOOP-11194. Ignore .keep files. (kasha)
|
|
||||||
|
|
||||||
HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for
|
|
||||||
better maintenance (Yongjun Zhang via brandonli)
|
|
||||||
|
|
||||||
HADOOP-11247. Fix a couple javac warnings in NFS. (Brandon Li via wheat9)
|
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
||||||
HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)
|
HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)
|
||||||
|
|
|
||||||
|
|
@ -121,26 +121,6 @@
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-logging</groupId>
|
<groupId>commons-logging</groupId>
|
||||||
<artifactId>commons-logging</artifactId>
|
<artifactId>commons-logging</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -259,13 +259,6 @@ public class TestHttpServer extends HttpServerFunctionalTest {
|
||||||
conn.connect();
|
conn.connect();
|
||||||
assertEquals(200, conn.getResponseCode());
|
assertEquals(200, conn.getResponseCode());
|
||||||
assertEquals("text/html; charset=utf-8", conn.getContentType());
|
assertEquals("text/html; charset=utf-8", conn.getContentType());
|
||||||
|
|
||||||
// JSPs should default to text/html with utf8
|
|
||||||
servletUrl = new URL(baseUrl, "/testjsp.jsp");
|
|
||||||
conn = (HttpURLConnection)servletUrl.openConnection();
|
|
||||||
conn.connect();
|
|
||||||
assertEquals(200, conn.getResponseCode());
|
|
||||||
assertEquals("text/html; charset=utf-8", conn.getContentType());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -106,26 +106,10 @@
|
||||||
<groupId>commons-httpclient</groupId>
|
<groupId>commons-httpclient</groupId>
|
||||||
<artifactId>commons-httpclient</artifactId>
|
<artifactId>commons-httpclient</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>servlet-api</artifactId>
|
<artifactId>servlet-api</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty</artifactId>
|
<artifactId>jetty</artifactId>
|
||||||
|
|
@ -134,10 +118,6 @@
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty-util</artifactId>
|
<artifactId>jetty-util</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-api-2.1</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>servlet-api-2.5</artifactId>
|
<artifactId>servlet-api-2.5</artifactId>
|
||||||
|
|
@ -154,10 +134,6 @@
|
||||||
<groupId>org.eclipse.jdt</groupId>
|
<groupId>org.eclipse.jdt</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -173,26 +149,10 @@
|
||||||
<groupId>commons-httpclient</groupId>
|
<groupId>commons-httpclient</groupId>
|
||||||
<artifactId>commons-httpclient</artifactId>
|
<artifactId>commons-httpclient</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>servlet-api</artifactId>
|
<artifactId>servlet-api</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty</artifactId>
|
<artifactId>jetty</artifactId>
|
||||||
|
|
@ -201,10 +161,6 @@
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty-util</artifactId>
|
<artifactId>jetty-util</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-api-2.1</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>servlet-api-2.5</artifactId>
|
<artifactId>servlet-api-2.5</artifactId>
|
||||||
|
|
@ -221,10 +177,6 @@
|
||||||
<groupId>org.eclipse.jdt</groupId>
|
<groupId>org.eclipse.jdt</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -134,11 +134,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<artifactId>commons-daemon</artifactId>
|
<artifactId>commons-daemon</artifactId>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
|
|
@ -179,11 +174,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<artifactId>jackson-mapper-asl</artifactId>
|
<artifactId>jackson-mapper-asl</artifactId>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xmlenc</groupId>
|
<groupId>xmlenc</groupId>
|
||||||
<artifactId>xmlenc</artifactId>
|
<artifactId>xmlenc</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -120,11 +120,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<artifactId>commons-daemon</artifactId>
|
<artifactId>commons-daemon</artifactId>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
|
|
@ -170,11 +165,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<artifactId>jackson-mapper-asl</artifactId>
|
<artifactId>jackson-mapper-asl</artifactId>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xmlenc</groupId>
|
<groupId>xmlenc</groupId>
|
||||||
<artifactId>xmlenc</artifactId>
|
<artifactId>xmlenc</artifactId>
|
||||||
|
|
@ -228,123 +218,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
</properties>
|
</properties>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo.jspc</groupId>
|
|
||||||
<artifactId>jspc-maven-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>hdfs</id>
|
|
||||||
<phase>generate-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<compile>false</compile>
|
|
||||||
<workingDirectory>${project.build.directory}/generated-sources/java</workingDirectory>
|
|
||||||
<webFragmentFile>${project.build.directory}/hdfs-jsp-servlet-definitions.xml</webFragmentFile>
|
|
||||||
<packageName>org.apache.hadoop.hdfs.server.namenode</packageName>
|
|
||||||
<sources>
|
|
||||||
<directory>${basedir}/src/main/webapps/hdfs</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.jsp</include>
|
|
||||||
</includes>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>secondary</id>
|
|
||||||
<phase>generate-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<compile>false</compile>
|
|
||||||
<workingDirectory>${project.build.directory}/generated-sources/java</workingDirectory>
|
|
||||||
<webFragmentFile>${project.build.directory}/secondary-jsp-servlet-definitions.xml</webFragmentFile>
|
|
||||||
<packageName>org.apache.hadoop.hdfs.server.namenode</packageName>
|
|
||||||
<sources>
|
|
||||||
<directory>${basedir}/src/main/webapps/secondary</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.jsp</include>
|
|
||||||
</includes>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>journal</id>
|
|
||||||
<phase>generate-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<compile>false</compile>
|
|
||||||
<workingDirectory>${project.build.directory}/generated-sources/java</workingDirectory>
|
|
||||||
<webFragmentFile>${project.build.directory}/journal-jsp-servlet-definitions.xml</webFragmentFile>
|
|
||||||
<packageName>org.apache.hadoop.hdfs.server.journalservice</packageName>
|
|
||||||
<sources>
|
|
||||||
<directory>${basedir}/src/main/webapps/journal</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.jsp</include>
|
|
||||||
</includes>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>datanode</id>
|
|
||||||
<phase>generate-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<compile>false</compile>
|
|
||||||
<workingDirectory>${project.build.directory}/generated-sources/java</workingDirectory>
|
|
||||||
<webFragmentFile>${project.build.directory}/datanode-jsp-servlet-definitions.xml</webFragmentFile>
|
|
||||||
<packageName>org.apache.hadoop.hdfs.server.datanode</packageName>
|
|
||||||
<sources>
|
|
||||||
<directory>${basedir}/src/main/webapps/datanode</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.jsp</include>
|
|
||||||
</includes>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.mojo.jspc</groupId>
|
|
||||||
<artifactId>jspc-compiler-tomcat5</artifactId>
|
|
||||||
<version>2.0-alpha-3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
|
||||||
<version>1.4.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>jcl104-over-slf4j</artifactId>
|
|
||||||
<version>1.4.1</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>add-jsp-generated-sources-directory</id>
|
|
||||||
<phase>generate-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>add-source</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<sources>
|
|
||||||
<source>${project.build.directory}/generated-sources/java</source>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
|
@ -352,18 +225,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<skipTests>false</skipTests>
|
<skipTests>false</skipTests>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
|
||||||
<id>create-jsp-generated-sources-directory</id>
|
|
||||||
<phase>initialize</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<mkdir dir="${project.build.directory}/generated-sources/java" />
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
<execution>
|
||||||
<id>create-web-xmls</id>
|
<id>create-web-xmls</id>
|
||||||
<phase>compile</phase>
|
<phase>compile</phase>
|
||||||
|
|
@ -372,32 +233,21 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<target>
|
<target>
|
||||||
<loadfile property="hdfs.servlet.definitions" srcFile="${project.build.directory}/hdfs-jsp-servlet-definitions.xml"/>
|
<copy file="${basedir}/src/main/webapps/proto-web.xml"
|
||||||
<loadfile property="secondary.servlet.definitions" srcFile="${project.build.directory}/secondary-jsp-servlet-definitions.xml"/>
|
|
||||||
<loadfile property="datanode.servlet.definitions" srcFile="${project.build.directory}/datanode-jsp-servlet-definitions.xml"/>
|
|
||||||
<loadfile property="journal.servlet.definitions" srcFile="${project.build.directory}/journal-jsp-servlet-definitions.xml"/>
|
|
||||||
<echoproperties destfile="${project.build.directory}/webxml.properties">
|
|
||||||
<propertyset>
|
|
||||||
<propertyref regex=".*.servlet.definitions"/>
|
|
||||||
</propertyset>
|
|
||||||
</echoproperties>
|
|
||||||
<filter filtersfile="${project.build.directory}/webxml.properties"/>
|
|
||||||
<copy file="${basedir}/src/main/webapps/proto-hdfs-web.xml"
|
|
||||||
tofile="${project.build.directory}/webapps/hdfs/WEB-INF/web.xml"
|
tofile="${project.build.directory}/webapps/hdfs/WEB-INF/web.xml"
|
||||||
filtering="true"/>
|
filtering="true"/>
|
||||||
<copy file="${basedir}/src/main/webapps/proto-secondary-web.xml"
|
<copy file="${basedir}/src/main/webapps/proto-web.xml"
|
||||||
tofile="${project.build.directory}/webapps/secondary/WEB-INF/web.xml"
|
tofile="${project.build.directory}/webapps/secondary/WEB-INF/web.xml"
|
||||||
filtering="true"/>
|
filtering="true"/>
|
||||||
<copy file="${basedir}/src/main/webapps/proto-datanode-web.xml"
|
<copy file="${basedir}/src/main/webapps/proto-web.xml"
|
||||||
tofile="${project.build.directory}/webapps/datanode/WEB-INF/web.xml"
|
tofile="${project.build.directory}/webapps/datanode/WEB-INF/web.xml"
|
||||||
filtering="true"/>
|
filtering="true"/>
|
||||||
<copy file="${basedir}/src/main/webapps/proto-journal-web.xml"
|
<copy file="${basedir}/src/main/webapps/proto-web.xml"
|
||||||
tofile="${project.build.directory}/webapps/journal/WEB-INF/web.xml"
|
tofile="${project.build.directory}/webapps/journal/WEB-INF/web.xml"
|
||||||
filtering="true"/>
|
filtering="true"/>
|
||||||
<copy toDir="${project.build.directory}/webapps">
|
<copy toDir="${project.build.directory}/webapps">
|
||||||
<fileset dir="${basedir}/src/main/webapps">
|
<fileset dir="${basedir}/src/main/webapps">
|
||||||
<exclude name="**/*.jsp"/>
|
<exclude name="**/proto-web.xml"/>
|
||||||
<exclude name="**/proto-*-web.xml"/>
|
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
</target>
|
</target>
|
||||||
|
|
@ -418,6 +268,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<copy todir="${project.build.directory}/test-classes/webapps">
|
<copy todir="${project.build.directory}/test-classes/webapps">
|
||||||
<fileset dir="${project.build.directory}/webapps">
|
<fileset dir="${project.build.directory}/webapps">
|
||||||
<exclude name="proto-*-web.xml"/>
|
<exclude name="proto-*-web.xml"/>
|
||||||
|
<exclude name="**/proto-web.xml"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
</target>
|
</target>
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,15 @@ import org.apache.hadoop.security.authorize.ProxyServers;
|
||||||
import org.apache.hadoop.security.authorize.ProxyUsers;
|
import org.apache.hadoop.security.authorize.ProxyUsers;
|
||||||
import org.apache.hadoop.security.token.Token;
|
import org.apache.hadoop.security.token.Token;
|
||||||
|
|
||||||
|
import javax.servlet.ServletContext;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.DataInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
|
||||||
|
import static org.apache.hadoop.fs.CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER;
|
||||||
|
import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER;
|
||||||
|
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
public class JspHelper {
|
public class JspHelper {
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Licensed 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
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
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. See accompanying LICENSE file.
|
|
||||||
-->
|
|
||||||
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
|
|
||||||
@datanode.servlet.definitions@
|
|
||||||
</web-app>
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Licensed 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
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
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. See accompanying LICENSE file.
|
|
||||||
-->
|
|
||||||
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
|
|
||||||
@journal.servlet.definitions@
|
|
||||||
</web-app>
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Licensed 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
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
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. See accompanying LICENSE file.
|
|
||||||
-->
|
|
||||||
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
|
|
||||||
@secondary.servlet.definitions@
|
|
||||||
</web-app>
|
|
||||||
|
|
@ -13,5 +13,4 @@
|
||||||
limitations under the License. See accompanying LICENSE file.
|
limitations under the License. See accompanying LICENSE file.
|
||||||
-->
|
-->
|
||||||
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
|
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
|
||||||
@hdfs.servlet.definitions@
|
|
||||||
</web-app>
|
</web-app>
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.hadoop.hdfs.server.common;
|
package org.apache.hadoop.hdfs.server.common;
|
||||||
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
import org.apache.hadoop.hdfs.DFSConfigKeys;
|
import org.apache.hadoop.hdfs.DFSConfigKeys;
|
||||||
import org.apache.hadoop.hdfs.HdfsConfiguration;
|
import org.apache.hadoop.hdfs.HdfsConfiguration;
|
||||||
|
|
@ -45,9 +44,8 @@ import javax.servlet.http.HttpServletRequest;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import org.junit.Assert;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.*;
|
||||||
import static org.junit.Assert.fail;
|
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,24 +72,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -81,24 +81,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -546,36 +546,6 @@
|
||||||
<artifactId>jetty-servlet-tester</artifactId>
|
<artifactId>jetty-servlet-tester</artifactId>
|
||||||
<version>6.1.26</version>
|
<version>6.1.26</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
<version>5.5.23</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>ant</groupId>
|
|
||||||
<artifactId>ant</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
<version>5.5.23</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet.jsp</groupId>
|
|
||||||
<artifactId>jsp-api</artifactId>
|
|
||||||
<version>2.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-logging</groupId>
|
<groupId>commons-logging</groupId>
|
||||||
<artifactId>commons-logging</artifactId>
|
<artifactId>commons-logging</artifactId>
|
||||||
|
|
@ -1019,11 +989,6 @@
|
||||||
<artifactId>avro-maven-plugin</artifactId>
|
<artifactId>avro-maven-plugin</artifactId>
|
||||||
<version>${avro.version}</version>
|
<version>${avro.version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo.jspc</groupId>
|
|
||||||
<artifactId>jspc-maven-plugin</artifactId>
|
|
||||||
<version>2.0-alpha-3</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -51,24 +51,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
|
|
|
||||||
|
|
@ -38,24 +38,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -50,24 +50,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -35,24 +35,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -38,24 +38,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
|
|
|
||||||
|
|
@ -45,24 +45,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
|
|
|
||||||
|
|
@ -38,24 +38,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -40,24 +40,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
|
|
|
||||||
|
|
@ -42,24 +42,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -37,24 +37,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -43,24 +43,6 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-el</groupId>
|
|
||||||
<artifactId>commons-el</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-runtime</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>tomcat</groupId>
|
|
||||||
<artifactId>jasper-compiler</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
|
||||||
<artifactId>jsp-2.1-jetty</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue