You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/04/15 21:47:34 UTC
[10/30] incubator-lens git commit: LENS-228 : Add convenient binary
distribution for release (Srikanth Sundarrajan via amareshwari)
LENS-228 : Add convenient binary distribution for release (Srikanth Sundarrajan via amareshwari)
Conflicts:
lens-client-dist/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/5fcc469e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/5fcc469e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/5fcc469e
Branch: refs/heads/master
Commit: 5fcc469e19033b470c23f7d07da2cafe8fd60635
Parents: 5a4a3d8
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Tue Feb 17 05:39:13 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Feb 17 17:07:58 2015 +0530
----------------------------------------------------------------------
lens-client-dist/LICENSE.txt | 201 ------------
lens-client-dist/pom.xml | 136 --------
lens-client-dist/src/deb/client/control | 27 --
.../src/main/assembly/client-dist.xml | 253 ---------------
lens-client-dist/src/site/apt/index.apt | 20 --
lens-dist/pom.xml | 70 +++-
.../src/deb/control/client-control/control | 27 ++
lens-dist/src/deb/control/control | 27 --
lens-dist/src/deb/control/postinst | 67 ----
.../src/deb/control/server-control/control | 27 ++
.../src/deb/control/server-control/postinst | 67 ++++
lens-dist/src/main/assembly/bin-dist.xml | 321 +++++++++++++++++++
lens-dist/src/main/assembly/server-dist.xml | 121 -------
pom.xml | 42 ++-
14 files changed, 544 insertions(+), 862 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-client-dist/LICENSE.txt
----------------------------------------------------------------------
diff --git a/lens-client-dist/LICENSE.txt b/lens-client-dist/LICENSE.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/lens-client-dist/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-client-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client-dist/pom.xml b/lens-client-dist/pom.xml
deleted file mode 100644
index ad9d41a..0000000
--- a/lens-client-dist/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <name>Lens Client Distribution</name>
-
- <parent>
- <artifactId>lens-parent</artifactId>
- <groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>lens-client-dist</artifactId>
- <description>Packaging and distribution for lens client</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>lens-cli</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>lens-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>lens-examples</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <descriptors>
- <descriptor>src/main/assembly/client-dist.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--Plugin to build deb -->
- <plugin>
- <artifactId>jdeb</artifactId>
- <groupId>org.vafer</groupId>
- <executions>
- <execution>
- <id>client</id>
- <phase>package</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- <configuration>
- <controlDir>${project.basedir}/src/deb/client</controlDir>
- <installDir>/usr/local/lens-client</installDir>
- <deb>${project.build.directory}/lens-client_${project.version}.deb</deb>
- <dataSet>
- <data>
- <src>target/lens-client-dist-${project.version}-client</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/local/lens-client</prefix>
- </mapper>
- </data>
- <data>
- <src>target/lens-client-dist-${project.version}-client/bin</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/local/lens-client/bin</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
- <src>target/lens-client-dist-${project.version}-client/bin/lens-cli</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/bin/</prefix>
- <filemode>755</filemode>
- </mapper>
- </data>
- </dataSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-client-dist/src/deb/client/control
----------------------------------------------------------------------
diff --git a/lens-client-dist/src/deb/client/control b/lens-client-dist/src/deb/client/control
deleted file mode 100644
index ae71018..0000000
--- a/lens-client-dist/src/deb/client/control
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# 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.
-#
-Package: lens-client
-Version: [[project.version]]
-Section: misc
-Priority: high
-Architecture: all
-Depends: sun-java6-jre | java2-runtime
-Maintainer: Lens dev
-Description: Lens Client
-Distribution: aplha
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-client-dist/src/main/assembly/client-dist.xml
----------------------------------------------------------------------
diff --git a/lens-client-dist/src/main/assembly/client-dist.xml b/lens-client-dist/src/main/assembly/client-dist.xml
deleted file mode 100644
index b12d3c9..0000000
--- a/lens-client-dist/src/main/assembly/client-dist.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- 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.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>client</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <baseDirectory>lens-client-${project.version}</baseDirectory>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.lens:lens-api</include>
- <include>org.apache.lens:lens-cli</include>
- <include>org.apache.lens:lens-client</include>
- <include>org.apache.lens:lens-examples</include>
- </includes>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.hadoop:hadoop-common</include>
- </includes>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>../doc/</directory>
- <outputDirectory>/doc/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>lib/**</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <fileMode>755</fileMode>
- <directory>../tools/scripts</directory>
- <outputDirectory>/bin/</outputDirectory>
- <includes>
- <include>run-examples.sh</include>
- <include>lens-config.sh</include>
- <include>lens-cli.sh</include>
- <include>lens-cli</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf/</directory>
- <outputDirectory>/conf/</outputDirectory>
- <includes>
- <include>lens-env.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf-pseudo-distr/</directory>
- <outputDirectory>/conf-pseudo-distr/</outputDirectory>
- <includes>
- <include>lens-env.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/resources</outputDirectory>
- <includes>
- <include>*.xml</include>
- <include>*.sql</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/dim1_local</outputDirectory>
- <includes>
- <include>dim1-local.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/dim2_local</outputDirectory>
- <includes>
- <include>dim2-local.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/dim4_local</outputDirectory>
- <includes>
- <include>dim4-local.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact1_local1</outputDirectory>
- <includes>
- <include>fact1-local1*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact1_local2</outputDirectory>
- <includes>
- <include>fact1-local2*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact1_local3</outputDirectory>
- <includes>
- <include>fact1-local3*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact2_local1</outputDirectory>
- <includes>
- <include>fact2-local1*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact2_local2</outputDirectory>
- <includes>
- <include>fact2-local2*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact2_local3</outputDirectory>
- <includes>
- <include>fact2-local3*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local1</outputDirectory>
- <includes>
- <include>raw-local1*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local2</outputDirectory>
- <includes>
- <include>raw-local2*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local3</outputDirectory>
- <includes>
- <include>raw-local3*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local4</outputDirectory>
- <includes>
- <include>raw-local4*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local5</outputDirectory>
- <includes>
- <include>raw-local5*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local6</outputDirectory>
- <includes>
- <include>raw-local6*.data</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/queries</outputDirectory>
- <includes>
- <include>*.sql</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf/client</directory>
- <outputDirectory>/conf/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf-pseudo-distr/client</directory>
- <outputDirectory>/conf-pseudo-distr/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-client-dist/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/lens-client-dist/src/site/apt/index.apt b/lens-client-dist/src/site/apt/index.apt
deleted file mode 100644
index b45f4f8..0000000
--- a/lens-client-dist/src/site/apt/index.apt
+++ /dev/null
@@ -1,20 +0,0 @@
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ 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.
-~~
-
-Lens Distribution Documentation
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index dd812e0..896abc8 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -34,6 +34,26 @@
<description>Packaging and distribution</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lens</groupId>
+ <artifactId>lens-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lens</groupId>
+ <artifactId>lens-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lens</groupId>
+ <artifactId>lens-examples</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>lens-api</artifactId>
@@ -74,7 +94,7 @@
<configuration>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<descriptors>
- <descriptor>src/main/assembly/server-dist.xml</descriptor>
+ <descriptor>src/main/assembly/bin-dist.xml</descriptor>
</descriptors>
</configuration>
<executions>
@@ -99,33 +119,65 @@
<goal>jdeb</goal>
</goals>
<configuration>
- <installDir>${mvn.lens.install.dir}</installDir>
- <controlDir>${mvn.deb.build.dir}/control</controlDir>
+ <installDir>${mvn.lens.install.dir}/server</installDir>
+ <controlDir>${mvn.deb.build.dir}/control/server-control</controlDir>
<deb>${project.build.directory}/lens-server_${project.version}.deb</deb>
<dataSet>
<data>
- <src>target/lens-dist-${project.version}-server</src>
+ <src>target/lens-dist-${project.version}-bin/server</src>
<type>directory</type>
<mapper>
<type>perm</type>
- <prefix>${mvn.lens.install.dir}</prefix>
+ <prefix>${mvn.lens.install.dir}/server</prefix>
</mapper>
</data>
<data>
- <src>target/lens-dist-${project.version}-server/bin</src>
+ <src>target/lens-dist-${project.version}-bin/server/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
- <prefix>${mvn.lens.bin.dir}</prefix>
+ <prefix>${mvn.lens.install.dir}/server/bin</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
+ </dataSet>
+ </configuration>
+ </execution>
+ <execution>
+ <id>client</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jdeb</goal>
+ </goals>
+ <configuration>
+ <installDir>${mvn.lens.install.dir}/client</installDir>
+ <controlDir>${mvn.deb.build.dir}/control/client-control</controlDir>
+ <deb>${project.build.directory}/lens-client_${project.version}.deb</deb>
+ <dataSet>
+ <data>
+ <src>target/lens-dist-${project.version}-bin/client</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>${mvn.lens.install.dir}/client</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>target/lens-dist-${project.version}-bin/client/bin</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>${mvn.lens.install.dir}/client/bin</prefix>
<filemode>755</filemode>
</mapper>
</data>
<data>
- <src>target/lens-dist-${project.version}-server/webapp</src>
+ <src>target/lens-dist-${project.version}-bin/examples</src>
<type>directory</type>
<mapper>
<type>perm</type>
- <prefix>${mvn.lens.webapp.dir}</prefix>
+ <prefix>${mvn.lens.install.dir}/client/examples</prefix>
+ <filemode>644</filemode>
</mapper>
</data>
</dataSet>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/deb/control/client-control/control
----------------------------------------------------------------------
diff --git a/lens-dist/src/deb/control/client-control/control b/lens-dist/src/deb/control/client-control/control
new file mode 100644
index 0000000..51d3c9f
--- /dev/null
+++ b/lens-dist/src/deb/control/client-control/control
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# 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.
+#
+Package: apache-lens-client
+Version: [[project.version]]
+Section: misc
+Priority: high
+Architecture: all
+Depends: sun-java6-jre | java2-runtime
+Maintainer: dev@lens.incubator.apache.org
+Description: Apache Lens Client Distribution
+Distribution: alpha
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/deb/control/control
----------------------------------------------------------------------
diff --git a/lens-dist/src/deb/control/control b/lens-dist/src/deb/control/control
deleted file mode 100644
index 483f888..0000000
--- a/lens-dist/src/deb/control/control
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# 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.
-#
-Package: lens-server
-Version: [[project.version]]
-Section: misc
-Priority: high
-Architecture: all
-Depends: sun-java6-jre | java2-runtime
-Maintainer: Lens dev
-Description: Lens Server
-Distribution: aplha
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/deb/control/postinst
----------------------------------------------------------------------
diff --git a/lens-dist/src/deb/control/postinst b/lens-dist/src/deb/control/postinst
deleted file mode 100644
index 0cd9d57..0000000
--- a/lens-dist/src/deb/control/postinst
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# 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.
-#
-
-# Postinst script for lens
-
-manage_war_expansion () {
-
- # Lens Server war is expanded into lens server directory.
-
- WEB_APP_DIR=${mvn.lens.webapp.dir}
- LENS_SERVER_DIR=${mvn.lens.server.dir}
-
- # 1. Remove lens server directory and its contents
- rm -rf $LENS_SERVER_DIR
-
- # 2. Recreate lens server directory
- mkdir -p $LENS_SERVER_DIR
-
- # 3. Expand the newly installed war in lens server directory
- cd $LENS_SERVER_DIR
- if [ $? -ne 0 ]; then
- echo "Could not change directory to->"$LENS_SERVER_DIR
- return 1
- fi
-
- jar -xf $WEB_APP_DIR/lens-server.war
-
- if [ $? -ne 0 ]; then
- echo "War expansion failed"
- return 1
- fi
-
- cd -
- if [ $? -ne 0 ]; then
- echo "Could not move back from the changed directory"
- return 1
- fi
-
- return 0
-
-}
-
-manage_war_expansion
-
-if [ $? -ne 0 ]; then
- echo "Debian installation unsuccessful"
- exit 1
-fi
-
-exit 0
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/deb/control/server-control/control
----------------------------------------------------------------------
diff --git a/lens-dist/src/deb/control/server-control/control b/lens-dist/src/deb/control/server-control/control
new file mode 100644
index 0000000..b8f7333
--- /dev/null
+++ b/lens-dist/src/deb/control/server-control/control
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# 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.
+#
+Package: apache-lens-server
+Version: [[project.version]]
+Section: misc
+Priority: high
+Architecture: all
+Depends: sun-java6-jre | java2-runtime
+Maintainer: dev@lens.incubator.apache.org
+Description: Apache Lens Server Distribution
+Distribution: alpha
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/deb/control/server-control/postinst
----------------------------------------------------------------------
diff --git a/lens-dist/src/deb/control/server-control/postinst b/lens-dist/src/deb/control/server-control/postinst
new file mode 100644
index 0000000..0cd9d57
--- /dev/null
+++ b/lens-dist/src/deb/control/server-control/postinst
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# 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.
+#
+
+# Postinst script for lens
+
+manage_war_expansion () {
+
+ # Lens Server war is expanded into lens server directory.
+
+ WEB_APP_DIR=${mvn.lens.webapp.dir}
+ LENS_SERVER_DIR=${mvn.lens.server.dir}
+
+ # 1. Remove lens server directory and its contents
+ rm -rf $LENS_SERVER_DIR
+
+ # 2. Recreate lens server directory
+ mkdir -p $LENS_SERVER_DIR
+
+ # 3. Expand the newly installed war in lens server directory
+ cd $LENS_SERVER_DIR
+ if [ $? -ne 0 ]; then
+ echo "Could not change directory to->"$LENS_SERVER_DIR
+ return 1
+ fi
+
+ jar -xf $WEB_APP_DIR/lens-server.war
+
+ if [ $? -ne 0 ]; then
+ echo "War expansion failed"
+ return 1
+ fi
+
+ cd -
+ if [ $? -ne 0 ]; then
+ echo "Could not move back from the changed directory"
+ return 1
+ fi
+
+ return 0
+
+}
+
+manage_war_expansion
+
+if [ $? -ne 0 ]; then
+ echo "Debian installation unsuccessful"
+ exit 1
+fi
+
+exit 0
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/main/assembly/bin-dist.xml
----------------------------------------------------------------------
diff --git a/lens-dist/src/main/assembly/bin-dist.xml b/lens-dist/src/main/assembly/bin-dist.xml
new file mode 100644
index 0000000..2207d4f
--- /dev/null
+++ b/lens-dist/src/main/assembly/bin-dist.xml
@@ -0,0 +1,321 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ 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.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>bin</id>
+
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <baseDirectory>apache-lens</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>server/lib</outputDirectory>
+ <includes>
+ <include>org.apache.lens:lens-driver-jdbc</include>
+ <include>org.apache.lens:lens-storage-db</include>
+ <include>org.hsqldb:hsqldb</include>
+ <include>org.apache.commons:commons-lang</include>
+ </includes>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>client/lib</outputDirectory>
+ <includes>
+ <include>org.apache.lens:lens-api</include>
+ <include>org.apache.lens:lens-cli</include>
+ <include>org.apache.lens:lens-client</include>
+ <include>org.apache.lens:lens-examples</include>
+ <include>org.apache.hadoop:hadoop-common</include>
+ <include>org.glassfish.jersey.core:jersey-client</include>
+ </includes>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.apache.lens:lens-server</include>
+ </includes>
+ <binaries>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+ <fileSet>
+ <directory>../doc/</directory>
+ <outputDirectory>/doc/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>lib/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <fileMode>755</fileMode>
+ <directory>../tools/scripts</directory>
+ <outputDirectory>/server/bin/</outputDirectory>
+ <includes>
+ <include>lens-config.sh</include>
+ <include>lens-ctl</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf/</directory>
+ <outputDirectory>/server/conf/</outputDirectory>
+ <includes>
+ <include>lens-env.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf-pseudo-distr/</directory>
+ <outputDirectory>/server/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>lens-env.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf/server</directory>
+ <outputDirectory>/server/conf/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf-pseudo-distr/server</directory>
+ <outputDirectory>/server/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <fileMode>755</fileMode>
+ <directory>../tools/scripts</directory>
+ <outputDirectory>/client/bin/</outputDirectory>
+ <includes>
+ <include>run-examples.sh</include>
+ <include>lens-config.sh</include>
+ <include>lens-cli.sh</include>
+ <include>lens-cli</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf/</directory>
+ <outputDirectory>/client/conf/</outputDirectory>
+ <includes>
+ <include>lens-env.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf-pseudo-distr/</directory>
+ <outputDirectory>/client/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>lens-env.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/resources</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.sql</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/dim1_local</outputDirectory>
+ <includes>
+ <include>dim1-local.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/dim2_local</outputDirectory>
+ <includes>
+ <include>dim2-local.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/dim4_local</outputDirectory>
+ <includes>
+ <include>dim4-local.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/fact1_local1</outputDirectory>
+ <includes>
+ <include>fact1-local1*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/fact1_local2</outputDirectory>
+ <includes>
+ <include>fact1-local2*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/fact1_local3</outputDirectory>
+ <includes>
+ <include>fact1-local3*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/fact2_local1</outputDirectory>
+ <includes>
+ <include>fact2-local1*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/fact2_local2</outputDirectory>
+ <includes>
+ <include>fact2-local2*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/fact2_local3</outputDirectory>
+ <includes>
+ <include>fact2-local3*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/raw_local1</outputDirectory>
+ <includes>
+ <include>raw-local1*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/raw_local2</outputDirectory>
+ <includes>
+ <include>raw-local2*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/raw_local3</outputDirectory>
+ <includes>
+ <include>raw-local3*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/raw_local4</outputDirectory>
+ <includes>
+ <include>raw-local4*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/raw_local5</outputDirectory>
+ <includes>
+ <include>raw-local5*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/data/raw_local6</outputDirectory>
+ <includes>
+ <include>raw-local6*.data</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../lens-examples/src/main/resources/</directory>
+ <outputDirectory>/examples/queries</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf/client</directory>
+ <outputDirectory>/client/conf/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../tools/conf-pseudo-distr/client</directory>
+ <outputDirectory>/client/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>../lens-server/target/lens-server-${project.version}.war</source>
+ <outputDirectory>/server/webapp/</outputDirectory>
+ <destName>lens-server.war</destName>
+ </file>
+ </files>
+
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/lens-dist/src/main/assembly/server-dist.xml
----------------------------------------------------------------------
diff --git a/lens-dist/src/main/assembly/server-dist.xml b/lens-dist/src/main/assembly/server-dist.xml
deleted file mode 100644
index 50122c4..0000000
--- a/lens-dist/src/main/assembly/server-dist.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- 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.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>server</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <baseDirectory>lens-server-${project.version}</baseDirectory>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.lens:lens-driver-jdbc</include>
- <include>org.apache.lens:lens-storage-db</include>
- </includes>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.apache.lens:lens-server</include>
- </includes>
- <binaries>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-
- <fileSets>
- <fileSet>
- <directory>../doc/</directory>
- <outputDirectory>/doc/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>lib/**</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <fileMode>755</fileMode>
- <directory>../tools/scripts</directory>
- <outputDirectory>/bin/</outputDirectory>
- <includes>
- <include>lens-config.sh</include>
- <include>lens-ctl</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf/</directory>
- <outputDirectory>/conf/</outputDirectory>
- <includes>
- <include>lens-env.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf-pseudo-distr/</directory>
- <outputDirectory>/conf-pseudo-distr/</outputDirectory>
- <includes>
- <include>lens-env.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf/server</directory>
- <outputDirectory>/conf/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../tools/conf-pseudo-distr/server</directory>
- <outputDirectory>/conf-pseudo-distr/</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <files>
- <file>
- <source>../lens-server/target/lens-server-${project.version}.war</source>
- <outputDirectory>/webapp/</outputDirectory>
- <destName>lens-server.war</destName>
- </file>
- </files>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5fcc469e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 048f64d..5a15463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -580,6 +580,47 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-guice</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
@@ -902,7 +943,6 @@
<module>lens-cli</module>
<module>lens-examples</module>
<module>lens-dist</module>
- <module>lens-client-dist</module>
<module>lens-ml-lib</module>
<module>lens-regression</module>
</modules>