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:25 UTC
[01/30] incubator-lens git commit: LENS-32 : Fix cli test failures on
jenkins (amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master 28dacf6b8 -> b10d15be5
LENS-32 : Fix cli test failures on jenkins (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/b82db5a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/b82db5a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/b82db5a7
Branch: refs/heads/master
Commit: b82db5a7f1734ec90b0fc1e2ae9c02d95e5cb54a
Parents: f575be4
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Thu Feb 5 21:00:41 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Thu Feb 5 21:03:55 2015 +0530
----------------------------------------------------------------------
.../test/java/org/apache/lens/cli/TestLensDatabaseCommands.java | 3 +++
.../test/java/org/apache/lens/cli/TestLensStorageCommands.java | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b82db5a7/lens-cli/src/test/java/org/apache/lens/cli/TestLensDatabaseCommands.java
----------------------------------------------------------------------
diff --git a/lens-cli/src/test/java/org/apache/lens/cli/TestLensDatabaseCommands.java b/lens-cli/src/test/java/org/apache/lens/cli/TestLensDatabaseCommands.java
index 3c4ce48..cabe3a5 100644
--- a/lens-cli/src/test/java/org/apache/lens/cli/TestLensDatabaseCommands.java
+++ b/lens-cli/src/test/java/org/apache/lens/cli/TestLensDatabaseCommands.java
@@ -55,6 +55,9 @@ public class TestLensDatabaseCommands extends LensCliApplicationTest {
result = command.switchDatabase(myDatabase);
Assert.assertEquals("Successfully switched to my_db", result);
+ result = command.switchDatabase("default");
+ Assert.assertEquals("Successfully switched to default", result);
+
result = command.dropDatabase(myDatabase);
Assert.assertEquals("drop database my_db successful", result);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b82db5a7/lens-cli/src/test/java/org/apache/lens/cli/TestLensStorageCommands.java
----------------------------------------------------------------------
diff --git a/lens-cli/src/test/java/org/apache/lens/cli/TestLensStorageCommands.java b/lens-cli/src/test/java/org/apache/lens/cli/TestLensStorageCommands.java
index 72ac516..9772849 100644
--- a/lens-cli/src/test/java/org/apache/lens/cli/TestLensStorageCommands.java
+++ b/lens-cli/src/test/java/org/apache/lens/cli/TestLensStorageCommands.java
@@ -105,8 +105,6 @@ public class TestLensStorageCommands extends LensCliApplicationTest {
writer.close();
LOG.debug("Using Storage spec from file : " + newFile.getAbsolutePath());
String storageList = command.getStorages();
- Assert.assertFalse(storageList.contains(storageName), " Storage list contains " + storageName
- + " storage list is " + storageList + " file used is " + newFile.getAbsolutePath());
command.createStorage(newFile.getAbsolutePath());
storageList = command.getStorages();
Assert.assertTrue(storageList.contains(storageName));
[05/30] incubator-lens git commit: LENS-278. Lens Server not able to
persist on HDFS ( Amareshwari Sriramadasu via sumasai)
Posted by am...@apache.org.
LENS-278. Lens Server not able to persist on HDFS ( Amareshwari Sriramadasu via sumasai)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/0d8a841b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/0d8a841b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/0d8a841b
Branch: refs/heads/master
Commit: 0d8a841be344eabd1690821bc1fab856a03e1621
Parents: 960ee0e
Author: suma.shivaprasad <su...@inmobi.com>
Authored: Fri Feb 6 19:00:23 2015 +0530
Committer: suma.shivaprasad <su...@inmobi.com>
Committed: Fri Feb 6 19:03:24 2015 +0530
----------------------------------------------------------------------
.../org/apache/lens/server/LensServices.java | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/0d8a841b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServices.java b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
index e30335c..9684734 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensServices.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
@@ -291,9 +291,10 @@ public class LensServices extends CompositeService implements ServiceProvider {
if (persistDir != null) {
LOG.info("Persisting server state in " + persistDir);
+ long now = System.currentTimeMillis();
for (LensService service : lensServices) {
LOG.info("Persisting state of service:" + service.getName());
- Path serviceWritePath = new Path(persistDir, service.getName() + ".out");
+ Path serviceWritePath = new Path(persistDir, service.getName() + ".out" + "." + now);
ObjectOutputStream out = null;
try {
out = new ObjectOutputStream(persistenceFS.create(serviceWritePath));
@@ -304,12 +305,21 @@ public class LensServices extends CompositeService implements ServiceProvider {
}
}
Path servicePath = getServicePersistPath(service);
- persistenceFS.rename(serviceWritePath, servicePath);
- LOG.info("Persisted service " + service.getName() + " to " + servicePath);
+ if (persistenceFS.exists(servicePath)) {
+ // delete the destination first, because rename is no-op in HDFS, if destination exists
+ if (!persistenceFS.delete(servicePath, true)) {
+ LOG.error("Failed to delete [" + servicePath + "]");
+ }
+ }
+ if (!persistenceFS.rename(serviceWritePath, servicePath)) {
+ LOG.error("Failed to persist " + service.getName() + " to [" + servicePath + "]");
+ } else {
+ LOG.info("Persisted service " + service.getName() + " to [" + servicePath + "]");
+ }
}
+ } else {
+ LOG.info("Server restart is not enabled. Not persisting the server state");
}
- } else {
- LOG.info("Server restart is not enabled. Not persisting the server state");
}
}
}
[06/30] incubator-lens git commit: LENS-276 : Add dependency required
for json response (Raju Bairishetti via amareshwari)
Posted by am...@apache.org.
LENS-276 : Add dependency required for json response (Raju Bairishetti via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/bba81774
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/bba81774
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/bba81774
Branch: refs/heads/master
Commit: bba817742e926bf3c7d76ecbfc2ff3d49491df0e
Parents: 0d8a841
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Mon Feb 9 10:14:40 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Mon Feb 9 10:15:11 2015 +0530
----------------------------------------------------------------------
lens-server/pom.xml | 4 +
.../src/main/webapp/static/js/models/session.js | 3 +
.../lens/server/ui/TestSessionUIResource.java | 136 +++++++++++++++++++
pom.xml | 5 +
4 files changed, 148 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/bba81774/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 60387e6..2cb8a6f 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -116,6 +116,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ </dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/bba81774/lens-server/src/main/webapp/static/js/models/session.js
----------------------------------------------------------------------
diff --git a/lens-server/src/main/webapp/static/js/models/session.js b/lens-server/src/main/webapp/static/js/models/session.js
index 0fac8ec..5f916b7 100644
--- a/lens-server/src/main/webapp/static/js/models/session.js
+++ b/lens-server/src/main/webapp/static/js/models/session.js
@@ -49,6 +49,9 @@ var Session = function() {
url: util.SESSION_URL,
type: 'POST',
dataType: 'json',
+ headers: {
+ Accept : "application/json",
+ },
contentType: false,
processData: false,
cache: false,
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/bba81774/lens-server/src/test/java/org/apache/lens/server/ui/TestSessionUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/ui/TestSessionUIResource.java b/lens-server/src/test/java/org/apache/lens/server/ui/TestSessionUIResource.java
new file mode 100644
index 0000000..02a6515
--- /dev/null
+++ b/lens-server/src/test/java/org/apache/lens/server/ui/TestSessionUIResource.java
@@ -0,0 +1,136 @@
+/**
+ * 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 org.apache.lens.server.ui;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.lens.api.LensConf;
+import org.apache.lens.api.LensSessionHandle;
+import org.apache.lens.server.LensJerseyTest;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+/**
+ * The Class TestSessionUIResource.
+ */
+@Test(groups = "unit-test")
+public class TestSessionUIResource extends LensJerseyTest {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.glassfish.jersey.test.JerseyTest#setUp()
+ */
+ @BeforeTest
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.glassfish.jersey.test.JerseyTest#tearDown()
+ */
+ @AfterTest
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.glassfish.jersey.test.JerseyTest#configure()
+ */
+ @Override
+ protected Application configure() {
+ return new UIApp();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.glassfish.jersey.test.JerseyTest#configureClient(org.glassfish.jersey.client.ClientConfig)
+ */
+ @Override
+ protected void configureClient(ClientConfig config) {
+ config.register(MultiPartFeature.class);
+ }
+
+ private FormDataMultiPart getMultiFormData(String username, String password) {
+ final FormDataMultiPart mp = new FormDataMultiPart();
+
+ mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("username").build(), username));
+ mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("password").build(), password));
+ mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("sessionconf").fileName("sessionconf").build(),
+ new LensConf(), MediaType.APPLICATION_XML_TYPE));
+ return mp;
+ }
+
+ /**
+ * Test ui session
+ */
+ @Test
+ public void testUISession() {
+ final WebTarget target = target().path("uisession");
+ FormDataMultiPart mp = getMultiFormData("foo", "bar");
+
+ LensSessionHandle lensSessionHandle = target.request().post(
+ Entity.entity(mp, MediaType.MULTIPART_FORM_DATA_TYPE), LensSessionHandle.class);
+ Assert.assertTrue(lensSessionHandle != null);
+
+ Response deleteResponse = target.path(lensSessionHandle.getPublicId().toString()).request().delete();
+ Assert.assertEquals(deleteResponse.getStatus(), 200);
+ }
+
+ @Test
+ public void testJsonResponsesFromServer() {
+ final WebTarget target = target().path("uisession");
+ FormDataMultiPart mp = getMultiFormData("foo", "bar");
+
+ Response response = target.request().accept(MediaType.APPLICATION_JSON).
+ post(Entity.entity(mp, MediaType.MULTIPART_FORM_DATA_TYPE));
+ Assert.assertEquals(response.getStatus(), 200);
+ Assert.assertEquals(response.getMediaType().toString(), "application/json");
+ }
+
+ @Test
+ public void testXMLResponsesFromServer() {
+ final WebTarget target = target().path("uisession");
+ FormDataMultiPart mp = getMultiFormData("foo", "bar");
+
+ Response response = target.request().accept(MediaType.APPLICATION_XML).
+ post(Entity.entity(mp, MediaType.MULTIPART_FORM_DATA_TYPE));
+ Assert.assertEquals(response.getStatus(), 200);
+ Assert.assertEquals(response.getMediaType().toString(), "application/xml");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/bba81774/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d7ed545..048f64d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -742,6 +742,11 @@
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
[02/30] incubator-lens git commit: LENS-273 : Changes locking for
persisting server state and makes buffer size of persist out to be
configurable (Himanshu Gahlaut via amareshwari)
Posted by am...@apache.org.
LENS-273 : Changes locking for persisting server state and makes buffer size of persist out to be configurable (Himanshu Gahlaut via amareshwari)
Conflicts:
lens-server/src/main/java/org/apache/lens/server/LensServices.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/77cea318
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/77cea318
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/77cea318
Branch: refs/heads/master
Commit: 77cea318b21b771d972f9ea61ecaab309cd48ec2
Parents: b82db5a
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Fri Feb 6 17:53:36 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Fri Feb 6 17:59:21 2015 +0530
----------------------------------------------------------------------
.../lens/server/api/LensConfConstants.java | 10 +++
.../org/apache/lens/server/LensServices.java | 88 ++++++++++++--------
.../src/main/resources/lensserver-default.xml | 6 ++
src/site/apt/admin/config.apt | 56 +++++++------
4 files changed, 96 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/77cea318/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java b/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
index 0ae539e..b4cef60 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
@@ -763,4 +763,14 @@ public final class LensConfConstants {
* The Constant SERVICE_PROVIDER_FACTORY.
*/
public static final String SERVICE_PROVIDER_FACTORY = SERVER_PFX + "service.provider.factory";
+
+ /**
+ * Key for reading Output Stream Buffer Size used in writing lens server state to file system
+ */
+ public static final String STATE_PERSIST_OUT_STREAM_BUFF_SIZE = SERVER_PFX + "state.persist.out.stream.buffer.size";
+
+ /**
+ * Default Output Stream Buffer Size used in writing lens server state to file system: 1MB
+ */
+ public static final int DEFAULT_STATE_PERSIST_OUT_STREAM_BUFF_SIZE = 1048576;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/77cea318/lens-server/src/main/java/org/apache/lens/server/LensServices.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServices.java b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
index 96158dd..e30335c 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensServices.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
@@ -18,6 +18,8 @@
*/
package org.apache.lens.server;
+import static org.apache.lens.server.api.LensConfConstants.*;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -28,6 +30,13 @@ import java.util.*;
import lombok.Getter;
import lombok.Setter;
+import org.apache.lens.server.api.ServiceProvider;
+import org.apache.lens.server.api.events.LensEventService;
+import org.apache.lens.server.api.metrics.MetricsService;
+import org.apache.lens.server.session.LensSessionImpl;
+import org.apache.lens.server.stats.StatisticsService;
+import org.apache.lens.server.user.UserConfigLoaderFactory;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,13 +47,6 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hive.service.CompositeService;
import org.apache.hive.service.Service;
import org.apache.hive.service.cli.CLIService;
-import org.apache.lens.server.api.LensConfConstants;
-import org.apache.lens.server.api.ServiceProvider;
-import org.apache.lens.server.api.events.LensEventService;
-import org.apache.lens.server.api.metrics.MetricsService;
-import org.apache.lens.server.session.LensSessionImpl;
-import org.apache.lens.server.stats.StatisticsService;
-import org.apache.lens.server.user.UserConfigLoaderFactory;
/**
* Manage lifecycle of all Lens services
@@ -59,6 +61,7 @@ public class LensServices extends CompositeService implements ServiceProvider {
/** Constant for FileSystem auto close on shutdown config */
private static final String FS_AUTOMATIC_CLOSE = "fs.automatic.close";
+ private static final String FS_IO_FILE_BUFFER_SIZE = "io.file.buffer.size";
/** The instance. */
private static LensServices INSTANCE = new LensServices(LENS_SERVICES_NAME);
@@ -95,6 +98,9 @@ public class LensServices extends CompositeService implements ServiceProvider {
/** The timer. */
private Timer timer;
+ /* Lock for synchronizing persistence of LensServices state */
+ private final Object statePersistenceLock = new Object();
+
/**
* The Enum SERVICE_MODE.
*/
@@ -139,8 +145,8 @@ public class LensServices extends CompositeService implements ServiceProvider {
conf.addResource("lensserver-default.xml");
conf.addResource("lens-site.xml");
conf.setVar(HiveConf.ConfVars.HIVE_SESSION_IMPL_CLASSNAME, LensSessionImpl.class.getCanonicalName());
- serviceMode = conf.getEnum(LensConfConstants.SERVER_MODE,
- SERVICE_MODE.valueOf(LensConfConstants.DEFAULT_SERVER_MODE));
+ serviceMode = conf.getEnum(SERVER_MODE,
+ SERVICE_MODE.valueOf(DEFAULT_SERVER_MODE));
cliService = new CLIService();
// Add default services
@@ -151,11 +157,11 @@ public class LensServices extends CompositeService implements ServiceProvider {
// Add configured services, these are instances of LensService which need a CLIService instance
// for session management
- String[] serviceNames = conf.getStrings(LensConfConstants.SERVICE_NAMES);
+ String[] serviceNames = conf.getStrings(SERVICE_NAMES);
for (String sName : serviceNames) {
try {
- String serviceClassName = conf.get(LensConfConstants.getServiceImplConfKey(sName));
+ String serviceClassName = conf.get(getServiceImplConfKey(sName));
if (StringUtils.isBlank(serviceClassName)) {
LOG.warn("Invalid class for service " + sName + " class=" + serviceClassName);
@@ -193,20 +199,25 @@ public class LensServices extends CompositeService implements ServiceProvider {
super.init(conf);
// setup persisted state
- String persistPathStr = conf.get(LensConfConstants.SERVER_STATE_PERSIST_LOCATION,
- LensConfConstants.DEFAULT_SERVER_STATE_PERSIST_LOCATION);
+ String persistPathStr = conf.get(SERVER_STATE_PERSIST_LOCATION,
+ DEFAULT_SERVER_STATE_PERSIST_LOCATION);
persistDir = new Path(persistPathStr);
try {
Configuration configuration = new Configuration(conf);
configuration.setBoolean(FS_AUTOMATIC_CLOSE, false);
+
+ int outStreamBufferSize = conf.getInt(STATE_PERSIST_OUT_STREAM_BUFF_SIZE,
+ DEFAULT_STATE_PERSIST_OUT_STREAM_BUFF_SIZE);
+ configuration.setInt(FS_IO_FILE_BUFFER_SIZE, outStreamBufferSize);
+ LOG.info("STATE_PERSIST_OUT_STREAM_BUFF_SIZE IN BYTES:"+outStreamBufferSize);
persistenceFS = FileSystem.newInstance(persistDir.toUri(), configuration);
setupPersistedState();
} catch (Exception e) {
LOG.error("Could not recover from persisted state", e);
throw new RuntimeException("Could not recover from persisted state", e);
}
- snapShotInterval = conf.getLong(LensConfConstants.SERVER_SNAPSHOT_INTERVAL,
- LensConfConstants.DEFAULT_SERVER_SNAPSHOT_INTERVAL);
+ snapShotInterval = conf.getLong(SERVER_SNAPSHOT_INTERVAL,
+ DEFAULT_SERVER_SNAPSHOT_INTERVAL);
LOG.info("Initialized services: " + services.keySet().toString());
UserConfigLoaderFactory.init(conf);
timer = new Timer("lens-server-snapshotter", true);
@@ -244,8 +255,8 @@ public class LensServices extends CompositeService implements ServiceProvider {
* the class not found exception
*/
private void setupPersistedState() throws IOException, ClassNotFoundException {
- if (conf.getBoolean(LensConfConstants.SERVER_RECOVER_ON_RESTART,
- LensConfConstants.DEFAULT_SERVER_RECOVER_ON_RESTART)) {
+ if (conf.getBoolean(SERVER_RECOVER_ON_RESTART,
+ DEFAULT_SERVER_RECOVER_ON_RESTART)) {
for (LensService service : lensServices) {
ObjectInputStream in = null;
@@ -273,30 +284,33 @@ public class LensServices extends CompositeService implements ServiceProvider {
* @throws IOException
* Signals that an I/O exception has occurred.
*/
- private synchronized void persistLensServiceState() throws IOException {
- if (conf.getBoolean(LensConfConstants.SERVER_RESTART_ENABLED, LensConfConstants.DEFAULT_SERVER_RESTART_ENABLED)) {
- if (persistDir != null) {
- LOG.info("Persisting server state in " + persistDir);
-
- for (LensService service : lensServices) {
- LOG.info("Persisting state of service:" + service.getName());
- Path serviceWritePath = new Path(persistDir, service.getName() + ".out");
- ObjectOutputStream out = null;
- try {
- out = new ObjectOutputStream(persistenceFS.create(serviceWritePath));
- service.writeExternal(out);
- } finally {
- if (out != null) {
- out.close();
+ private void persistLensServiceState() throws IOException {
+
+ synchronized (statePersistenceLock) {
+ if (conf.getBoolean(SERVER_RESTART_ENABLED, DEFAULT_SERVER_RESTART_ENABLED)) {
+ if (persistDir != null) {
+ LOG.info("Persisting server state in " + persistDir);
+
+ for (LensService service : lensServices) {
+ LOG.info("Persisting state of service:" + service.getName());
+ Path serviceWritePath = new Path(persistDir, service.getName() + ".out");
+ ObjectOutputStream out = null;
+ try {
+ out = new ObjectOutputStream(persistenceFS.create(serviceWritePath));
+ service.writeExternal(out);
+ } finally {
+ if (out != null) {
+ out.close();
+ }
}
+ Path servicePath = getServicePersistPath(service);
+ persistenceFS.rename(serviceWritePath, servicePath);
+ LOG.info("Persisted service " + service.getName() + " to " + servicePath);
}
- Path servicePath = getServicePersistPath(service);
- persistenceFS.rename(serviceWritePath, servicePath);
- LOG.info("Persisted service " + service.getName() + " to " + servicePath);
}
+ } else {
+ LOG.info("Server restart is not enabled. Not persisting the server state");
}
- } else {
- LOG.info("Server restart is not enabled. Not persisting the server state");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/77cea318/lens-server/src/main/resources/lensserver-default.xml
----------------------------------------------------------------------
diff --git a/lens-server/src/main/resources/lensserver-default.xml b/lens-server/src/main/resources/lensserver-default.xml
index e983c7e..e9a0a94 100644
--- a/lens-server/src/main/resources/lensserver-default.xml
+++ b/lens-server/src/main/resources/lensserver-default.xml
@@ -556,4 +556,10 @@
This is not supposed to be overridden by users.</description>
</property>
+ <property>
+ <name>lens.server.state.persist.out.stream.buffer.size</name>
+ <value>1048576</value>
+ <description>Output Stream Buffer Size used in writing lens server state to file system. Size is in bytes.</description>
+ </property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/77cea318/src/site/apt/admin/config.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/config.apt b/src/site/apt/admin/config.apt
index 7c41e08..c5f3b2f 100644
--- a/src/site/apt/admin/config.apt
+++ b/src/site/apt/admin/config.apt
@@ -114,7 +114,7 @@ Lens server configuration
*--+--+---+--+
|45|lens.server.serverMode.ws.filter.impl|org.apache.lens.server.ServerModeFilter|Implementation class for ServerMode Filter|
*--+--+---+--+
-|46|lens.server.service.provider.factory|org.apache.lens.server.ServiceProviderFactoryImpl|Service provider factory implementation class. This parameter is used to lookup the factory implementation class name that would provide an instance of ServiceProvider. Users should instantiate the class to obtain its instance. Example -- Class spfClass = conf.getClass("lens.server.service.provider.factory", null, ServiceProviderFactory.class); ServiceProviderFactory spf = spfClass.newInstance(); ServiceProvider serviceProvider = spf.getServiceProvider(); -- This is not supposed to be overridden by users.|
+|46|lens.server.service.provider.factory|org.apache.lens.server.ServiceProviderFactoryImpl|Service provider factory implementation class. This parameter is used to lookup the factory implementation class name that would provide an instance of ServiceProvider. Users should instantiate the class to obtain its instance. Example -- Class spfClass = conf.getClass("lens.server.service.provider.factory", null, ServiceProviderFactory.class); ServiceProviderFactory spf = spfClass.newInstance(); ServiceProvider serviceProvider = spf.getServiceProvider(); -- This is not supposed to be overridden by users.|
*--+--+---+--+
|47|lens.server.servicenames|session,query,metastore,scheduler,quota|These services would be started in the specified order when lens-server starts up|
*--+--+---+--+
@@ -126,56 +126,58 @@ Lens server configuration
*--+--+---+--+
|51|lens.server.snapshot.interval|300000|Snapshot interval time in miliseconds for saving lens server state.|
*--+--+---+--+
-|52|lens.server.statistics.db|lensstats|Database to which statistics tables are created and partitions are added.|
+|52|lens.server.state.persist.out.stream.buffer.size|1048576|Output Stream Buffer Size used in writing lens server state to file system. Size is in bytes.|
*--+--+---+--+
-|53|lens.server.statistics.log.rollover.interval|3600000|Default rate which log statistics store scans for rollups in milliseconds.|
+|53|lens.server.statistics.db|lensstats|Database to which statistics tables are created and partitions are added.|
*--+--+---+--+
-|54|lens.server.statistics.store.class|org.apache.lens.server.stats.store.log.LogStatisticsStore|Default implementation of class used to persist Lens Statistics.|
+|54|lens.server.statistics.log.rollover.interval|3600000|Default rate which log statistics store scans for rollups in milliseconds.|
*--+--+---+--+
-|55|lens.server.statistics.warehouse.dir|file:///tmp/lens/statistics/warehouse|Default top level location where stats are moved by the log statistics store.|
+|55|lens.server.statistics.store.class|org.apache.lens.server.stats.store.log.LogStatisticsStore|Default implementation of class used to persist Lens Statistics.|
*--+--+---+--+
-|56|lens.server.ui.base.uri|http://0.0.0.0:19999/|The base url for the Lens UI Server|
+|56|lens.server.statistics.warehouse.dir|file:///tmp/lens/statistics/warehouse|Default top level location where stats are moved by the log statistics store.|
*--+--+---+--+
-|57|lens.server.ui.enable.caching|true|Set this to false to disable static file caching in the UI server|
+|57|lens.server.ui.base.uri|http://0.0.0.0:19999/|The base url for the Lens UI Server|
*--+--+---+--+
-|58|lens.server.ui.static.dir|webapp/lens-server/static|The base directory to server UI static files from|
+|58|lens.server.ui.enable.caching|true|Set this to false to disable static file caching in the UI server|
*--+--+---+--+
-|59|lens.server.user.resolver.custom.class|full.package.name.Classname|Required for CUSTOM user resolver. In case the provided implementations are not sufficient for user config resolver, a custom classname can be provided. Class should extend org.apache.lens.server.user.UserConfigLoader|
+|59|lens.server.ui.static.dir|webapp/lens-server/static|The base directory to server UI static files from|
*--+--+---+--+
-|60|lens.server.user.resolver.db.keys|lens.session.cluster.user,mapred.job.queue.name|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loaders, the conf keys that will be loaded from database.|
+|60|lens.server.user.resolver.custom.class|full.package.name.Classname|Required for CUSTOM user resolver. In case the provided implementations are not sufficient for user config resolver, a custom classname can be provided. Class should extend org.apache.lens.server.user.UserConfigLoader|
*--+--+---+--+
-|61|lens.server.user.resolver.db.query|select clusteruser,queue from user_config_table where username=?|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loader, this query will be run with single argument = logged in user and the result columns will be assigned to lens.server.user.resolver.db.keys in order. For ldap backed database resolver, the argument to this query will be the intermediate values obtained from ldap.|
+|61|lens.server.user.resolver.db.keys|lens.session.cluster.user,mapred.job.queue.name|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loaders, the conf keys that will be loaded from database.|
*--+--+---+--+
-|62|lens.server.user.resolver.fixed.value| |Required for FIXED user resolver. when lens.server.user.resolver.type=FIXED, This will be the value cluster user will resolve to.|
+|62|lens.server.user.resolver.db.query|select clusteruser,queue from user_config_table where username=?|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loader, this query will be run with single argument = logged in user and the result columns will be assigned to lens.server.user.resolver.db.keys in order. For ldap backed database resolver, the argument to this query will be the intermediate values obtained from ldap.|
*--+--+---+--+
-|63|lens.server.user.resolver.ldap.bind.dn| |Required for LDAP_BACKED_DATABASE user resolvers. ldap dn for admin binding example: CN=company-it-admin,ou=service-account,ou=company-service-account,dc=dc1,dc=com...|
+|63|lens.server.user.resolver.fixed.value| |Required for FIXED user resolver. when lens.server.user.resolver.type=FIXED, This will be the value cluster user will resolve to.|
*--+--+---+--+
-|64|lens.server.user.resolver.ldap.bind.password| |Required for LDAP_BACKED_DATABASE user resolvers. ldap password for admin binding above|
+|64|lens.server.user.resolver.ldap.bind.dn| |Required for LDAP_BACKED_DATABASE user resolvers. ldap dn for admin binding example: CN=company-it-admin,ou=service-account,ou=company-service-account,dc=dc1,dc=com...|
*--+--+---+--+
-|65|lens.server.user.resolver.ldap.fields|department|Required for LDAP_BACKED_DATABASE user resolvers. list of fields to be obtained from ldap. These will be cached by the intermediate db.|
+|65|lens.server.user.resolver.ldap.bind.password| |Required for LDAP_BACKED_DATABASE user resolvers. ldap password for admin binding above|
*--+--+---+--+
-|66|lens.server.user.resolver.ldap.intermediate.db.delete.sql|delete from user_department where username=?|Required for LDAP_BACKED_DATABASE user resolvers. query to delete intermediate values from database backing ldap as cache. one argument: logged in user.|
+|66|lens.server.user.resolver.ldap.fields|department|Required for LDAP_BACKED_DATABASE user resolvers. list of fields to be obtained from ldap. These will be cached by the intermediate db.|
*--+--+---+--+
-|67|lens.server.user.resolver.ldap.intermediate.db.insert.sql|insert into user_department (username, department, expiry) values (?, ?, ?)|Required for LDAP_BACKED_DATABASE user resolvers. query to insert intermediate values from database backing ldap as cache. arguments: first logged in user, then all intermediate values, then current time + expiration time|
+|67|lens.server.user.resolver.ldap.intermediate.db.delete.sql|delete from user_department where username=?|Required for LDAP_BACKED_DATABASE user resolvers. query to delete intermediate values from database backing ldap as cache. one argument: logged in user.|
*--+--+---+--+
-|68|lens.server.user.resolver.ldap.intermediate.db.query|select department from user_department where username=? and expiry>?|Required for LDAP_BACKED_DATABASE user resolvers. query to obtain intermediate values from database backing ldap as cache. two arguments: logged in user and current time.|
+|68|lens.server.user.resolver.ldap.intermediate.db.insert.sql|insert into user_department (username, department, expiry) values (?, ?, ?)|Required for LDAP_BACKED_DATABASE user resolvers. query to insert intermediate values from database backing ldap as cache. arguments: first logged in user, then all intermediate values, then current time + expiration time|
*--+--+---+--+
-|69|lens.server.user.resolver.ldap.search.base| |Required for LDAP_BACKED_DATABASE user resolvers. for searching intermediate values for a user, the search keys. example: cn=users,dc=dc1,dc=dc2...|
+|69|lens.server.user.resolver.ldap.intermediate.db.query|select department from user_department where username=? and expiry>?|Required for LDAP_BACKED_DATABASE user resolvers. query to obtain intermediate values from database backing ldap as cache. two arguments: logged in user and current time.|
*--+--+---+--+
-|70|lens.server.user.resolver.ldap.search.filter|(&(objectClass=user)(sAMAccountName=%s))|Required for LDAP_BACKED_DATABASE user resolvers. filter pattern for ldap search|
+|70|lens.server.user.resolver.ldap.search.base| |Required for LDAP_BACKED_DATABASE user resolvers. for searching intermediate values for a user, the search keys. example: cn=users,dc=dc1,dc=dc2...|
*--+--+---+--+
-|71|lens.server.user.resolver.ldap.url| |Required for LDAP_BACKED_DATABASE user resolvers. ldap url to connect to.|
+|71|lens.server.user.resolver.ldap.search.filter|(&(objectClass=user)(sAMAccountName=%s))|Required for LDAP_BACKED_DATABASE user resolvers. filter pattern for ldap search|
*--+--+---+--+
-|72|lens.server.user.resolver.propertybased.filename|/path/to/propertyfile|Required for PROPERTYBASED user resolver. when lens.server.user.resolver.type is PROPERTYBASED, then this file will be read and parsed to determine cluster user. Each line should contain username followed by DOT followed by property full name followed by equal-to sign and followed by value. example schema of the file is: user1.lens.server.cluster.user=clusteruser1 user1.mapred.job.queue.name=queue1 *.lens.server.cluster.user=defaultclusteruser *.mapred.job.queue.name=default|
+|72|lens.server.user.resolver.ldap.url| |Required for LDAP_BACKED_DATABASE user resolvers. ldap url to connect to.|
*--+--+---+--+
-|73|lens.server.user.resolver.type|FIXED|Type of user config resolver. allowed values are FIXED, PROPERTYBASED, DATABASE, LDAP_BACKED_DATABASE, CUSTOM.|
+|73|lens.server.user.resolver.propertybased.filename|/path/to/propertyfile|Required for PROPERTYBASED user resolver. when lens.server.user.resolver.type is PROPERTYBASED, then this file will be read and parsed to determine cluster user. Each line should contain username followed by DOT followed by property full name followed by equal-to sign and followed by value. example schema of the file is: user1.lens.server.cluster.user=clusteruser1 user1.mapred.job.queue.name=queue1 *.lens.server.cluster.user=defaultclusteruser *.mapred.job.queue.name=default|
*--+--+---+--+
-|74|lens.server.ws.featurenames|multipart|These JAX-RS Feature(s) would be started in the specified order when lens-server starts up|
+|74|lens.server.user.resolver.type|FIXED|Type of user config resolver. allowed values are FIXED, PROPERTYBASED, DATABASE, LDAP_BACKED_DATABASE, CUSTOM.|
*--+--+---+--+
-|75|lens.server.ws.filternames|authentication,consistentState,serverMode|These JAX-RS filters would be started in the specified order when lens-server starts up|
+|75|lens.server.ws.featurenames|multipart|These JAX-RS Feature(s) would be started in the specified order when lens-server starts up|
*--+--+---+--+
-|76|lens.server.ws.listenernames|appevent|These listeners would be called in the specified order when lens-server starts up|
+|76|lens.server.ws.filternames|authentication,consistentState,serverMode|These JAX-RS filters would be started in the specified order when lens-server starts up|
*--+--+---+--+
-|77|lens.server.ws.resourcenames|session,metastore,query,quota,scheduler,index|These JAX-RS resources would be started in the specified order when lens-server starts up|
+|77|lens.server.ws.listenernames|appevent|These listeners would be called in the specified order when lens-server starts up|
+*--+--+---+--+
+|78|lens.server.ws.resourcenames|session,metastore,query,quota,scheduler,index|These JAX-RS resources would be started in the specified order when lens-server starts up|
*--+--+---+--+
The configuration parameters and their default values
[08/30] incubator-lens git commit: LENS-287: Fixes the exception that
was coming while describing cube(Amareshwari Sriramadasu via prongs)
Posted by am...@apache.org.
LENS-287: Fixes the exception that was coming while describing cube(Amareshwari Sriramadasu via prongs)
Conflicts:
lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/d27bf4ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/d27bf4ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/d27bf4ca
Branch: refs/heads/master
Commit: d27bf4ca31d30965223693b0866eee7024f70c5e
Parents: 1670cc1
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Wed Feb 11 11:32:25 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Wed Feb 11 11:46:00 2015 +0530
----------------------------------------------------------------------
lens-api/src/main/resources/cube-0.1.xsd | 62 +++++++--------
.../apache/lens/server/metastore/JAXBUtils.java | 67 ++++++++--------
.../server/metastore/TestMetastoreService.java | 81 +++++++++++---------
3 files changed, 107 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d27bf4ca/lens-api/src/main/resources/cube-0.1.xsd
----------------------------------------------------------------------
diff --git a/lens-api/src/main/resources/cube-0.1.xsd b/lens-api/src/main/resources/cube-0.1.xsd
index 568d1c9..6336b9e 100644
--- a/lens-api/src/main/resources/cube-0.1.xsd
+++ b/lens-api/src/main/resources/cube-0.1.xsd
@@ -249,13 +249,14 @@
</xs:documentation>
</xs:annotation>
<xs:attribute type="xs:string" name="name" use="required" />
- <xs:attribute type="x_column_type" name="type" use="required">
+ <xs:attribute type="xs:string" name="type" use="required">
<xs:annotation>
<xs:documentation>
- The type indicating what the evaluation of expression will produce. Allowed types are BOOLEAN,
- TINYINT,
- SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, DATE, TIMESTAMP, BINARY, ARRAY,
- MAP, STRUCT
+ The type indicating what the evaluation of expression will produce. Allowed types are BOOLEAN, TINYINT,
+ SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, DATE, TIMESTAMP, BINARY, ARRAY, MAP,
+ STRUCT, UNION
+ See hive represenation for specifying complex types -
+ https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types#LanguageManualTypes-ComplexTypes
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -317,7 +318,17 @@
</xs:element>
</xs:sequence>
<xs:attribute type="xs:string" name="name" use="required" />
- <xs:attribute type="x_column_type" name="type" use="required" />
+ <xs:attribute type="xs:string" name="type" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ The type indicating what the evaluation of expression will produce. Allowed types are BOOLEAN,TINYINT,
+ SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, DATE, TIMESTAMP, BINARY, ARRAY, MAP,
+ STRUCT, UNION
+ See hive represenation for specifying complex types -
+ https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types#LanguageManualTypes-ComplexTypes
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute type="xs:string" name="description" />
<xs:attribute type="xs:string" name="display_string">
<xs:annotation>
@@ -557,37 +568,20 @@
</xs:documentation>
</xs:annotation>
<xs:attribute name="name" type="xs:string" use="required" />
- <xs:attribute name="type" type="x_column_type" use="required" />
+ <xs:attribute type="xs:string" name="type" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ The type indicating what the evaluation of expression will produce. Allowed types are BOOLEAN, TINYINT,
+ SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, DATE, TIMESTAMP, BINARY, ARRAY, MAP,
+ STRUCT, UNION
+ See hive represenation for specifying complex types -
+ https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types#LanguageManualTypes-ComplexTypes
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="comment" type="xs:string" />
</xs:complexType>
- <xs:simpleType name="x_column_type">
- <xs:annotation>
- <xs:documentation>
- Column Types allowed.
- </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="BOOLEAN" />
- <xs:enumeration value="TINYINT" />
- <xs:enumeration value="SMALLINT" />
- <xs:enumeration value="INT" />
- <xs:enumeration value="BIGINT" />
- <xs:enumeration value="FLOAT" />
- <xs:enumeration value="DOUBLE" />
- <xs:enumeration value="DECIMAL" />
- <xs:enumeration value="STRING" />
- <xs:enumeration value="CHAR" />
- <xs:enumeration value="VARCHAR" />
- <xs:enumeration value="DATE" />
- <xs:enumeration value="TIMESTAMP" />
- <xs:enumeration value="BINARY" />
- <xs:enumeration value="ARRAY" />
- <xs:enumeration value="MAP" />
- <xs:enumeration value="STRUCT" />
- </xs:restriction>
- </xs:simpleType>
-
<xs:simpleType name="x_measure_type">
<xs:annotation>
<xs:documentation>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d27bf4ca/lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java b/lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
index 329d899..7357d0c 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
@@ -165,33 +165,32 @@ public class JAXBUtils {
for (XTableReference xRef : xd.getRefSpec().getTableReferences().getTableReference()) {
dimRefs.add(new TableReference(xRef.getTable(), xRef.getColumn()));
}
-
- hiveDim = new ReferencedDimAtrribute(new FieldSchema(xd.getName(), xd.getType().name().toLowerCase(),
- xd.getDescription()),
- xd.getDisplayString(),
- dimRefs,
- startDate,
- endDate,
- null
- );
+ hiveDim = new ReferencedDimAtrribute(new FieldSchema(xd.getName(), xd.getType().toLowerCase(),
+ xd.getDescription()),
+ xd.getDisplayString(),
+ dimRefs,
+ startDate,
+ endDate,
+ null
+ );
} else if (xd.getRefSpec() != null && xd.getRefSpec().getChainRefColumn() != null) {
- hiveDim = new ReferencedDimAtrribute(new FieldSchema(xd.getName(), xd.getType().name().toLowerCase(),
- xd.getDescription()),
- xd.getDisplayString(),
- xd.getRefSpec().getChainRefColumn().getChainName(),
- xd.getRefSpec().getChainRefColumn().getRefCol(),
- startDate,
- endDate,
- null
- );
+ hiveDim = new ReferencedDimAtrribute(new FieldSchema(xd.getName(), xd.getType().toLowerCase(),
+ xd.getDescription()),
+ xd.getDisplayString(),
+ xd.getRefSpec().getChainRefColumn().getChainName(),
+ xd.getRefSpec().getChainRefColumn().getRefCol(),
+ startDate,
+ endDate,
+ null
+ );
} else {
- hiveDim = new BaseDimAttribute(new FieldSchema(xd.getName(), xd.getType().name().toLowerCase(),
- xd.getDescription()),
- xd.getDisplayString(),
- startDate,
- endDate,
- null
- );
+ hiveDim = new BaseDimAttribute(new FieldSchema(xd.getName(), xd.getType().toLowerCase(),
+ xd.getDescription()),
+ xd.getDisplayString(),
+ startDate,
+ endDate,
+ null
+ );
}
return hiveDim;
@@ -252,7 +251,7 @@ public class JAXBUtils {
XExprColumn xe = XCF.createXExprColumn();
xe.setName(ec.getName());
- xe.setType(XColumnType.valueOf(ec.getType().toUpperCase()));
+ xe.setType(ec.getType());
xe.setDescription(ec.getDescription());
xe.setDisplayString(ec.getDisplayString());
xe.setExpr(ec.getExpr());
@@ -282,10 +281,10 @@ public class JAXBUtils {
refspec.getTableReferences().getTableReference().addAll(xTabReferencesFromHiveTabReferences(dimRefs));
}
xd.setRefSpec(refspec);
- xd.setType(XColumnType.valueOf(rd.getType().toUpperCase()));
+ xd.setType(rd.getType());
} else if (cd instanceof BaseDimAttribute) {
BaseDimAttribute bd = (BaseDimAttribute) cd;
- xd.setType(XColumnType.valueOf(bd.getType().toUpperCase()));
+ xd.setType(bd.getType());
}
return xd;
}
@@ -382,10 +381,10 @@ public class JAXBUtils {
}
public static ExprColumn hiveExprColumnFromXExprColumn(XExprColumn xe) throws ParseException {
- ExprColumn ec = new ExprColumn(new FieldSchema(xe.getName(), xe.getType().name().toLowerCase(),
- xe.getDescription()),
- xe.getDisplayString(),
- xe.getExpr());
+ ExprColumn ec = new ExprColumn(new FieldSchema(xe.getName(), xe.getType().toLowerCase(),
+ xe.getDescription()),
+ xe.getDisplayString(),
+ xe.getExpr());
return ec;
}
@@ -427,7 +426,7 @@ public class JAXBUtils {
return null;
}
- return new FieldSchema(c.getName(), c.getType().name().toLowerCase(), c.getComment());
+ return new FieldSchema(c.getName(), c.getType().toLowerCase(), c.getComment());
}
public static XColumn columnFromFieldSchema(FieldSchema fs) {
@@ -436,7 +435,7 @@ public class JAXBUtils {
}
XColumn c = XCF.createXColumn();
c.setName(fs.getName());
- c.setType(XColumnType.valueOf(fs.getType().toUpperCase()));
+ c.setType(fs.getType());
c.setComment(fs.getComment());
return c;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d27bf4ca/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
index e29227c..92b85ff 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
@@ -262,7 +262,7 @@ public class TestMetastoreService extends LensJerseyTest {
XDimAttribute xd1 = cubeObjectFactory.createXDimAttribute();
xd1.setName("dim1");
- xd1.setType(XColumnType.STRING);
+ xd1.setType("STRING");
xd1.setDescription("first dimension");
xd1.setDisplayString("Dimension1");
// Don't set endtime on this dim to validate null handling on server side
@@ -270,7 +270,7 @@ public class TestMetastoreService extends LensJerseyTest {
XDimAttribute xd2 = cubeObjectFactory.createXDimAttribute();
xd2.setName("dim2");
- xd2.setType(XColumnType.INT);
+ xd2.setType("INT");
xd2.setDescription("second dimension");
xd2.setDisplayString("Dimension2");
// Don't set start time on this dim to validate null handling on server side
@@ -278,7 +278,7 @@ public class TestMetastoreService extends LensJerseyTest {
XDimAttribute xd3 = cubeObjectFactory.createXDimAttribute();
xd3.setName("testdim2col2");
- xd3.setType(XColumnType.STRING);
+ xd3.setType("STRING");
xd3.setDescription("ref chained dimension");
xd3.setDisplayString("Chained Dimension");
XChainColumn xcc = new XChainColumn();
@@ -287,9 +287,17 @@ public class TestMetastoreService extends LensJerseyTest {
xd3.setRefSpec(cubeObjectFactory.createXDimAttributeRefSpec());
xd3.getRefSpec().setChainRefColumn(xcc);
+ // add attribute with complex type
+ XDimAttribute xd4 = cubeObjectFactory.createXDimAttribute();
+ xd4.setName("dim4");
+ xd4.setType("struct<a:INT,b:array<string>,c:map<int,array<struct<x:int,y:array<int>>>");
+ xd4.setDescription("complex attribute");
+ xd4.setDisplayString("Complex Attribute");
+
cube.getDimAttributes().getDimAttribute().add(xd1);
cube.getDimAttributes().getDimAttribute().add(xd2);
cube.getDimAttributes().getDimAttribute().add(xd3);
+ cube.getDimAttributes().getDimAttribute().add(xd4);
XMeasure xm1 = new XMeasure();
xm1.setName("msr1");
@@ -356,7 +364,7 @@ public class TestMetastoreService extends LensJerseyTest {
XExprColumn xe1 = new XExprColumn();
xe1.setName("expr1");
- xe1.setType(XColumnType.DOUBLE);
+ xe1.setType("DOUBLE");
xe1.setDescription("first expression");
xe1.setDisplayString("Expression1");
xe1.setExpr("msr1/1000");
@@ -601,9 +609,11 @@ public class TestMetastoreService extends LensJerseyTest {
assertNotNull(hcube.getDimAttributeByName("testdim2col2"));
assertEquals(hcube.getDimAttributeByName("testdim2col2").getDisplayString(), "Chained Dimension");
assertEquals(hcube.getDimAttributeByName("testdim2col2").getDescription(), "ref chained dimension");
- assertEquals(((ReferencedDimAtrribute)hcube.getDimAttributeByName("testdim2col2")).getType(), "string");
- assertEquals(((ReferencedDimAtrribute)hcube.getDimAttributeByName("testdim2col2")).getChainName(), "chain1");
- assertEquals(((ReferencedDimAtrribute)hcube.getDimAttributeByName("testdim2col2")).getRefColumn(), "col2");
+ assertEquals(((BaseDimAttribute)hcube.getDimAttributeByName("dim4")).getType(),
+ "struct<a:int,b:array<string>,c:map<int,array<struct<x:int,y:array<int>>>");
+ assertEquals(((ReferencedDimAtrribute) hcube.getDimAttributeByName("testdim2col2")).getType(), "string");
+ assertEquals(((ReferencedDimAtrribute) hcube.getDimAttributeByName("testdim2col2")).getChainName(), "chain1");
+ assertEquals(((ReferencedDimAtrribute) hcube.getDimAttributeByName("testdim2col2")).getRefColumn(), "col2");
assertNotNull(hcube.getMeasureByName("msr1"));
assertEquals(hcube.getMeasureByName("msr1").getDescription(), "first measure");
assertEquals(hcube.getMeasureByName("msr1").getDisplayString(), "Measure1");
@@ -728,7 +738,7 @@ public class TestMetastoreService extends LensJerseyTest {
XDimAttribute xd2 = cubeObjectFactory.createXDimAttribute();
xd2.setName("dim3");
- xd2.setType(XColumnType.STRING);
+ xd2.setType("STRING");
cube.getDimAttributes().getDimAttribute().add(xd2);
XProperty xp = new XProperty();
@@ -745,8 +755,8 @@ public class TestMetastoreService extends LensJerseyTest {
JAXBElement<XCube> got =
target.path(cubeName)
.queryParam("sessionid", lensSessionId).request(mediaType).get(new GenericType<JAXBElement<XCube>>() {});
- XBaseCube actual = (XBaseCube)got.getValue();
- assertEquals(actual.getDimAttributes().getDimAttribute().size(), 4);
+ XBaseCube actual = (XBaseCube) got.getValue();
+ assertEquals(actual.getDimAttributes().getDimAttribute().size(), 5);
assertEquals(actual.getMeasures().getMeasure().size(), 3);
CubeInterface hcube = JAXBUtils.hiveCubeFromXCube(actual, null);
@@ -872,7 +882,7 @@ public class TestMetastoreService extends LensJerseyTest {
for (String timePartColName : timePartColNames) {
XColumn partCol = cubeObjectFactory.createXColumn();
partCol.setName(timePartColName);
- partCol.setType(XColumnType.STRING);
+ partCol.setType("STRING");
partCol.setComment("partition column");
xs1.getPartCols().getColumn().add(partCol);
xs1.getTimePartCols().add(timePartColName);
@@ -909,12 +919,12 @@ public class TestMetastoreService extends LensJerseyTest {
XColumn c1 = cubeObjectFactory.createXColumn();
c1.setName("col1");
- c1.setType(XColumnType.STRING);
+ c1.setType("STRING");
c1.setComment("Fisrt column");
dt.getColumns().getColumn().add(c1);
XColumn c2 = cubeObjectFactory.createXColumn();
c2.setName("col2");
- c2.setType(XColumnType.INT);
+ c2.setType("INT");
c2.setComment("Second column");
dt.getColumns().getColumn().add(c2);
@@ -960,7 +970,7 @@ public class TestMetastoreService extends LensJerseyTest {
XDimAttribute xd1 = cubeObjectFactory.createXDimAttribute();
xd1.setName("col1");
- xd1.setType(XColumnType.STRING);
+ xd1.setType("STRING");
xd1.setDescription("first column");
xd1.setDisplayString("Column1");
// Don't set endtime on this dim to validate null handling on server side
@@ -968,7 +978,7 @@ public class TestMetastoreService extends LensJerseyTest {
XDimAttribute xd2 = cubeObjectFactory.createXDimAttribute();
xd2.setName("col2");
- xd2.setType(XColumnType.INT);
+ xd2.setType("INT");
xd2.setDescription("second column");
xd2.setDisplayString("Column2");
// Don't set start time on this dim to validate null handling on server side
@@ -980,7 +990,7 @@ public class TestMetastoreService extends LensJerseyTest {
XExprColumn xe1 = new XExprColumn();
xe1.setName("dimexpr");
- xe1.setType(XColumnType.STRING);
+ xe1.setType("STRING");
xe1.setDescription("dimension expression");
xe1.setDisplayString("Dim Expression");
xe1.setExpr("substr(col1, 3)");
@@ -1090,7 +1100,7 @@ public class TestMetastoreService extends LensJerseyTest {
testDim.getAttributes().getDimAttribute().remove(1);
XDimAttribute xd1 = cubeObjectFactory.createXDimAttribute();
xd1.setName("col3");
- xd1.setType(XColumnType.STRING);
+ xd1.setType("STRING");
testDim.getAttributes().getDimAttribute().add(xd1);
APIResult result = target.path("testdim")
@@ -1208,7 +1218,7 @@ public class TestMetastoreService extends LensJerseyTest {
// Add a column
XColumn c = cubeObjectFactory.createXColumn();
c.setName("col3");
- c.setType(XColumnType.STRING);
+ c.setType("STRING");
c.setComment("Added column");
dt2.getColumns().getColumn().add(c);
@@ -1229,8 +1239,8 @@ public class TestMetastoreService extends LensJerseyTest {
List<XColumn> colList = dt3.getColumns().getColumn();
boolean foundCol = false;
for (XColumn col : colList) {
- if (col.getName().equals("col3") && col.getType().equals(XColumnType.STRING) &&
- "Added column".equalsIgnoreCase(col.getComment())) {
+ if (col.getName().equals("col3") && col.getType().equals("string")
+ && "Added column".equalsIgnoreCase(col.getComment())) {
foundCol = true;
break;
}
@@ -1417,13 +1427,13 @@ public class TestMetastoreService extends LensJerseyTest {
XColumn c1 = cubeObjectFactory.createXColumn();
c1.setName("c1");
- c1.setType(XColumnType.STRING);
+ c1.setType("STRING");
c1.setComment("col1");
f.getColumns().getColumn().add(c1);
XColumn c2 = cubeObjectFactory.createXColumn();
c2.setName("c2");
- c2.setType(XColumnType.STRING);
+ c2.setType("STRING");
c2.setComment("col2");
f.getColumns().getColumn().add(c2);
@@ -2086,19 +2096,20 @@ public class TestMetastoreService extends LensJerseyTest {
assertEquals(tables, new HashSet<String>(Arrays.asList("flattestcube", "testdim", "testdim2")));
assertEquals(colSet, new HashSet<String>(Arrays.asList(
- "flattestcube.msr1",
- "flattestcube.msr2",
- "flattestcube.dim1",
- "flattestcube.dim2",
- "flattestcube.testdim2col2",
- "flattestcube.expr1",
- "chain1-testdim.col2",
- "chain1-testdim.col1",
- "chain1-testdim.dimexpr",
- "dim2chain-testdim2.col2",
- "dim2chain-testdim2.col1",
- "dim2chain-testdim2.dimexpr"
- )));
+ "flattestcube.msr1",
+ "flattestcube.msr2",
+ "flattestcube.dim1",
+ "flattestcube.dim2",
+ "flattestcube.testdim2col2",
+ "flattestcube.dim4",
+ "flattestcube.expr1",
+ "chain1-testdim.col2",
+ "chain1-testdim.col1",
+ "chain1-testdim.dimexpr",
+ "dim2chain-testdim2.col2",
+ "dim2chain-testdim2.col1",
+ "dim2chain-testdim2.dimexpr"
+ )));
// Now test flattened view for dimension
final WebTarget flatDimTarget = target().path("metastore").path("flattened").path("testdim");
[22/30] incubator-lens git commit: LENS-202 : Documentation for ML
lib (Jaideep Dhok via amareshwari)
Posted by am...@apache.org.
LENS-202 : Documentation for ML lib (Jaideep Dhok via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/632403e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/632403e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/632403e6
Branch: refs/heads/master
Commit: 632403e6e065a21ce412a8636b379864a4ef9870
Parents: 308a48e
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Feb 20 09:24:23 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Fri Feb 20 09:25:05 2015 +0530
----------------------------------------------------------------------
src/site/apt/user/ml.apt | 67 +++++++++++++++++++++++++++++++++++++++++++
src/site/site.xml | 1 +
2 files changed, 68 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/632403e6/src/site/apt/user/ml.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user/ml.apt b/src/site/apt/user/ml.apt
new file mode 100644
index 0000000..15228e7
--- /dev/null
+++ b/src/site/apt/user/ml.apt
@@ -0,0 +1,67 @@
+~~
+~~ 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 API for Machine Learning (Lens-ML)
+
+ Please Note - This is an experimental feature - API is subject to change
+
+* Introduction
+
+ The Lens-ML component allows users to call machine learning libraries as UDFs in Lens queries. At present, we integrate the MLLib library provided in Apache Spark.
+
+ With this feature, users can build machine learning models backed by Hive tables, and later call these models via Hive UDFs. Actual model building is done in Spark. Lens takes care of initializing and invoking the Spark code (Lens acts as a Spark shell).
+
+* Lens-ML Server API
+
+ The Lens-ML component provides a set of REST endpoints for listing, creation and validation of machine learning models and algorithms. Some of them are described below
+
+ * /ml/algorithms - give a list of machine learning algorithms which are supported by Lens
+
+ * /ml/train - Create a model using an algorithm and backed by a Hive table. This also takes parameters such as list of columns which act as feature variables, name of label column (in case of supervised learning) and algorithm specific tuning parameters. This call creates a Spark RDD backed by the Hive table using HCatInputFormat, and runs corresponding trainer in Spark. The eventual model object returned by the Spark environment is associated with a unique ID, and is persisted to HDFS.
+
+ * /ml/test - Evaluate a model created in the /train call against a Hive table, and store results into another Hive table. This call takes the model ID, and a Hive table which is used for evaluation purposes. It is assumed that the evaluation table contains all columns (feature and label columns) which were used to generate the model. It creates a Lens query against the evaluation table and applies the model UDF on each record in the table. Output of the query is associated with a test report ID, and stored as a partition (with the same ID) in an output table. This call returns the report ID to the user.
+
+ * /ml/models - Retrieve model metadata for an algorithm and by model ID
+
+ * /ml/reports - Retrieve model evaluation reports by algorithm or report ID
+
+* Lens-ML Client API
+
+ We also provide a client library to call the server side REST api. The LensML interface can be used to invoke server side REST APIs. The same interface can also be used by other Lens server modules to invoke these APIs in the Lens server process itself. To access an instance of the Lens-ML service in the Lens server, user can use the ServiceProvider interface.
+
+* Model UDF
+
+ Each train call creates an ML model which can be identified by a unique ID. This model can be invoked in any Hive query using the predict UDF. This UDF take the model ID and feature and label column names. Once a model is generated it can be invoked in any Lens query (at the time of writing only queries which run on the Hive backend are supported) without having to invoke Spark again.
+
+* Deployment
+
+ * Enable the ML service by adding it to the list of services brought up by lens-server. (lens.server.servicenames)
+
+ * Enable the ML resource by adding it to the list of resources brought up by lens-server (lens.server.ws.resourcenames)
+
+ * Lens-ML specific configuration -
+
+ * ML Driver - lens.ml.drivers - Currently only org.apache.lens.ml.spark.SparkMLDriver is available.
+
+ * Spark master setting - lens.ml.sparkdriver.spark.master - Specify the mode in which Spark will be invoked this can take values acceptable by the Spark master config variable in Apache Spark (for local, standalone, and Yarn modes)
+
+ An example config is provided in lens-ml-lib/resources/test/lens-site.xml
+
+ Spark dependencies need to be provided at run time when starting the Lens server. Care should be taken to make sure that the Spark version matches with the Hadoop and Hive versions used to build Apache Lens. Users may have to rebuild Spark for their version of Hadoop. SPARK_HOME environment variable should be set which points to the Spark installation.
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/632403e6/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9faaa80..f26551c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -57,6 +57,7 @@
<item name="Lens CLI" href="./user/cli.html" />
<item name="Java Client Library" href="./user/java-client.html"/>
<item name="JDBC Client" href="./user/jdbc-client.html"/>
+ <item name="Lens ML" href="./user/ml.html" />
<item name="FAQ" href="./user/faq.html"/>
</menu>
<menu name="Developer Documentation">
[19/30] incubator-lens git commit: LENS-319: Renamed Trainer to Algo
(sharad)
Posted by am...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/KMeansTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/KMeansTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/KMeansTrainer.java
deleted file mode 100644
index e4ad34e..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/KMeansTrainer.java
+++ /dev/null
@@ -1,163 +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 org.apache.lens.ml.spark.trainers;
-
-import java.util.List;
-
-import org.apache.lens.api.LensConf;
-import org.apache.lens.api.LensException;
-import org.apache.lens.ml.*;
-import org.apache.lens.ml.spark.HiveTableRDD;
-import org.apache.lens.ml.spark.models.KMeansClusteringModel;
-
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.metastore.api.FieldSchema;
-import org.apache.hadoop.hive.ql.metadata.Hive;
-import org.apache.hadoop.hive.ql.metadata.Table;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hive.hcatalog.data.HCatRecord;
-import org.apache.spark.api.java.JavaPairRDD;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.api.java.function.Function;
-import org.apache.spark.mllib.clustering.KMeans;
-import org.apache.spark.mllib.clustering.KMeansModel;
-import org.apache.spark.mllib.linalg.Vector;
-import org.apache.spark.mllib.linalg.Vectors;
-
-import scala.Tuple2;
-
-/**
- * The Class KMeansTrainer.
- */
-@Algorithm(name = "spark_kmeans_trainer", description = "Spark MLLib KMeans trainer")
-public class KMeansTrainer implements MLTrainer {
-
- /** The conf. */
- private transient LensConf conf;
-
- /** The spark context. */
- private JavaSparkContext sparkContext;
-
- /** The part filter. */
- @TrainerParam(name = "partition", help = "Partition filter to be used while constructing table RDD")
- private String partFilter = null;
-
- /** The k. */
- @TrainerParam(name = "k", help = "Number of cluster")
- private int k;
-
- /** The max iterations. */
- @TrainerParam(name = "maxIterations", help = "Maximum number of iterations", defaultValue = "100")
- private int maxIterations = 100;
-
- /** The runs. */
- @TrainerParam(name = "runs", help = "Number of parallel run", defaultValue = "1")
- private int runs = 1;
-
- /** The initialization mode. */
- @TrainerParam(name = "initializationMode",
- help = "initialization model, either \"random\" or \"k-means||\" (default).", defaultValue = "k-means||")
- private String initializationMode = "k-means||";
-
- @Override
- public String getName() {
- return getClass().getAnnotation(Algorithm.class).name();
- }
-
- @Override
- public String getDescription() {
- return getClass().getAnnotation(Algorithm.class).description();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.MLTrainer#configure(org.apache.lens.api.LensConf)
- */
- @Override
- public void configure(LensConf configuration) {
- this.conf = configuration;
- }
-
- @Override
- public LensConf getConf() {
- return conf;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.MLTrainer#train(org.apache.lens.api.LensConf, java.lang.String, java.lang.String,
- * java.lang.String, java.lang.String[])
- */
- @Override
- public MLModel train(LensConf conf, String db, String table, String modelId, String... params) throws LensException {
- List<String> features = TrainerArgParser.parseArgs(this, params);
- final int[] featurePositions = new int[features.size()];
- final int NUM_FEATURES = features.size();
-
- JavaPairRDD<WritableComparable, HCatRecord> rdd = null;
- try {
- // Map feature names to positions
- Table tbl = Hive.get(toHiveConf(conf)).getTable(db, table);
- List<FieldSchema> allCols = tbl.getAllCols();
- int f = 0;
- for (int i = 0; i < tbl.getAllCols().size(); i++) {
- String colName = allCols.get(i).getName();
- if (features.contains(colName)) {
- featurePositions[f++] = i;
- }
- }
-
- rdd = HiveTableRDD.createHiveTableRDD(sparkContext, toHiveConf(conf), db, table, partFilter);
- JavaRDD<Vector> trainableRDD = rdd.map(new Function<Tuple2<WritableComparable, HCatRecord>, Vector>() {
- @Override
- public Vector call(Tuple2<WritableComparable, HCatRecord> v1) throws Exception {
- HCatRecord hCatRecord = v1._2();
- double[] arr = new double[NUM_FEATURES];
- for (int i = 0; i < NUM_FEATURES; i++) {
- Object val = hCatRecord.get(featurePositions[i]);
- arr[i] = val == null ? 0d : (Double) val;
- }
- return Vectors.dense(arr);
- }
- });
-
- KMeansModel model = KMeans.train(trainableRDD.rdd(), k, maxIterations, runs, initializationMode);
- return new KMeansClusteringModel(modelId, model);
- } catch (Exception e) {
- throw new LensException("KMeans trainer failed for " + db + "." + table, e);
- }
- }
-
- /**
- * To hive conf.
- *
- * @param conf the conf
- * @return the hive conf
- */
- private HiveConf toHiveConf(LensConf conf) {
- HiveConf hiveConf = new HiveConf();
- for (String key : conf.getProperties().keySet()) {
- hiveConf.set(key, conf.getProperties().get(key));
- }
- return hiveConf;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/LogisticRegressionTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/LogisticRegressionTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/LogisticRegressionTrainer.java
deleted file mode 100644
index b12e2be..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/LogisticRegressionTrainer.java
+++ /dev/null
@@ -1,86 +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 org.apache.lens.ml.spark.trainers;
-
-import java.util.Map;
-
-import org.apache.lens.api.LensException;
-import org.apache.lens.ml.Algorithm;
-import org.apache.lens.ml.TrainerParam;
-import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
-import org.apache.lens.ml.spark.models.LogitRegressionClassificationModel;
-
-import org.apache.spark.mllib.classification.LogisticRegressionModel;
-import org.apache.spark.mllib.classification.LogisticRegressionWithSGD;
-import org.apache.spark.mllib.regression.LabeledPoint;
-import org.apache.spark.rdd.RDD;
-
-/**
- * The Class LogisticRegressionTrainer.
- */
-@Algorithm(name = "spark_logistic_regression", description = "Spark logistic regression trainer")
-public class LogisticRegressionTrainer extends BaseSparkTrainer {
-
- /** The iterations. */
- @TrainerParam(name = "iterations", help = "Max number of iterations", defaultValue = "100")
- private int iterations;
-
- /** The step size. */
- @TrainerParam(name = "stepSize", help = "Step size", defaultValue = "1.0d")
- private double stepSize;
-
- /** The min batch fraction. */
- @TrainerParam(name = "minBatchFraction", help = "Fraction for batched learning", defaultValue = "1.0d")
- private double minBatchFraction;
-
- /**
- * Instantiates a new logistic regression trainer.
- *
- * @param name the name
- * @param description the description
- */
- public LogisticRegressionTrainer(String name, String description) {
- super(name, description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#parseTrainerParams(java.util.Map)
- */
- @Override
- public void parseTrainerParams(Map<String, String> params) {
- iterations = getParamValue("iterations", 100);
- stepSize = getParamValue("stepSize", 1.0d);
- minBatchFraction = getParamValue("minBatchFraction", 1.0d);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
- */
- @Override
- protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
- throws LensException {
- LogisticRegressionModel lrModel = LogisticRegressionWithSGD.train(trainingRDD, iterations, stepSize,
- minBatchFraction);
- return new LogitRegressionClassificationModel(modelId, lrModel);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/NaiveBayesTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/NaiveBayesTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/NaiveBayesTrainer.java
deleted file mode 100644
index 4eb50c9..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/NaiveBayesTrainer.java
+++ /dev/null
@@ -1,73 +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 org.apache.lens.ml.spark.trainers;
-
-import java.util.Map;
-
-import org.apache.lens.api.LensException;
-import org.apache.lens.ml.Algorithm;
-import org.apache.lens.ml.TrainerParam;
-import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
-import org.apache.lens.ml.spark.models.NaiveBayesClassificationModel;
-
-import org.apache.spark.mllib.classification.NaiveBayes;
-import org.apache.spark.mllib.regression.LabeledPoint;
-import org.apache.spark.rdd.RDD;
-
-/**
- * The Class NaiveBayesTrainer.
- */
-@Algorithm(name = "spark_naive_bayes", description = "Spark Naive Bayes classifier trainer")
-public class NaiveBayesTrainer extends BaseSparkTrainer {
-
- /** The lambda. */
- @TrainerParam(name = "lambda", help = "Lambda parameter for naive bayes learner", defaultValue = "1.0d")
- private double lambda = 1.0;
-
- /**
- * Instantiates a new naive bayes trainer.
- *
- * @param name the name
- * @param description the description
- */
- public NaiveBayesTrainer(String name, String description) {
- super(name, description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#parseTrainerParams(java.util.Map)
- */
- @Override
- public void parseTrainerParams(Map<String, String> params) {
- lambda = getParamValue("lambda", 1.0d);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
- */
- @Override
- protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
- throws LensException {
- return new NaiveBayesClassificationModel(modelId, NaiveBayes.train(trainingRDD, lambda));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/SVMTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/SVMTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/SVMTrainer.java
deleted file mode 100644
index cf7a7c9..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/SVMTrainer.java
+++ /dev/null
@@ -1,90 +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 org.apache.lens.ml.spark.trainers;
-
-import java.util.Map;
-
-import org.apache.lens.api.LensException;
-import org.apache.lens.ml.Algorithm;
-import org.apache.lens.ml.TrainerParam;
-import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
-import org.apache.lens.ml.spark.models.SVMClassificationModel;
-
-import org.apache.spark.mllib.classification.SVMModel;
-import org.apache.spark.mllib.classification.SVMWithSGD;
-import org.apache.spark.mllib.regression.LabeledPoint;
-import org.apache.spark.rdd.RDD;
-
-/**
- * The Class SVMTrainer.
- */
-@Algorithm(name = "spark_svm", description = "Spark SVML classifier trainer")
-public class SVMTrainer extends BaseSparkTrainer {
-
- /** The min batch fraction. */
- @TrainerParam(name = "minBatchFraction", help = "Fraction for batched learning", defaultValue = "1.0d")
- private double minBatchFraction;
-
- /** The reg param. */
- @TrainerParam(name = "regParam", help = "regularization parameter for gradient descent", defaultValue = "1.0d")
- private double regParam;
-
- /** The step size. */
- @TrainerParam(name = "stepSize", help = "Iteration step size", defaultValue = "1.0d")
- private double stepSize;
-
- /** The iterations. */
- @TrainerParam(name = "iterations", help = "Number of iterations", defaultValue = "100")
- private int iterations;
-
- /**
- * Instantiates a new SVM trainer.
- *
- * @param name the name
- * @param description the description
- */
- public SVMTrainer(String name, String description) {
- super(name, description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#parseTrainerParams(java.util.Map)
- */
- @Override
- public void parseTrainerParams(Map<String, String> params) {
- minBatchFraction = getParamValue("minBatchFraction", 1.0);
- regParam = getParamValue("regParam", 1.0);
- stepSize = getParamValue("stepSize", 1.0);
- iterations = getParamValue("iterations", 100);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
- */
- @Override
- protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
- throws LensException {
- SVMModel svmModel = SVMWithSGD.train(trainingRDD, iterations, stepSize, regParam, minBatchFraction);
- return new SVMClassificationModel(modelId, svmModel);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/task/MLTask.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/task/MLTask.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/task/MLTask.java
index e413808..aa59100 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/task/MLTask.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/task/MLTask.java
@@ -49,7 +49,7 @@ public class MLTask implements Runnable {
private State taskState;
/**
- * Name of the trainer/algorithm.
+ * Name of the algo/algorithm.
*/
@Getter
private String algorithm;
@@ -253,10 +253,10 @@ public class MLTask implements Runnable {
LOG.info("Working in Lens server");
}
- String[] trainerArgs = buildTrainingArgs();
- LOG.info("Starting task " + taskID + " trainer args: " + Arrays.toString(trainerArgs));
+ String[] algoArgs = buildTrainingArgs();
+ LOG.info("Starting task " + taskID + " algo args: " + Arrays.toString(algoArgs));
- modelID = ml.train(trainingTable, algorithm, trainerArgs);
+ modelID = ml.train(trainingTable, algorithm, algoArgs);
printModelMetadata(taskID, modelID);
LOG.info("Starting test " + taskID);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceImpl.java b/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceImpl.java
index d34d77b..9eb2723 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceImpl.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceImpl.java
@@ -80,11 +80,11 @@ public class MLServiceImpl extends CompositeService implements MLService {
/*
* (non-Javadoc)
*
- * @see org.apache.lens.ml.LensML#getTrainerForName(java.lang.String)
+ * @see org.apache.lens.ml.LensML#getAlgoForName(java.lang.String)
*/
@Override
- public MLTrainer getTrainerForName(String algorithm) throws LensException {
- return ml.getTrainerForName(algorithm);
+ public MLAlgo getAlgoForName(String algorithm) throws LensException {
+ return ml.getAlgoForName(algorithm);
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceResource.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceResource.java b/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceResource.java
index 992e610..c0b32d3 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceResource.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/server/ml/MLServiceResource.java
@@ -129,15 +129,15 @@ public class MLServiceResource {
}
/**
- * Get a list of trainers available
+ * Get a list of algos available
*
* @return
*/
@GET
- @Path("trainers")
- public StringList getTrainerNames() {
- List<String> trainers = getMlService().getAlgorithms();
- StringList result = new StringList(trainers);
+ @Path("algos")
+ public StringList getAlgoNames() {
+ List<String> algos = getMlService().getAlgorithms();
+ StringList result = new StringList(algos);
return result;
}
@@ -148,7 +148,7 @@ public class MLServiceResource {
* @return the param description
*/
@GET
- @Path("trainers/{algorithm}")
+ @Path("algos/{algorithm}")
public StringList getParamDescription(@PathParam("algorithm") String algorithm) {
Map<String, String> paramDesc = getMlService().getAlgoParamDescription(algorithm);
if (paramDesc == null) {
@@ -196,7 +196,7 @@ public class MLServiceResource {
throw new NotFoundException("Model not found " + modelID + ", algo=" + algorithm);
}
- ModelMetadata meta = new ModelMetadata(model.getId(), model.getTable(), model.getTrainerName(), StringUtils.join(
+ ModelMetadata meta = new ModelMetadata(model.getId(), model.getTable(), model.getAlgoName(), StringUtils.join(
model.getParams(), ' '), model.getCreatedAt().toString(), getMlService().getModelPath(algorithm, modelID),
model.getLabelColumn(), StringUtils.join(model.getFeatureColumns(), ","));
return meta;
@@ -243,9 +243,9 @@ public class MLServiceResource {
public String train(@PathParam("algorithm") String algorithm, MultivaluedMap<String, String> form)
throws LensException {
- // Check if trainer is valid
- if (getMlService().getTrainerForName(algorithm) == null) {
- throw new NotFoundException("Trainer for algo: " + algorithm + " not found");
+ // Check if algo is valid
+ if (getMlService().getAlgoForName(algorithm) == null) {
+ throw new NotFoundException("Algo for algo: " + algorithm + " not found");
}
if (isBlank(form.getFirst("table"))) {
@@ -264,7 +264,7 @@ public class MLServiceResource {
throw new BadRequestException("At least one feature is required");
}
- List<String> trainerArgs = new ArrayList<String>();
+ List<String> algoArgs = new ArrayList<String>();
Set<Map.Entry<String, List<String>>> paramSet = form.entrySet();
for (Map.Entry<String, List<String>> e : paramSet) {
@@ -274,19 +274,19 @@ public class MLServiceResource {
continue;
} else if ("feature".equals(p)) {
for (String feature : values) {
- trainerArgs.add("feature");
- trainerArgs.add(feature);
+ algoArgs.add("feature");
+ algoArgs.add(feature);
}
} else if ("label".equals(p)) {
- trainerArgs.add("label");
- trainerArgs.add(values.get(0));
+ algoArgs.add("label");
+ algoArgs.add(values.get(0));
} else {
- trainerArgs.add(p);
- trainerArgs.add(values.get(0));
+ algoArgs.add(p);
+ algoArgs.add(values.get(0));
}
}
- LOG.info("Training table " + table + " with algo " + algorithm + " params=" + trainerArgs.toString());
- String modelId = getMlService().train(table, algorithm, trainerArgs.toArray(new String[]{}));
+ LOG.info("Training table " + table + " with algo " + algorithm + " params=" + algoArgs.toString());
+ String modelId = getMlService().train(table, algorithm, algoArgs.toArray(new String[]{}));
LOG.info("Done training " + table + " modelid = " + modelId);
return modelId;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java b/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java
index 7548ed2..1d40b76 100644
--- a/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java
+++ b/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Application;
import org.apache.lens.api.LensSessionHandle;
import org.apache.lens.client.LensConnectionParams;
import org.apache.lens.client.LensMLClient;
-import org.apache.lens.ml.spark.trainers.DecisionTreeTrainer;
-import org.apache.lens.ml.spark.trainers.LogisticRegressionTrainer;
-import org.apache.lens.ml.spark.trainers.NaiveBayesTrainer;
-import org.apache.lens.ml.spark.trainers.SVMTrainer;
+import org.apache.lens.ml.spark.algos.DecisionTreeAlgo;
+import org.apache.lens.ml.spark.algos.LogisticRegressionAlgo;
+import org.apache.lens.ml.spark.algos.NaiveBayesAlgo;
+import org.apache.lens.ml.spark.algos.SVMAlgo;
import org.apache.lens.ml.task.MLTask;
import org.apache.lens.server.LensJerseyTest;
import org.apache.lens.server.LensServerConf;
@@ -54,6 +54,7 @@ import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.metadata.Partition;
import org.apache.hadoop.hive.ql.metadata.Table;
+
import org.apache.hive.service.Service;
import org.glassfish.jersey.client.ClientConfig;
@@ -137,26 +138,26 @@ public class TestMLResource extends LensJerseyTest {
}
@Test
- public void testGetTrainers() throws Exception {
- List<String> trainerNames = mlClient.getAlgorithms();
- Assert.assertNotNull(trainerNames);
+ public void testGetAlgos() throws Exception {
+ List<String> algoNames = mlClient.getAlgorithms();
+ Assert.assertNotNull(algoNames);
- Assert.assertTrue(trainerNames.contains(MLUtils.getTrainerName(NaiveBayesTrainer.class)),
- MLUtils.getTrainerName(NaiveBayesTrainer.class));
+ Assert.assertTrue(algoNames.contains(MLUtils.getAlgoName(NaiveBayesAlgo.class)),
+ MLUtils.getAlgoName(NaiveBayesAlgo.class));
- Assert.assertTrue(trainerNames.contains(MLUtils.getTrainerName(SVMTrainer.class)),
- MLUtils.getTrainerName(SVMTrainer.class));
+ Assert.assertTrue(algoNames.contains(MLUtils.getAlgoName(SVMAlgo.class)),
+ MLUtils.getAlgoName(SVMAlgo.class));
- Assert.assertTrue(trainerNames.contains(MLUtils.getTrainerName(LogisticRegressionTrainer.class)),
- MLUtils.getTrainerName(LogisticRegressionTrainer.class));
+ Assert.assertTrue(algoNames.contains(MLUtils.getAlgoName(LogisticRegressionAlgo.class)),
+ MLUtils.getAlgoName(LogisticRegressionAlgo.class));
- Assert.assertTrue(trainerNames.contains(MLUtils.getTrainerName(DecisionTreeTrainer.class)),
- MLUtils.getTrainerName(DecisionTreeTrainer.class));
+ Assert.assertTrue(algoNames.contains(MLUtils.getAlgoName(DecisionTreeAlgo.class)),
+ MLUtils.getAlgoName(DecisionTreeAlgo.class));
}
@Test
- public void testGetTrainerParams() throws Exception {
- Map<String, String> params = mlClient.getAlgoParamDescription(MLUtils.getTrainerName(DecisionTreeTrainer.class));
+ public void testGetAlgoParams() throws Exception {
+ Map<String, String> params = mlClient.getAlgoParamDescription(MLUtils.getAlgoName(DecisionTreeAlgo.class));
Assert.assertNotNull(params);
Assert.assertFalse(params.isEmpty());
@@ -168,7 +169,7 @@ public class TestMLResource extends LensJerseyTest {
@Test
public void trainAndEval() throws Exception {
LOG.info("Starting train & eval");
- final String algoName = MLUtils.getTrainerName(NaiveBayesTrainer.class);
+ final String algoName = MLUtils.getAlgoName(NaiveBayesAlgo.class);
HiveConf conf = new HiveConf();
String database = "default";
String tableName = "naivebayes_training_table";
[03/30] incubator-lens git commit: LENS-267 : Add missing metrics in
monitoring doc (Sushil Mohanty via amareshwari)
Posted by am...@apache.org.
LENS-267 : Add missing metrics in monitoring doc (Sushil Mohanty via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/6b913604
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/6b913604
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/6b913604
Branch: refs/heads/master
Commit: 6b9136043a02976087e690aab82df4f1c819b648
Parents: 77cea31
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Fri Feb 6 18:27:13 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Fri Feb 6 18:29:31 2015 +0530
----------------------------------------------------------------------
src/site/apt/admin/monitoring.apt | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6b913604/src/site/apt/admin/monitoring.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/monitoring.apt b/src/site/apt/admin/monitoring.apt
index c939abc..f9f7b12 100644
--- a/src/site/apt/admin/monitoring.apt
+++ b/src/site/apt/admin/monitoring.apt
@@ -37,9 +37,37 @@ Lens server monitoring
* Total number of cancelled queries;
- Lens server also emits jvm, gc, memory and thread level metrics.
+ * Number of result formatting error
- Ganglia metrics can be enabled by configuring the parameters :
+
+ Lens server also emits following metrics for other services
+
+ * Number of exceptions
+
+ * Number of HTTP client error
+
+ * Number of HTTP error
+
+ * Number of HTTP server error
+
+ * Number of HTTP unknown error
+
+ * Number of HTTP request started
+
+ * Number of HTTP requests finished
+
+ * Number of statistics store errors
+
+ * Number of statistics log partition handler errors
+
+ * Number of statistics log file scanner errors
+
+ * Number of email notification errors
+
+
+ Lens server also emits jvm, gc, memory and thread level metrics.
+
+ Ganglia metrics can be enabled by configuring the parameters :
<lens.server.enable.gangla.metrics>, <lens.server.metrics.ganglia.serverName>, <lens.server.metrics.ganglia.port>,
<lens.server.metrics.reporting.period>.
[17/30] incubator-lens git commit: LENS-326 : Fix docker after dist
changes (Sharad Agarwal via amareshwari)
Posted by am...@apache.org.
LENS-326 : Fix docker after dist changes (Sharad Agarwal via amareshwari)
Conflicts:
lens-docker/lens-test/Dockerfile
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/3c6077ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/3c6077ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/3c6077ad
Branch: refs/heads/master
Commit: 3c6077ade09af7515b45658f842742d472be2789
Parents: 2e210e9
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Feb 19 10:20:15 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Feb 19 10:21:58 2015 +0530
----------------------------------------------------------------------
lens-docker/lens-test/Dockerfile | 6 +++---
lens-docker/lens-test/lens-bootstrap.sh | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/3c6077ad/lens-docker/lens-test/Dockerfile
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/Dockerfile b/lens-docker/lens-test/Dockerfile
index eafbfea..31f3882 100644
--- a/lens-docker/lens-test/Dockerfile
+++ b/lens-docker/lens-test/Dockerfile
@@ -17,10 +17,10 @@
FROM inmobi/docker-hive
-ENV LENS_VERSION 2.0.0-incubating-SNAPSHOT
+ENV LENS_VERSION apache-lens-2.0.0-incubating-SNAPSHOT
ENV BASEDIR /opt/lens
-ENV LENS_HOME $BASEDIR/lens-dist/target/lens-dist-${LENS_VERSION}-server/
-ENV LENS_CLIENT $BASEDIR/lens-client-dist/target/lens-client-dist-${LENS_VERSION}-client/
+ENV LENS_HOME $BASEDIR/lens-dist/target/${LENS_VERSION}-bin/${LENS_VERSION}-bin/server
+ENV LENS_CLIENT $BASEDIR/lens-dist/target/${LENS_VERSION}-bin/${LENS_VERSION}-bin/client
ENV LENS_SERVER_CONF $LENS_HOME/conf-pseudo-distr/
ENV LENS_CLIENT_CONF $LENS_CLIENT/conf-pseudo-distr/
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/3c6077ad/lens-docker/lens-test/lens-bootstrap.sh
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/lens-bootstrap.sh b/lens-docker/lens-test/lens-bootstrap.sh
index 23ed307..1c61603 100644
--- a/lens-docker/lens-test/lens-bootstrap.sh
+++ b/lens-docker/lens-test/lens-bootstrap.sh
@@ -25,15 +25,15 @@ echo "LENS_CLIENT_CONF " $LENS_CLIENT_CONF
#start hive bootstrap script
/etc/hive-bootstrap.sh
-echo "Waiting for 10 secs for servers to start ..."
-sleep 10
+echo "Waiting for 20 secs for servers to start ..."
+sleep 20
#start lens server
echo "Starting Lens server..."
$LENS_HOME/bin/lens-ctl start --conf $LENS_SERVER_CONF
-echo "Waiting for 20 secs for Lens Server to start ..."
-sleep 20
+echo "Waiting for 40 secs for Lens Server to start ..."
+sleep 40
#Setting up client
$LENS_CLIENT/bin/run-examples.sh sample-metastore --conf $LENS_CLIENT_CONF
[18/30] incubator-lens git commit: LENS-212: Disable the persistent
resultset in psuedo distributed conf (sharad)
Posted by am...@apache.org.
LENS-212: Disable the persistent resultset in psuedo distributed conf (sharad)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/ff152d99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/ff152d99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/ff152d99
Branch: refs/heads/master
Commit: ff152d992b54596a5de62d98df86ec70a8670a7b
Parents: 3c6077a
Author: Sharad Agarwal <sh...@flipkarts-MacBook-Pro.local>
Authored: Wed Feb 18 14:38:13 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Feb 19 10:22:42 2015 +0530
----------------------------------------------------------------------
tools/conf-pseudo-distr/server/lens-site.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/ff152d99/tools/conf-pseudo-distr/server/lens-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/lens-site.xml b/tools/conf-pseudo-distr/server/lens-site.xml
index 8110ab8..6dc7eff 100644
--- a/tools/conf-pseudo-distr/server/lens-site.xml
+++ b/tools/conf-pseudo-distr/server/lens-site.xml
@@ -33,4 +33,14 @@
<name>lens.server.drivers</name>
<value>org.apache.lens.driver.hive.HiveDriver,org.apache.lens.driver.jdbc.JDBCDriver</value>
</property>
+
+<property>
+ <name>lens.query.enable.persistent.resultset</name>
+ <value>false</value>
+</property>
+
+<property>
+ <name>lens.query.enable.persistent.resultset.indriver</name>
+ <value>false</value>
+</property>
</configuration>
[12/30] incubator-lens git commit: LENS-220 : Update license and
notice for binary distribution (amareshwari)
Posted by am...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-CDDLv1.1-GPLv2_withCPE
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-CDDLv1.1-GPLv2_withCPE b/bin-dist-files/LICENSE-CDDLv1.1-GPLv2_withCPE
new file mode 100644
index 0000000..03b402f
--- /dev/null
+++ b/bin-dist-files/LICENSE-CDDLv1.1-GPLv2_withCPE
@@ -0,0 +1,207 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+1. Definitions.
+
+1.1. “Contributor” means each individual or entity that creates or contributes to the creation of Modifications.
+1.2. “Contributor Version” means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+1.4. “Executable” means the Covered Software in any form other than Source Code.
+1.5. “Initial Developer” means the individual or entity that first makes Original Software available under this License.
+1.6. “Larger Work” means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+1.7. “License” means this document.
+1.8. “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+1.9. “Modifications” means the Source Code and Executable form of any of the following:
+A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+B. Any new file that contains any part of the Original Software or previous Modification; or
+C. Any new file that is contributed or otherwise made available under the terms of this License.
+1.10. “Original Software” means the Source Code and Executable form of computer software code that is originally released under this License.
+1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+1.12. “Source Code” means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+1.13. “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+2.2. Contributor Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+3.2. Modifications.
+The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+3.3. Required Notices.
+You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+3.4. Application of Additional Terms.
+You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+3.5. Distribution of Executable Versions.
+You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+3.6. Larger Works.
+You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+4. Versions of the License.
+
+4.1. New Versions.
+Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+4.2. Effect of New Versions.
+You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+4.3. Modified Versions.
+When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as “Participant”) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written
agreement with Participant.
+6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
+6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall
be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+
+The GNU General Public License (GPL) Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+One line to give the program's name and a brief idea of what it does.
+Copyright (C) <year> <name of author>
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Oracle are subject to the following clarification and special exception to the GPL Version 2, but only where Oracle has expressly included in the particular source file's header the words "Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the License file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-EDL
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-EDL b/bin-dist-files/LICENSE-EDL
new file mode 100644
index 0000000..f19b0ec
--- /dev/null
+++ b/bin-dist-files/LICENSE-EDL
@@ -0,0 +1,11 @@
+Eclipse Distribution License - v 1.0
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-EPL
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-EPL b/bin-dist-files/LICENSE-EPL
new file mode 100644
index 0000000..5a7d9d4
--- /dev/null
+++ b/bin-dist-files/LICENSE-EPL
@@ -0,0 +1,213 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from
+a Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor’s behalf. Contributions do not include
+additionsto the Program which: (i) are separate modules of software distributed
+in conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability
+to Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient’s responsibility to acquire that
+license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of
+ title and non-infringement, and implied warranties or conditions of
+ merchantability and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and
+ consequential damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are
+ offered by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable
+ manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor’s responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient’s patent(s), then such Recipient’s rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient’s rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient’s rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient’s obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
+may assign the responsibility to serve as the Agreement Steward to a suitable
+separate entity. Each new version of the Agreement will be given a
+distinguishing version number. The Program (including Contributions) may always
+be distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+above, Recipient receives no rights or licenses to the intellectual property of
+any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-GPLv3
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-GPLv3 b/bin-dist-files/LICENSE-GPLv3
new file mode 100644
index 0000000..10926e8
--- /dev/null
+++ b/bin-dist-files/LICENSE-GPLv3
@@ -0,0 +1,675 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
[27/30] incubator-lens git commit: LENS-344: Marks 2.0.x release as
beta(Amareshwari Sriramadasu via prongs)
Posted by am...@apache.org.
LENS-344: Marks 2.0.x release as beta(Amareshwari Sriramadasu via prongs)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/e013fe8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/e013fe8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/e013fe8d
Branch: refs/heads/master
Commit: e013fe8d18cbc426f4a4ab6a13a8c839b17c0136
Parents: 6a85389
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Feb 24 11:49:40 2015 +0530
Committer: Rajat Khandelwal <pr...@apache.org>
Committed: Tue Feb 24 11:49:40 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 2 +-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-docker/lens-test/Dockerfile | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
pom.xml | 6 +++---
src/site/apt/releases/compatibility.apt | 8 ++++----
src/site/apt/releases/download.apt | 3 ++-
src/site/apt/releases/release-history.apt | 2 +-
20 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index d04bae0..21547ff 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index f3a9fd6..4d49345 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index c65289c..47fe5a3 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 55ac799..6d54630 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 4deb58b..4b1bea2 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index dd62f44..0bb242f 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-docker/lens-test/Dockerfile
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/Dockerfile b/lens-docker/lens-test/Dockerfile
index 31f3882..c976eed 100644
--- a/lens-docker/lens-test/Dockerfile
+++ b/lens-docker/lens-test/Dockerfile
@@ -17,7 +17,7 @@
FROM inmobi/docker-hive
-ENV LENS_VERSION apache-lens-2.0.0-incubating-SNAPSHOT
+ENV LENS_VERSION apache-lens-2.0.1-beta-incubating-SNAPSHOT
ENV BASEDIR /opt/lens
ENV LENS_HOME $BASEDIR/lens-dist/target/${LENS_VERSION}-bin/${LENS_VERSION}-bin/server
ENV LENS_CLIENT $BASEDIR/lens-dist/target/${LENS_VERSION}-bin/${LENS_VERSION}-bin/client
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 4de3cdc..8df1e96 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 41305af..986c55d 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 201457c..89379ea 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 11514ea..85cd63b 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index f390baa..7500d45 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 3518130..f38eb42 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 3863997..36df939 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 27834bc..96e0bee 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index f7e1f35..5c3afd8 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71e7929..6566fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -430,7 +430,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1057,7 +1057,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/src/site/apt/releases/compatibility.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/compatibility.apt b/src/site/apt/releases/compatibility.apt
index 453c57e..991cd75 100644
--- a/src/site/apt/releases/compatibility.apt
+++ b/src/site/apt/releases/compatibility.apt
@@ -38,10 +38,10 @@ Compatibility in Apache Lens
For any changes proposed in <<lens-api>>, <<REST api>> and <<configuration options>>, Apache Lens community will do
atleast one release with backward compatibility making current usage deprecated.
- If there are any incompatibilities with respect to the above in any release, the major version will be called out as
- incompatible with earlier version and tools/documentation will be provided to upgrade to newer version.
+ If there are any incompatibilities with respect to the above in any release, the major version will be upgraded and
+ called out as incompatible with earlier version. Major version number upgrade is optional for alpha/beta releases. For
+ all incompatible changes in a release, tools/documentation will be provided to upgrade to newer version. See
+ {{{./release-history.html} all releases table}} for all release details, compatibility tools provided.
The api <org.apache.lens.client.*> and <org.apache.lens.server.api.*> are still evolving, once they are stable, they
will be added to the above list.
-
- See {{{./release-history.html} all releases table}} for all release details, compatibility tools provided.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/src/site/apt/releases/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/download.apt b/src/site/apt/releases/download.apt
index 71a0442..b18b3e5 100644
--- a/src/site/apt/releases/download.apt
+++ b/src/site/apt/releases/download.apt
@@ -19,7 +19,8 @@
Download
- The latest release of Apache Lens can be {{{http://www.apache.org/dyn/closer.cgi/incubator/lens/2.0-incubating}downloaded from the ASF}}.
+ The latest release of Apache Lens can be
+ {{{http://www.apache.org/dyn/closer.cgi/incubator/lens/2.0-beta-incubating}downloaded from the ASF}}.
Older releases may be found {{{http://archive.apache.org/dist/incubator/lens} in the archives}}.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e013fe8d/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index cf25530..959ef82 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,7 +23,7 @@ All Apache Lens releases
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
-|2.0.0| First release in Apache| {{{../versions/2.0.0-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-incubating/} Download}} | - | - |
+|2.0.1-beta-incubating| First release in Apache| {{{../versions/2.0.1-beta-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-beta-incubating/} Download}} | - | - |
*--+--+---+--+--+--+--+
* NOTES
[07/30] incubator-lens git commit: LENS-221 : Improve install and run
doc (Himanshu Gahlaut via amareshwari)
Posted by am...@apache.org.
LENS-221 : Improve install and run doc (Himanshu Gahlaut via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/1670cc16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/1670cc16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/1670cc16
Branch: refs/heads/master
Commit: 1670cc16bce52ad5fd00d1f99ecde29a63035905
Parents: bba8177
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Wed Feb 11 11:25:39 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Wed Feb 11 11:26:35 2015 +0530
----------------------------------------------------------------------
src/site/apt/admin/deployment.apt | 2 +-
src/site/apt/developer/contribute.apt | 52 +++++
src/site/apt/gettingstarted/install-steps.apt | 230 -------------------
.../gettingstarted/pseudo-distributed-setup.apt | 20 --
src/site/apt/gettingstarted/quick-start.apt | 26 ---
src/site/apt/lenshome/install-and-run.apt | 230 +++++++++++++++++++
.../apt/lenshome/pseudo-distributed-setup.apt | 80 +++++++
src/site/apt/lenshome/quick-start.apt | 26 +++
src/site/site.xml | 6 +-
9 files changed, 392 insertions(+), 280 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/admin/deployment.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/deployment.apt b/src/site/apt/admin/deployment.apt
index 57be521..afa524d 100644
--- a/src/site/apt/admin/deployment.apt
+++ b/src/site/apt/admin/deployment.apt
@@ -20,7 +20,7 @@
Lens server deployment
This document describes the deployment of lens server in a distributed cluster.
- Make sure you have finished {{{../gettingstarted/install-steps.html} Install and run}} doc,
+ Make sure you have finished {{{../lenshome/install-and-run.html} Install and Run}} documentation,
before proceeding.
Lens server requires Hive metastore for providing OLAP cube metastore. Its also requires a DB for storing system
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt b/src/site/apt/developer/contribute.apt
index 8015d68..5eb5ff5 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -89,6 +89,58 @@ Developer Documentation : How to contribute to Apache Lens?
* Set up the IDE to follow the source layout rules of the project.
+* Building from source
+
+** Building Lens from Source
+
+ Download Apache Lens source release from {{{/releases/download.html} here}}.
+
++---+
+ unzip apache-lens-<version>-source.release.zip
+ cd apache-lens-<version>
+ mvn clean package -DskipTests
++---+
+
+ OR
+ Clone Apache Lens source code from {{{https://git-wip-us.apache.org/repos/asf/incubator-lens.git} https://git-wip-us.apache.org/repos/asf/incubator-lens.git}}
+
++---+
+ git clone https://git-wip-us.apache.org/repos/asf/incubator-lens.git
+ cd incubator-lens
+ mvn clean package -DskipTests
++---+
+
+ Once one of the above sets of commands completes successfully, the build will produce <lens-dist/target/lens-dist-version-bin/server> and <lens-dist/target/lens-dist-version-bin/client>. Former can be used as the Lens server installation directory and later can be used as Lens client installation directory to {{{/lenshome/install-and-run.html#Running_Lens} run}} lens server and lens client.
+
+ The build will also produce debians for both client and server in <lens-dist/target>. Client debian uses </usr/local/lens-client> as the Lens client installation directory and Server debian uses </usr/local/lens> as the Lens server installation directory.
+
+ Apache Lens depends on Hive. Please {{{#Building_Hive_from_Source} build}} Hive from Source or install it using the documentation {{{/lenshome/install-and-run.html#Installing_Hive} here}}. After installing Lens and Hive, refer {{{/lenshome/install-and-run.html#Running_Lens} here}} for running lens client and lens server from installation directories.
+
+** Building Hive from Source
+
++---+
+
+ git clone https://github.com/InMobi/hive.git
+
+ cd hive
+
+ git checkout <release-tag>
+
+ mvn clean package -DskipTests -Phadoop-2,dist
+
++---+
+
+ Once above package command completes successfully, <packaging/target> will have <apache-hive-$project.version-bin>. This build also produces source, binary tar.gz files and deb package for hive.
+
+ Set the environment variable HIVE_HOME to point to the Hive installation directory built from source:
+
++---+
+
+ cd packaging/target/apache-hive-$project.version-bin/apache-hive-$project.version-bin
+ export HIVE_HOME=`pwd`
+
++---+
+
* Code Contributions
All code changes should be initiated based on an issue in {{{https://issues.apache.org/jira/browse/LENS}LENS JIRA}},
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/gettingstarted/install-steps.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/gettingstarted/install-steps.apt b/src/site/apt/gettingstarted/install-steps.apt
deleted file mode 100644
index ef5724d..0000000
--- a/src/site/apt/gettingstarted/install-steps.apt
+++ /dev/null
@@ -1,230 +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.
-~~
-
-Installing and running lens
-
-%{toc|section=1|fromDepth=0}
-
-* Building Lens from source
-
- Here are the commands to build from source.
-
-+---+
-
- git clone https://git-wip-us.apache.org/repos/asf/incubator-lens.git
-
- cd incubator-lens
-
- git checkout master
-
- mvn clean package
-
-+---+
-
- Once above package command completes successfully, <lens-dist/target> will have <lens-dist-${project.version}-server> and <lens-client-dist/target> will have <lens-client-dist-${project.version}-client> packaged directories for client and server. The build will also produce debian for both client and server in <lens-client-dist/target> and <lens-dist/target>, respectively.
-
-* Installing and running lens-server
-
- Users can <cd> into the above server and client distribution directories built from source and try it out. Or install the debs from an apt repo or the debians built from source directly. Server and client debians will be installed in </usr/local/lens> and </usr/local/lens-client> respectively.
-
- Let us go over how the install looks, in the subsections below.
-
- Users can also use the docker container to mount the src base directory into the container.
-
-
-** Server install and configuration
-
- The directory structure of the server installation :
-
-+---+
-
- ├── bin
- │ ├── lens-config.sh
- │ └── lens-ctl
- ├── conf
- │ ├── lens-env.sh
- │ ├── lens-site.xml
- │ ├── hive-site.xml
- │ └── log4j.properties
- ├── lib
- │ ├── ST4-4.0.4.jar
- │ ├── activation-1.1.jar
- │ ├── ant-1.9.1.jar
- │ ├── ant-launcher-1.9.1.jar
- │ ├── antlr-2.7.7.jar
- …….
- │ └── zookeeper-3.4.5.jar
- └── webapp
- └── lens-server.war
-+---+
-
- The <bin> folder provides <lens-ctl> which provides commands for starting and stopping the lens server. Other .sh files in <bin> are the scripts used by lens-ctl.
-
- The server war is available in webapp/ folder, which would be expanded in the same directory, if not overridden. And the lib folder contains all the dependent libraries.
-
- Server configuration can be overridden in lens-site.xml. See {{{../admin/config.html}server configuration}} for all the configuration parameters available and their default values. You can set up the environment variables such as JAVA_HOME, java options, heap size and etc in lens-env.sh.
-
- The server logs go into logs/ folder in the install directory, unless overridden. The proper logging configuration can be provided in log4j.properties file.
-
- Lens server dependes on hive which is forked from {{{http://github.com/apache/hive}Apache Hive}} into {{{http://github.com/inmobi/hive} InMobi Hive}}. See {{{https://github.com/InMobi/hive/releases}here}} for all the latest releases.
-
- Build it from source and set HIVE_HOME.
-
-+---+
-
- git clone https://github.com/inmobi/hive.git
-
- cd hive
-
- git checkout <release-tag>
-
- mvn clean package -DskipTests -Phadoop-2,dist
-
-+---+
-
- Once above package command completes successfully, packaging/target will have apache-hive-$project.version-bin. This build also produces source, binary tar.gz files and deb package for hive.
-
- <<Ex:>> export <<HIVE_HOME>>=$\{hive-source-location\}/packaging/target/apache-hive-$project.version-bin/apache-hive-$project.version-bin/
-
-*** Driver configuration
-
- If server has HiveDriver as one of the drivers, the configuration for hive driver should be set up in hive-site.xml.
- All the available configuration of the HiveDriver can be found {{{../admin/hivedriver-config.html}here}}.
-
-** Running the server
-
- Before starting the server, you need to set <<HADOOP_HOME>> and <<HIVE_HOME>> environment variables. These should point to the Hadoop and Hive installation locations on the server.
-
- Once env variables are set, you can use the following command to start the server:
-
-+---+
-
- bin/lens-ctl start
-
-+---+
-
- Once the server is up, you can go to the browser and open the server <baseurl>. You would see a message saying ‘Lens server is up’.
-
- To check all other services are up and running, try <baseurl>/session, <baseurl>/queryapi, <baseurl>/metastore and all of them will respond with respective service is up.
-
- You can try out examples described below or use the REST api <link> for each service.
-
- The command to stop the server:
-
-+---+
-
- bin/lens-ctl stop
-
-+---+
-
-** Client install and configuration
-
- The directory structure of the client installation :
-
-+---+
- ├── bin
- │ ├── lens-cli.sh
- │ ├── lens-config.sh
- │ └── run-examples.sh
- ├── conf
- │ ├── lens-client-site.xml
- │ ├── lens-env.sh
- │ └── log4j.properties
- ├── examples
- │ ├── data
- │ │ ├── dim1_local
- │ │ │ └── dim1-local.data
- │ │ └── dim2_local
- │ │ └── dim2-local.data
- │ ├── queries
- │ │ └── dimension-queries.txt
- │ └── resources
- │ ├── db-storage.xml
- │ ├── dim1-local-part.xml
- │ ├── dim1-storage-tables.xml
- │ ├── dim2-local-part.xml
- │ ├── dim2-storage-tables.xml
- │ ├── dim_table.xml
- │ ├── dim_table2.xml
- │ ├── fact1-storage-tables.xml
- │ ├── fact1.xml
- │ ├── fact2-storage-tables.xml
- │ ├── fact2.xml
- │ ├── local-cluster-storage.xml
- │ ├── local-storage.xml
- │ ├── rawfact-storage-tables.xml
- │ ├── rawfact.xml
- │ └── sample-cube.xml
- └── lib
- ├── ST4-4.0.4.jar
- …….
- └── xmlenc-0.52.jar
-+---+
-
- The <bin> folder provides various scripts for the client.
-
- * <<run-examples.sh>> provides commands to run examples - create a sample metastore, populate metastore with sample data and run some example queries. This would validate your server is all up and running fine.
-
- * <<lens-cli.sh>> provides CLI shell for running various commands. Its usage is more described in CLI user guide.
-
- * <<lens-config.sh>> is used internally by other scripts
-
- Client configuration can be overridden in lens-client-site.xml. See {{{../user/client-config.html}client configuration}} for all the configuration parameters available and their default values. You can set up the environment variables such as JAVA_HOME, java options, heap size and etc in lens-env.sh.
-
- The client logs go into logs/ folder in the install directory, unless overridden. The proper logging configuration can be provided in log4j.properties file.
-
- Examples folder contains sample resource files, data files and query files which will be used by <<run-examples.sh>> script.
-
-* Running Lens in Docker
-
- Lens docker files are located in
-
-+---+
- incubator-lens/lens-docker/lens-test
-+---+
-
- The above directory contains the lens docker images that can be used for development and testing.
-
- To build the image
-
-+---+
- cd tools/scripts
- ./build-docker.sh
-+---+
-
- Before running the build docker must be installed in the system. The above script will build the lens docker image and download the dependent images of hive and hadoop.
-
- To run the image
-
-+---+
- cd tools/scripts
- ./run-docker.sh
-+---+
-
- This will start the docker container and the container will have its Lens directories mounted to your actual checked out code, allowing you to modify and recompile your Lens source and have them immediately usable in the docker images (without rebuilding the image).
-
-
-
-
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/gettingstarted/pseudo-distributed-setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/gettingstarted/pseudo-distributed-setup.apt b/src/site/apt/gettingstarted/pseudo-distributed-setup.apt
deleted file mode 100644
index f83aa72..0000000
--- a/src/site/apt/gettingstarted/pseudo-distributed-setup.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.
-~~
-
-~~~
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/gettingstarted/quick-start.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/gettingstarted/quick-start.apt b/src/site/apt/gettingstarted/quick-start.apt
deleted file mode 100644
index ec97d07..0000000
--- a/src/site/apt/gettingstarted/quick-start.apt
+++ /dev/null
@@ -1,26 +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.
-~~
-
-Getting started with Lens
-
- Start with installation steps described {{{./install-steps.html}here}} and try out
- {{{./pseudo-distributed-setup.html}pseudo distributed setup}}. Refer to
- {{{../admin/index.html} Admin documentation}} for more information on server components
- and configuration. Refer to {{{../user/index.html} User documentation}} for starting to
- use the client api.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/lenshome/install-and-run.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/install-and-run.apt b/src/site/apt/lenshome/install-and-run.apt
new file mode 100644
index 0000000..98c1c66
--- /dev/null
+++ b/src/site/apt/lenshome/install-and-run.apt
@@ -0,0 +1,230 @@
+~~
+~~ 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.
+~~
+
+Installing and Running Lens
+
+%{toc|section=1-2|fromDepth=0}
+
+* Installation
+
+** Downloading
+
+ Download a release of Apache Lens from {{{/releases/download.html}here}}.
+ Lens depends on Hive forked from Apache Hive. Download a release of hive from {{{https://github.com/InMobi/hive/releases}https://github.com/InMobi/hive/releases}}.
+
+** Installing Lens
+
+ Unpack the tarball.
+
++---+
+
+ tar zxvf lens-dist-<verison>-bin.tar.gz
+
++---+
+
+ This will result in the creation of a directory named lens-dist-<verison>-bin (where <version> is the release number).
+
++---+
+ lens-dist-<verison>-bin
+ ├── client
+ ├── examples
+ └── server
++---+
+
+ <lens-dist-verison-bin/client> can be used as the Lens client installation directory and <lens-dist-verison-bin/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
+
+** Installing Hive
+
+ Unpack the tarball.
+
++---+
+
+ tar -xzvf hive-hive-release-<version>-inm.tar.gz
+
++---+
+
+ This will result in the creation of a directory named hive-hive-release-<version>-inm. This directory contains hive source code. Build hive binary using below commands.
+
++---+
+
+ cd hive-hive-release-<version>-inm
+ mvn clean package -DskipTests -Phadoop-2,dist
+
++---+
+
+ This will result in creation of hive binary, which can be found at location packaging/target/apache-hive-<version>-inm-bin.tar.gz.
+ Unpack the created hive tarball in the directory where you want to install hive.
+
++---+
+ tar zxvf apache-hive-<version>-inm-bin.tar.gz
++---+
+
+ This will result in creation of directory apache-hive-<version>-inm-bin.
+ Set HIVE_HOME.
+
++---+
+ cd apache-hive-<version>-inm-bin
+ export HIVE_HOME=`pwd`
++---+
+
+* Running Lens
+
+** Running Lens Server
+
+*** Structure of Lens server installation directory
+
++---+
+
+ ├── bin
+ │ ├── lens-config.sh
+ │ └── lens-ctl
+ ├── conf
+ │ ├── lens-env.sh
+ │ ├── lens-site.xml
+ │ ├── hive-site.xml
+ │ └── log4j.properties
+ ├── lib
+ │ ├── ST4-4.0.4.jar
+ │ ├── activation-1.1.jar
+ │ ├── ant-1.9.1.jar
+ │ ├── ant-launcher-1.9.1.jar
+ │ ├── antlr-2.7.7.jar
+ …….
+ │ └── zookeeper-3.4.5.jar
+ └── webapp
+ └── lens-server.war
++---+
+
+ We will refer to Lens server installation directory as <lens-install-dir> in rest of the page. The <bin> folder provides <lens-ctl> which provides commands for starting and stopping the lens server. Other .sh files in <bin> are the scripts used by lens-ctl.
+
+ The server war is available in webapp/ folder, which would be expanded in the same directory. War would be expanded either by postinst script of debian or if debian is not used for installation, then it will be expanded on first server start. The lib folder contains all the dependent libraries.
+
+ Server configuration can be overridden in lens-site.xml. See {{{../admin/config.html}server configuration}} for all the configuration parameters available and their default values. You can set up the environment variables such as JAVA_HOME, java options, heap size and etc in lens-env.sh.
+
+ The server logs go into logs/ folder in the <lens-install-dir> directory, unless overridden. The proper logging configuration can be provided in log4j.properties file.
+
+*** Driver configuration
+
+ If server has HiveDriver as one of the drivers, the configuration for hive driver should be set up in hive-site.xml.
+ All the available configuration of the HiveDriver can be found {{{../admin/hivedriver-config.html}here}}.
+
+*** Setting Environment Variables
+
+ Before starting the server, you need to set <<HADOOP_HOME>> and <<HIVE_HOME>> environment variables. These should point to the Hadoop and Hive installation directories.
+
+*** Starting Lens server
+
+ Once env variables are set, you can use the following command to start the server:
+
++---+
+
+ bin/lens-ctl start
+
++---+
+
+ Once the server is up, you can go to the browser and open the server <baseurl>. You would see a message saying ‘Lens server is up’.
+
+ To check all other services are up and running, try <baseurl>/session, <baseurl>/queryapi, <baseurl>/metastore and all of them will respond with respective service is up.
+
+ You can try out examples described below or use the REST api <link> for each service.
+
+ The command to stop the server:
+
++---+
+
+ bin/lens-ctl stop
+
++---+
+
+** Running Lens Client
+
+*** Structure of Lens client installation directory
+
++---+
+ ├── bin
+ │ ├── lens-cli.sh
+ │ ├── lens-config.sh
+ │ └── run-examples.sh
+ ├── conf
+ │ ├── lens-client-site.xml
+ │ ├── lens-env.sh
+ │ └── log4j.properties
+ ├── examples
+ │ ├── data
+ │ │ ├── dim1_local
+ │ │ │ └── dim1-local.data
+ │ │ └── dim2_local
+ │ │ └── dim2-local.data
+ │ ├── queries
+ │ │ └── dimension-queries.txt
+ │ └── resources
+ │ ├── db-storage.xml
+ │ ├── dim1-local-part.xml
+ │ ├── dim1-storage-tables.xml
+ │ ├── dim2-local-part.xml
+ │ ├── dim2-storage-tables.xml
+ │ ├── dim_table.xml
+ │ ├── dim_table2.xml
+ │ ├── fact1-storage-tables.xml
+ │ ├── fact1.xml
+ │ ├── fact2-storage-tables.xml
+ │ ├── fact2.xml
+ │ ├── local-cluster-storage.xml
+ │ ├── local-storage.xml
+ │ ├── rawfact-storage-tables.xml
+ │ ├── rawfact.xml
+ │ └── sample-cube.xml
+ └── lib
+ ├── ST4-4.0.4.jar
+ …….
+ └── xmlenc-0.52.jar
++---+
+
+ The <bin> folder provides various scripts for the client.
+
+ * <<run-examples.sh>> provides commands to run examples - create a sample metastore, populate metastore with sample data and run some example queries. This would validate your server is all up and running fine.
+
+ * <<lens-cli.sh>> provides CLI shell for running various commands. Its usage is more described in CLI user guide.
+
+ * <<lens-config.sh>> is used internally by other scripts
+
+ Client configuration can be overridden in lens-client-site.xml. See {{{../user/client-config.html}client configuration}} for all the configuration parameters available and their default values. You can set up the environment variables such as JAVA_HOME, java options, heap size and etc in lens-env.sh.
+
+ The client logs go into logs/ folder in the install directory, unless overridden. The proper logging configuration can be provided in log4j.properties file.
+
+ Examples folder contains sample resource files, data files and query files which will be used by <<run-examples.sh>> script.
+
+*** Starting Lens Client
+
++---+
+
+ bin/lens-cli.sh
+
++---+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/lenshome/pseudo-distributed-setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/pseudo-distributed-setup.apt b/src/site/apt/lenshome/pseudo-distributed-setup.apt
new file mode 100644
index 0000000..be7a808
--- /dev/null
+++ b/src/site/apt/lenshome/pseudo-distributed-setup.apt
@@ -0,0 +1,80 @@
+~~
+~~ 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.
+~~
+
+Pseudo Distributed Setup
+
+ Lens pseudo-distributed setup is done using docker. Hive server and hadoop daemons are run as separate processes in lens pseudo-distributed setup. Lens docker files are located in
+
++---+
+ incubator-lens/lens-docker/lens-test
++---+
+
+ The above directory contains the lens docker images that can be used for development and testing.
+
+ To build the image
+
++---+
+ cd tools/scripts
+ ./build-docker.sh
++---+
+
+ Before running the build, docker must be installed in the system. The above script will build the lens docker image and download the dependent images of hive and hadoop.
+
+* Steps to run lens docker image
+
+ Initialize Boot2Docker
+
++---+
+ boot2docker init
++---+
+
+ Start Boot2Docker
+
++---+
+ boot2docker start
++---+
+
+ You will see an output similar to the one pasted below:
+
++---+
+ Waiting for VM and Docker daemon to start...
+ .....o
+ Started.
+ Writing /Users/<user-name>/.boot2docker/certs/boot2docker-vm/ca.pem
+ Writing /Users/<user-name>/.boot2docker/certs/boot2docker-vm/cert.pem
+ Writing /Users/<user-name>/.boot2docker/certs/boot2docker-vm/key.pem
+
+ To connect the Docker client to the Docker daemon, please set:
+ export DOCKER_HOST=tcp://192.168.59.103:2376
+ export DOCKER_CERT_PATH=/Users/<user-name>/.boot2docker/certs/boot2docker-vm
+ export DOCKER_TLS_VERIFY=1
++---+
+
+ Export all variables as mentioned in the output on your machine.
+
+ Run the image
+
++---+
+ $(boot2docker shellinit)
+ cd tools/scripts
+ ./run-docker.sh
++---+
+
+ This will start the docker container and the container will have its Lens directories mounted to your actual checked out code, allowing you to modify and recompile your Lens source and have them immediately usable in the docker images (without rebuilding the image).
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/apt/lenshome/quick-start.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/quick-start.apt b/src/site/apt/lenshome/quick-start.apt
new file mode 100644
index 0000000..86bd60a
--- /dev/null
+++ b/src/site/apt/lenshome/quick-start.apt
@@ -0,0 +1,26 @@
+~~
+~~ 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.
+~~
+
+Getting started with Lens
+
+ Start with installation steps described {{{./install-and-run.html}here}} and try out
+ {{{./pseudo-distributed-setup.html}pseudo distributed setup}}. Refer to
+ {{{../admin/index.html} Admin documentation}} for more information on server components
+ and configuration. Refer to {{{../user/index.html} User documentation}} for starting to
+ use the client api.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/1670cc16/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index f0f0a55..a134ff2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -41,9 +41,9 @@
<body>
<menu name="Lens" >
<item name="Overview" href="index.html" />
- <item name="Getting Started" href="./gettingstarted/quick-start.html" />
- <item name="Install and Run" href="./gettingstarted/install-steps.html" />
- <item name="Pseudo Distributed Setup" href="./gettingstarted/pseudo-distributed-setup.html" />
+ <item name="Getting Started" href="./lenshome/quick-start.html" />
+ <item name="Installing and Running Lens" href="./lenshome/install-and-run.html" />
+ <item name="Pseudo Distributed Setup" href="./lenshome/pseudo-distributed-setup.html" />
</menu>
<menu name="Releases" >
<item name="Download" href="./releases/download.html" />
[28/30] incubator-lens git commit: [maven-release-plugin] prepare
release apache-lens-2.0.1-beta-incubating
Posted by am...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.0.1-beta-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/de64e1db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/de64e1db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/de64e1db
Branch: refs/heads/master
Commit: de64e1dbfca2c4be0f8829cec2012052c09fb1e5
Parents: e013fe8
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Feb 24 12:54:26 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Feb 24 12:54:26 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +++++-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
pom.xml | 8 ++++----
16 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 21547ff..afbb218 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
<build>
<plugins>
@@ -49,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.0.1-beta-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 4d49345..3dc5e2e 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 47fe5a3..58f0f6e 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 6d54630..bb8d6ce 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 4b1bea2..a848f92 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 0bb242f..908be81 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 8df1e96..bf81e5f 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 986c55d..a6bfdc8 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 89379ea..e5e884f 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 85cd63b..22669f6 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 7500d45..364e4a8 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index f38eb42..b626390 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 36df939..b1e75e5 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 96e0bee..9cf45da 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 5c3afd8..50f330d 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/de64e1db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6566fe5..dff53ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -170,7 +170,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-falcon.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.0.1-beta-incubating</tag>
</scm>
<reporting>
@@ -430,7 +430,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</dependency>
</dependencies>
<executions>
@@ -1057,7 +1057,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-beta-incubating-SNAPSHOT</version>
+ <version>2.0.1-beta-incubating</version>
</dependency>
</dependencies>
<executions>
[26/30] incubator-lens git commit: LENS-343: Updates docs wrt java
and hadoop version compatibility(Amareshwari Sriramadasu via prongs) Java
versions 1.6 and 1.7 work. Hadoop version tested upto 2.4
Posted by am...@apache.org.
LENS-343: Updates docs wrt java and hadoop version compatibility(Amareshwari Sriramadasu via prongs)
Java versions 1.6 and 1.7 work. Hadoop version tested upto 2.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/6a85389c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/6a85389c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/6a85389c
Branch: refs/heads/master
Commit: 6a85389cc6a412abc5fc72442d9148a91131d3b5
Parents: fe7abd0
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Feb 24 11:42:41 2015 +0530
Committer: Rajat Khandelwal <pr...@apache.org>
Committed: Tue Feb 24 11:42:41 2015 +0530
----------------------------------------------------------------------
README.md | 2 +-
src/site/apt/admin/deployment.apt | 4 ++--
src/site/apt/developer/contribute.apt | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6a85389c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 08f995b..c9163ee 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Apache Lens is a unified Analytics Platform. Lens aims to cut the Data Analytics
across multiple tiered data stores and optimal execution environment for the analytical query.
Building source :
-Requires JDK(1.6+) and Apache Maven(3.x) to be installed for the build.
+Requires JDK(1.6, 1.7) and Apache Maven(3.x) to be installed for the build. Build does not pass with JDK(1.8) yet.
Please run <mvn clean package> to build the project.
See [Development Environment Setup] (http://lens.incubator.apache.org/developer/contribute.html#Development_Environment_Setup)
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6a85389c/src/site/apt/admin/deployment.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/deployment.apt b/src/site/apt/admin/deployment.apt
index afa524d..7fbeb56 100644
--- a/src/site/apt/admin/deployment.apt
+++ b/src/site/apt/admin/deployment.apt
@@ -36,9 +36,9 @@ Lens server deployment
* Dependencies and their versions
- * Requires java 1.6+
+ * Requires java 1.6+, Does not work with java 1.8 yet.
- * Requires Hadoop 2.x+
+ * Requires Hadoop 2.x+. Tested upto hadoop 2.4.
* Requires Hive metastore 0.13+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6a85389c/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt b/src/site/apt/developer/contribute.apt
index c8885d6..bcce161 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -67,9 +67,9 @@ Developer Documentation : How to contribute to Apache Lens?
** Build tools
- * A Java Development Kit. You can use any thing about java6.
+ * A Java Development Kit. You can use java6 or java7. Build does not pass with java8 yet.
- * Apache maven
+ * Apache maven (3.x+)
Ensure all the tools are installed by executing mvn, git and javac respectively.
[29/30] incubator-lens git commit: [maven-release-plugin] prepare for
next development iteration
Posted by am...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/f90a94df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/f90a94df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/f90a94df
Branch: refs/heads/master
Commit: f90a94dfc65a0c402cd9049ea92309c7d1f29250
Parents: de64e1d
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Feb 24 12:54:50 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Feb 24 12:54:50 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +-----
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
pom.xml | 8 ++++----
16 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index afbb218..d1d18d3 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.0.1-beta-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 3dc5e2e..c83777c 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 58f0f6e..a4b9528 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index bb8d6ce..24b7c67 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index a848f92..7b400c0 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 908be81..9af0ef7 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index bf81e5f..f81e459 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index a6bfdc8..c4d4402 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index e5e884f..44f2d45 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 22669f6..e847c1a 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 364e4a8..0472066 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index b626390..f1677c1 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index b1e75e5..390740f 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 9cf45da..47cee9d 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 50f330d..4e98582 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f90a94df/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dff53ee..b528dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -170,7 +170,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-falcon.git</url>
- <tag>apache-lens-2.0.1-beta-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -430,7 +430,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1057,7 +1057,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-beta-incubating</version>
+ <version>2.0.2-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[13/30] incubator-lens git commit: LENS-220 : Update license and
notice for binary distribution (amareshwari)
Posted by am...@apache.org.
LENS-220 : Update license and notice for binary distribution (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/6ace656f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/6ace656f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/6ace656f
Branch: refs/heads/master
Commit: 6ace656f2d5167ec342e260ba01b11466581754e
Parents: 5fcc469
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Feb 17 17:06:05 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Feb 17 17:08:13 2015 +0530
----------------------------------------------------------------------
bin-dist-files/LICENSE | 626 +++++++++++++++++
bin-dist-files/LICENSE-CDDL-v1.0 | 119 ++++
bin-dist-files/LICENSE-CDDLv1.0-GPLv2_withCPE | 263 ++++++++
bin-dist-files/LICENSE-CDDLv1.1-GPLv2_withCPE | 207 ++++++
bin-dist-files/LICENSE-EDL | 11 +
bin-dist-files/LICENSE-EPL | 213 ++++++
bin-dist-files/LICENSE-GPLv3 | 675 +++++++++++++++++++
bin-dist-files/LICENSE-LGPL | 504 ++++++++++++++
bin-dist-files/NOTICE | 56 ++
bin-dist-files/README | 1 +
.../apache/lens/client/LensMetadataClient.java | 2 +
lens-dist/pom.xml | 134 ++--
lens-dist/src/main/assembly/bin-dist.xml | 68 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-server/pom.xml | 7 +-
pom.xml | 83 ++-
src/site/apt/lenshome/install-and-run.apt | 31 +-
18 files changed, 2892 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE b/bin-dist-files/LICENSE
new file mode 100644
index 0000000..f097f81
--- /dev/null
+++ b/bin-dist-files/LICENSE
@@ -0,0 +1,626 @@
+ 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.
+
+
+The following files are under MIT License
+
+For lens-server/src/main/webapp/static/css/codemirror.min.css
+lens-server/src/main/webapp/static/js/libs/codemirror.min.js
+lens-server/src/main/webapp/static/js/libs/sql.js
+
+Copyright (C) 2014 by Marijn Haverbeke <ma...@gmail.com> and others
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+For lens-server/src/main/webapp/static/js/libs/jquery.flot.js
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For lens-server/src/main/webapp/static/js/libs/moment.js
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+For lens-server/src/main/webapp/static/js/libs/stupidtable.min.js
+
+Copyright (c) 2012 Joseph McCullough
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+APACHE LENS SUBCOMPONENTS:
+
+The Apache Lens software includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+For c3p0 and mchange-commons-java library
+
+/*
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of EITHER:
+ *
+ * 1) The GNU Lesser General Public License (LGPL), version 2.1, as
+ * published by the Free Software Foundation
+ *
+ * OR
+ *
+ * 2) The Eclipse Public License (EPL), version 1.0
+ *
+ * You may choose which license to accept if you wish to redistribute
+ * or modify this work. You may offer derivatives of this work
+ * under the license you have chosen, or you may provide the same
+ * choice of license which you have been offered here.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received copies of both LGPL v2.1 and EPL v1.0
+ * along with this software; see the files LICENSE-EPL and LICENSE-LGPL.
+ * If not, the text of these licenses are currently available at
+ *
+ * LGPL v2.1: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ * EPL v1.0: http://www.eclipse.org/org/documents/epl-v10.php
+ */
+
+
+For javax.mail, javax.activation libraries
+
+javax.mail, javax.activation are licensed under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0.
+Full text of license is available in file LICENSE-CDDL-v1.0 included in this release
+The text of the license is also available at https://glassfish.dev.java.net/public/CDDLv1.0.html
+
+
+For javax.servlet-api, javax.annotation, org.glassfish.hk2:osgi-resource-locator
+
+javax.servlet-api, javax.annotation, org.glassfish.hk2:osgi-resource-locator are dual licensed under
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+and The GNU General Public License (GPL) Version 2, June 1991, with classpath excpetion.
+Full text of the licenses is available in file LICENSE-CDDLv1.0-GPLv2_withCPE
+The text of the license is also available at https://glassfish.java.net/nonav/public/CDDL+GPL.html
+
+
+
+For javax.ws.rs, jaxb-api, jersey-server, jersey-client, jersey-media-multipart, jersey-media-json-jackson,
+jersey-media-moxy, jersey-container-grizzly2-servlet, jersey-container-grizzly2-http, jersey-container-servlet,
+jersey-container-servlet-core, jersey-entity-filtering, jersey-common, grizzly-http-server, grizzly-framework,
+grizzly-http, grizzly-http-servlet, hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api, javax.inject,
+mimepull
+
+javax.ws.rs, jaxb-api, jersey-server, jersey-client, jersey-media-multipart, jersey-media-json-jackson,
+jersey-media-moxy, jersey-container-grizzly2-servlet, jersey-container-grizzly2-http, jersey-container-servlet,
+jersey-container-servlet-core, jersey-entity-filtering, jersey-common, grizzly-http-server, grizzly-framework,
+grizzly-http, grizzly-http-servlet, hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api, javax.inject,
+mimepull are dual licensed under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+and The GNU Generas Public License (GPL) Version 2, June 1991 with classpath exception.
+Full text if the license is available in file LICENSE-CDDLv1.1-GPLv2_withCPE
+The text of the license is also available at https://glassfish.java.net/public/CDDL+GPL_1_1.html
+
+
+For javax.xml.stream:stax-api
+
+javax.xml.stream:stax-api is dual licensed under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+and GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007. Full text of licenses is available in files LICENSE-CDDL-v1.0
+and LICENSE-GPLv3. The licenses are also available at https://glassfish.dev.java.net/public/CDDLv1.0.html and
+http://www.gnu.org/licenses/gpl.txt
+
+
+For org.eclipse.persistence libraries
+
+org.eclipse.persistence.moxy, org.eclipse.persistence.core, org.eclipse.persistence.asm, org.eclipse.persistence.antlr
+are dual licensed under Eclipse Public License v1.0 and Eclipse Distribution License v1.0. Full text of licenses is
+available in files LICENSE-EPL and LICENSE-EDL. The licenses are also available at
+http://www.eclipse.org/legal/epl-v10.html and http://www.eclipse.org/org/documents/edl-v10.php.
+
+
+For org.hsqldb,
+
+For work developed by the HSQL Development Group:
+
+Copyright (c) 2001-2010, The HSQL Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the HSQL Development Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For work originally developed by the Hypersonic SQL Group:
+
+Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the Hypersonic SQL Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This software consists of voluntary contributions made by many individuals on behalf of the
+Hypersonic SQL Group.
+
+
+For org.projectlombok
+
+Copyright (C) 2009-2013 The Project Lombok Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+For org.slf4j
+
+Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For info.ganglia.gmetric4j
+
+ Copyright (C) 2010-2012 Daniel Pocock <da...@pocock.com.au>
+ Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For net.sourceforge.jline
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+For ASM Core asm:asm
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For xmlenc library
+
+Copyright 2003-2005, Ernst de Haan <wf...@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-CDDL-v1.0
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-CDDL-v1.0 b/bin-dist-files/LICENSE-CDDL-v1.0
new file mode 100644
index 0000000..3be7a13
--- /dev/null
+++ b/bin-dist-files/LICENSE-CDDL-v1.0
@@ -0,0 +1,119 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
+
+1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+1.4. Executable means the Covered Software in any form other than Source Code.
+
+1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
+
+1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+1.7. License means this document.
+
+1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+1.9. Modifications means the Source Code and Executable form of any of the following:
+
+A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+B. Any new file that contains any part of the Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
+
+1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for code that You delete from the Original Software, or (2)�for infringements caused by: (i)�the modification of the Original Software, or (ii)�the combination of the Original Software with other software or devices.
+
+2.2. Contributor Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made by that Contributor (or portions thereof); and (2)�the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+(d) Notwithstanding Section�2.2(b) above, no patent license is granted: (1)�for any code that Contributor has deleted from the Contributor Version; (2)�for infringements caused by: (i)�third party modifications of Contributor Version, or (ii)�the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)�under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+3.3. Required Notices.
+You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+3.6. Larger Works.
+You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)�rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)�otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections�2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agre
ement with Participant.
+
+6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a commercial item, as that term is defined in 48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be
construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-CDDLv1.0-GPLv2_withCPE
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-CDDLv1.0-GPLv2_withCPE b/bin-dist-files/LICENSE-CDDLv1.0-GPLv2_withCPE
new file mode 100644
index 0000000..a0ccc93
--- /dev/null
+++ b/bin-dist-files/LICENSE-CDDLv1.0-GPLv2_withCPE
@@ -0,0 +1,263 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+ 1.1. Contributor. means each individual or entity that creates or contributes to the creation of Modifications.
+
+ 1.2. Contributor Version. means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+ 1.3. Covered Software. means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+ 1.4. Executable. means the Covered Software in any form other than Source Code.
+
+ 1.5. Initial Developer. means the individual or entity that first makes Original Software available under this License.
+
+ 1.6. Larger Work. means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+ 1.7. License. means this document.
+
+ 1.8. Licensable. means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. Modifications. means the Source Code and Executable form of any of the following:
+
+ A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+ B. Any new file that contains any part of the Original Software or previous Modification; or
+
+ C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+ 1.10. Original Software. means the Source Code and Executable form of computer software code that is originally released under this License.
+
+ 1.11. Patent Claims. means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+ 1.12. Source Code. means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+ 1.13. You. (or .Your.) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, .You. includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, .control. means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+ Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+ 3.2. Modifications.
+ The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+ 3.3. Required Notices.
+ You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+ You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients. rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+ 3.5. Distribution of Executable Versions.
+ You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient.s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+ 3.6. Larger Works.
+ You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+ 4.1. New Versions.
+ Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+ 4.2. Effect of New Versions.
+ You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+
+ 4.3. Modified Versions.
+ When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as .Participant.) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a writte
n agreement with Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction.s conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys. fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract sha
ll be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+ The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+The GNU General Public License (GPL) Version 2, June 1991
+
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+ One line to give the program's name and a brief idea of what it does.
+
+ Copyright (C)
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special exception to the GPL Version 2, but only where Sun has expressly included in the particular source file's header the words
+
+"Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the License file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.? An independent module is a module which is not derived from or based on this library.? If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.? If you do not wish to do so, delete this exception statement from your version.
[21/30] incubator-lens git commit: LENS-311 : Update readme with
maven version (amareshwari)
Posted by am...@apache.org.
LENS-311 : Update readme with maven version (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/308a48e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/308a48e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/308a48e9
Branch: refs/heads/master
Commit: 308a48e9c894e03a03d34d27381d0f1b3ddfb007
Parents: 49fef8e
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Feb 19 16:17:24 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Feb 19 16:18:02 2015 +0530
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/308a48e9/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 31ac478..08f995b 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Apache Lens is a unified Analytics Platform. Lens aims to cut the Data Analytics
across multiple tiered data stores and optimal execution environment for the analytical query.
Building source :
-Requires JDK(1.6+) and Apache Maven to be installed for the build.
+Requires JDK(1.6+) and Apache Maven(3.x) to be installed for the build.
Please run <mvn clean package> to build the project.
See [Development Environment Setup] (http://lens.incubator.apache.org/developer/contribute.html#Development_Environment_Setup)
[30/30] incubator-lens git commit: Merge branch
'current-release-line' of
https://git-wip-us.apache.org/repos/asf/incubator-lens
Posted by am...@apache.org.
Merge branch 'current-release-line' of https://git-wip-us.apache.org/repos/asf/incubator-lens
Conflicts:
checkstyle/pom.xml
lens-api/pom.xml
lens-cli/pom.xml
lens-client/pom.xml
lens-cube/pom.xml
lens-dist/pom.xml
lens-dist/src/main/assembly/bin-dist.xml
lens-docker/lens-test/Dockerfile
lens-driver-hive/pom.xml
lens-driver-jdbc/pom.xml
lens-examples/pom.xml
lens-ml-dist/LICENSE.txt
lens-ml-dist/src/main/assembly/ml-dist.xml
lens-ml-dist/src/site/apt/index.apt
lens-ml-lib/pom.xml
lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoArgParser.java
lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoParam.java
lens-ml-lib/src/main/java/org/apache/lens/ml/MLAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/MLTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerArgParser.java
lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerParam.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/api/AlgoParam.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/api/MLAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/lib/AlgoArgParser.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/dt/DecisionTreeAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/kmeans/KMeansAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/lr/LogisticRegressionAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/nb/NaiveBayesAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/svm/SVMAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/BaseSparkAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/DecisionTreeAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/KMeansAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/LogisticRegressionAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/NaiveBayesAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/SVMAlgo.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/BaseSparkTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/DecisionTreeTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/KMeansTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/LogisticRegressionTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/NaiveBayesTrainer.java
lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/SVMTrainer.java
lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLResource.java
lens-query-lib/pom.xml
lens-regression/pom.xml
lens-server-api/pom.xml
lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
lens-server/pom.xml
lens-server/src/main/java/org/apache/lens/server/LensServices.java
lens-server/src/main/java/org/apache/lens/server/metastore/JAXBUtils.java
lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
lens-storage-db/pom.xml
pom.xml
src/site/apt/admin/config.apt
src/site/apt/admin/monitoring.apt
tools/conf-pseudo-distr/server/lens-site.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/b10d15be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/b10d15be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/b10d15be
Branch: refs/heads/master
Commit: b10d15be5340edd01ab4227fffd7ed6646bbb9da
Parents: 28dacf6 f90a94d
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Wed Apr 15 14:46:42 2015 -0500
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Wed Apr 15 14:46:42 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/30] incubator-lens git commit: LENS-10: Updates branching,
versioning and compatibility strategies in Apache Lens(Amareshwari
Sriramadasu via prongs)
Posted by am...@apache.org.
LENS-10: Updates branching, versioning and compatibility strategies in Apache Lens(Amareshwari Sriramadasu via prongs)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/4639f6bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/4639f6bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/4639f6bc
Branch: refs/heads/master
Commit: 4639f6bcac81151bc0fe827cc01dad45e36b1261
Parents: 6ace656
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Feb 13 21:20:44 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Feb 17 17:10:16 2015 +0530
----------------------------------------------------------------------
src/site/apt/releases/compatibility.apt | 47 ++++++++++++++++++++++++++
src/site/apt/releases/release-history.apt | 27 +++++++++++++++
2 files changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/4639f6bc/src/site/apt/releases/compatibility.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/compatibility.apt b/src/site/apt/releases/compatibility.apt
new file mode 100644
index 0000000..453c57e
--- /dev/null
+++ b/src/site/apt/releases/compatibility.apt
@@ -0,0 +1,47 @@
+~~
+~~ 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.
+~~
+
+Compatibility in Apache Lens
+
+ Apache Lens tries to offer backward compatibility across releases with respect to the following
+
+ * <<lens-api>> module dependency :
+ {{{http://lens.incubator.apache.org/apidocs/index.html} API for org.apache.lens.api.*}}
+
+ * REST api provided : {{{http://lens.incubator.apache.org/rest.html} Published REST api}}
+
+ * Configuration options provided at {{{../user/client-config.html} Client configuration}},
+ {{{../user/olap-query-conf.html} OLAP query configuration}} and
+ {{{../admin/config-server.html} Server configuration}}.
+
+ * Deployment stack : Published at {{{../admin/deployment.html} Suggested deployment}}
+
+ []
+
+
+ For any changes proposed in <<lens-api>>, <<REST api>> and <<configuration options>>, Apache Lens community will do
+ atleast one release with backward compatibility making current usage deprecated.
+
+ If there are any incompatibilities with respect to the above in any release, the major version will be called out as
+ incompatible with earlier version and tools/documentation will be provided to upgrade to newer version.
+
+ The api <org.apache.lens.client.*> and <org.apache.lens.server.api.*> are still evolving, once they are stable, they
+ will be added to the above list.
+
+ See {{{./release-history.html} all releases table}} for all release details, compatibility tools provided.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/4639f6bc/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
new file mode 100644
index 0000000..f5f6139
--- /dev/null
+++ b/src/site/apt/releases/release-history.apt
@@ -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.
+~~
+All Apache Lens releases
+
+ Below table captures releases, release documentation, their compatibility and tools provided for incompatible changes.
+
+*--+--+---+--+--+--+--+
+|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
+*--+--+---+--+--+--+--+
+|2.0.0| First release in Apache| {{{../versions/2.0.0-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-incubating/} Download}} | - | - |
+*--+--+---+--+--+--+--+
\ No newline at end of file
[04/30] incubator-lens git commit: LENS-277 : Remove mention of
impala from main page (amareshwari)
Posted by am...@apache.org.
LENS-277 : Remove mention of impala from main page (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/960ee0e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/960ee0e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/960ee0e5
Branch: refs/heads/master
Commit: 960ee0e5a6f7d892fbc411c5adc799e2ca06db95
Parents: 6b91360
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Fri Feb 6 18:34:03 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Fri Feb 6 18:34:39 2015 +0530
----------------------------------------------------------------------
src/site/apt/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/960ee0e5/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index bb257d5..e4ff3d5 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -33,7 +33,7 @@ Welcome to Lens!
* <<Lens application server>> - a REST server which allows users to query data, make schema changes, scheduling queries and enforcing quota limits on queries.
- * <<Driver based architecture>> allows plugging in reporting systems like Hive, Columnar data warehouses, Redshift, Impala etc.
+ * <<Driver based architecture>> allows plugging in reporting systems like Hive, Columnar data warehouses, Redshift etc.
* <<Cost based engine selection>> - allows optimal use of resources by selecting the best execution engine for a given query based on the query cost.
[16/30] incubator-lens git commit: LENS-311 : Packaging and README
update for source and binary distribution (amareshwari)
Posted by am...@apache.org.
LENS-311 : Packaging and README update for source and binary distribution (amareshwari)
Conflicts:
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/2e210e97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/2e210e97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/2e210e97
Branch: refs/heads/master
Commit: 2e210e97b77c7d8f4deee632975994da629e6137
Parents: 534ef2f
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Feb 19 04:16:19 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Feb 19 04:23:03 2015 +0530
----------------------------------------------------------------------
README.md | 13 +++-
bin-dist-files/README | 62 +++++++++++++++++++-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 4 +-
lens-dist/pom.xml | 20 +++++--
.../src/deb/control/server-control/postinst | 2 +-
lens-dist/src/main/assembly/bin-dist.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 9 ++-
lens-storage-db/pom.xml | 2 +-
pom.xml | 59 +++++++++++++++++--
src/site/apt/developer/contribute.apt | 18 ++++--
src/site/apt/lenshome/install-and-run.apt | 9 ++-
src/site/apt/releases/release-history.apt | 8 ++-
tools/scripts/lens-cli | 2 +-
23 files changed, 192 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 07a3249..31ac478 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,15 @@
-Lens
+Apache Lens
=====
-Lens is a unified Analytics Platform
+Apache Lens is a unified Analytics Platform. Lens aims to cut the Data Analytics silos by providing a single view of data
+across multiple tiered data stores and optimal execution environment for the analytical query.
+
+Building source :
+Requires JDK(1.6+) and Apache Maven to be installed for the build.
+Please run <mvn clean package> to build the project.
+
+See [Development Environment Setup] (http://lens.incubator.apache.org/developer/contribute.html#Development_Environment_Setup)
+and [Building from source] (http://lens.incubator.apache.org/developer/contribute.html#Building_from_source) docs for
+more details.
[Detailed documentation for the project is available here](https://lens.incubator.apache.org)
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/bin-dist-files/README
----------------------------------------------------------------------
diff --git a/bin-dist-files/README b/bin-dist-files/README
index 3e74fb9..6cf9ad4 100644
--- a/bin-dist-files/README
+++ b/bin-dist-files/README
@@ -1 +1,61 @@
-README for binary distribution
+Apache Lens
+=====
+
+Apache Lens is a unified Analytics Platform. Lens aims to cut the Data Analytics silos by providing a single view of data
+across multiple tiered data stores and optimal execution environment for the analytical query.
+
+This distribution is a convenient binary distribution for users to try out server and client packages of Apache Lens.
+
+Detailed install and run steps available at http://lens.incubator.apache.org/lenshome/install-and-run.html and
+docker setup details available at http://lens.incubator.apache.org/lenshome/pseudo-distributed-setup.html
+
+Detailed documentation for the project is available at https://lens.incubator.apache.org
+
+Here are quick start steps :
+
+Before starting the server, you need to set HADOOP_HOME and HIVE_HOME environment variables. These should point to
+the Hadoop and Hive installation directories. Lens depends on a forked version of Hive which is available at
+https://github.com/inmobi/hive. So, Hive needs to be built and HIVE_HOME should be set as packaged directory from
+build.
+
+Building hive :
+$ git clone https://github.com/inmobi/hive
+$ git checkout hive-release-0.13.3-inm
+$ mvn clean package -DskipTests -Phadoop-2,dist
+
+Server packaging is server/ folder.
+$ cd server
+
+Starting lens server :
+bin/lens-ctl start
+
+Lens server also comes with simple UI service which can be used to browse catalog and submit queries. Once the server
+starts up, you can open the UI service on http://<serverhost>:19999/index.html and browse.
+
+Client distribution is in client/ folder.
+
+$ cd client
+
+Running examples :
+$ bin/run-examples sample-metastore
+$ bin/run-examples populate-metastore
+$ bin/run-examples runqueries
+
+Starting lens cli :
+bin/lens-cli.sh
+
+Stopping Lens server :
+bin/lens-ctl stop
+
+------
+
+LICENSE files included in the distribution are to be in compliance with bundled dependent jars. All the jars
+bundled are in compliance with Apache license. Most of the jars are available in dual license of which at least
+one license is in compliance with Apache license. The license of all the bundled jars are summarized at
+https://cwiki.apache.org/confluence/display/LENS/Licensing+in+Apache+Lens
+
+NOTE:
+Binary distribution of the release does not include dependency org.acplt:oncrpc:jar:1.0.7, as its licensing is
+not in compliance with Apache licensing. It would be required for ganglia metrics reporting. If user is
+interested in ganglia metrics reporting, the jar needs to be downloaded and used.
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 81ae369..4bfc007 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Lens API</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 72f8712..c4a2ef8 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -25,7 +25,7 @@
<name>Lens CLI</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index eb3d4da..a0f40ab 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -23,7 +23,7 @@
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>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 9742a70..51eadba 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -25,7 +25,7 @@
<name>Lens Cube</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
@@ -105,4 +105,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index eef8436..d132bf5 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -25,7 +25,7 @@
<name>Lens Distribution</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
@@ -169,7 +169,7 @@
<deb>${project.build.directory}/lens-server_${project.version}.deb</deb>
<dataSet>
<data>
- <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/server</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/server</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -177,7 +177,7 @@
</mapper>
</data>
<data>
- <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/server/bin</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/server/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -200,7 +200,7 @@
<deb>${project.build.directory}/lens-client_${project.version}.deb</deb>
<dataSet>
<data>
- <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/client</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/client</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -208,7 +208,7 @@
</mapper>
</data>
<data>
- <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/client/bin</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/client/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -216,6 +216,16 @@
<filemode>755</filemode>
</mapper>
</data>
+ <data>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/client/bin/lens-cli
+ </src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/bin/</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
</dataSet>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/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
index 0cd9d57..5d1f976 100644
--- a/lens-dist/src/deb/control/server-control/postinst
+++ b/lens-dist/src/deb/control/server-control/postinst
@@ -47,7 +47,7 @@ manage_war_expansion () {
return 1
fi
- cd -
+ cd $OLDPWD
if [ $? -ne 0 ]; then
echo "Could not move back from the changed directory"
return 1
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/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
index 4ec2d55..3554425 100644
--- a/lens-dist/src/main/assembly/bin-dist.xml
+++ b/lens-dist/src/main/assembly/bin-dist.xml
@@ -28,7 +28,7 @@
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-lens-${project.version}</baseDirectory>
+ <baseDirectory>apache-lens-${project.version}-bin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index dccb974..5a948a8 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -25,7 +25,7 @@
<name>Lens Hive Driver</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 9f4078a..9872130 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Lens Driver for JDBC</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 8458826..2fac616 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Lens Examples</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index df1dac2..82dc372 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -25,7 +25,7 @@
<name>Lens ML Lib</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 1d93b8d..c4b9885 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -25,7 +25,7 @@
<name>Lens Query Library</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 92ae2f0..1fa6b84 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Lens Regression</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 392517a..59b546a 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -23,7 +23,7 @@
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>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index b0b5305..608fad4 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -25,7 +25,7 @@
<name>Lens Server</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
@@ -224,6 +224,13 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
+ <archive>
+ <addMavenDescriptor>true</addMavenDescriptor>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 0e40e11..560c15a 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -25,7 +25,7 @@
<name>Lens DB storage</name>
<parent>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a245f19..c499c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,14 +102,13 @@
<!-- installation -->
<mvn.lens.install.dir>/usr/local/lens</mvn.lens.install.dir>
- <mvn.lens.bin.dir>${mvn.lens.install.dir}/bin</mvn.lens.bin.dir>
- <mvn.lens.webapp.dir>${mvn.lens.install.dir}/webapp</mvn.lens.webapp.dir>
+ <mvn.lens.webapp.dir>${mvn.lens.install.dir}/server/webapp</mvn.lens.webapp.dir>
<mvn.lens.server.dir>${mvn.lens.webapp.dir}/lens-server</mvn.lens.server.dir>
</properties>
<groupId>org.apache.lens</groupId>
- <artifactId>lens-parent</artifactId>
+ <artifactId>apache-lens</artifactId>
<version>2.0.0-incubating-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
@@ -1049,7 +1048,57 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>no-checkstyle</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.lens</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${lens.checkstyle.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>checkstyle-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <configLocation>checkstyle.xml</configLocation>
+ <headerLocation>checkstyle-java-header.txt</headerLocation>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>apache-release</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-ganglia</artifactId>
+ <version>${metrics.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.acplt</groupId>
+ <artifactId>oncrpc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
</profiles>
-
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt b/src/site/apt/developer/contribute.apt
index 91e7b81..c8885d6 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -110,11 +110,20 @@ Developer Documentation : How to contribute to Apache Lens?
mvn clean package -DskipTests
+---+
- Once one of the above sets of commands completes successfully, the build will produce <lens-dist/target/lens-dist-version-bin/server> and <lens-dist/target/lens-dist-version-bin/client>. Former can be used as the Lens server installation directory and later can be used as Lens client installation directory to {{{/lenshome/install-and-run.html#Running_Lens} run}} lens server and lens client.
+ Once one of the above sets of commands completes successfully, the build will produce
+ <lens-dist/target/apache-lens-<version>-bin/apache-lens-<version>-bin/server> and
+ <lens-dist/target/apache-lens-<version>-bin/apache-lens-<version>-bin/client>. Former can be used as the Lens server
+ installation directory and later can be used as Lens client installation directory to
+ {{{/lenshome/install-and-run.html#Running_Lens} run}} lens server and lens client.
- The build will also produce debians for both client and server in <lens-dist/target>. Client debian uses </usr/local/lens-client> as the Lens client installation directory and Server debian uses </usr/local/lens> as the Lens server installation directory.
+ The build will also produce debians for both client and server in <lens-dist/target>. Client debian uses
+ </usr/local/lens/client> as the Lens client installation directory and Server debian uses </usr/local/lens/server> as
+ the Lens server installation directory.
- Apache Lens depends on Hive. Please {{{#Building_Hive_from_Source} build}} Hive from Source or install it using the documentation {{{/lenshome/install-and-run.html#Installing_Hive} here}}. After installing Lens and Hive, refer {{{/lenshome/install-and-run.html#Running_Lens} here}} for running lens client and lens server from installation directories.
+ Apache Lens depends on Hive. Please {{{#Building_Hive_from_Source} build}} Hive from Source or install it using the
+ documentation {{{/lenshome/install-and-run.html#Installing_Hive} here}}. After installing Lens and Hive,
+ refer {{{/lenshome/install-and-run.html#Running_Lens} here}} for running lens client and lens server from
+ installation directories.
** Building Hive from Source
@@ -130,7 +139,8 @@ Developer Documentation : How to contribute to Apache Lens?
+---+
- Once above package command completes successfully, <packaging/target> will have <apache-hive-$project.version-bin>. This build also produces source, binary tar.gz files and deb package for hive.
+ Once above package command completes successfully, <packaging/target> will have <apache-hive-$project.version-bin>.
+ This build also produces source, binary tar.gz files and deb package for hive.
Set the environment variable HIVE_HOME to point to the Hive installation directory built from source:
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/src/site/apt/lenshome/install-and-run.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/install-and-run.apt b/src/site/apt/lenshome/install-and-run.apt
index 6031cf9..8016491 100644
--- a/src/site/apt/lenshome/install-and-run.apt
+++ b/src/site/apt/lenshome/install-and-run.apt
@@ -38,10 +38,10 @@ Installing and Running Lens
+---+
- This will result in the creation of a directory named apache-lens-<verison> (where <version> is the release number).
+ This will result in the creation of a directory named apache-lens-<verison>-bin (where <version> is the release number).
+---+
- apache-lens-<verison>
+ apache-lens-<verison>-bin
├── client
├── LICENSE
├── NOTICE
@@ -51,7 +51,7 @@ Installing and Running Lens
└── server
+---+
- <apache-lens-<verison>/client> can be used as the Lens client installation directory and <apache-lens-<verison>/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
+ <apache-lens-<verison>-bin/client> can be used as the Lens client installation directory and <apache-lens-<verison>-bin/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
** Installing Hive
@@ -147,6 +147,9 @@ Installing and Running Lens
You can try out examples described below or use the REST api <link> for each service.
+ Lens server also comes with simple UI service which can be used to browse catalog and submit queries. Once the server
+ starts up, you can open the UI service on http://<serverhost>:19999/index.html and browse.
+
The command to stop the server:
+---+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index f5f6139..cf25530 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -24,4 +24,10 @@ All Apache Lens releases
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
|2.0.0| First release in Apache| {{{../versions/2.0.0-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-incubating/} Download}} | - | - |
-*--+--+---+--+--+--+--+
\ No newline at end of file
+*--+--+---+--+--+--+--+
+
+* NOTES
+
+ Binary distribution of the release does not include dependency org.acplt:oncrpc:jar:1.0.7, as its licensing (LGPL) is
+ not in compliance with Apache licensing which is required for ganglia metrics reporting. If user is interested in
+ ganglia metrics reporting, the jar needs to be downloaded and used.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/tools/scripts/lens-cli
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-cli b/tools/scripts/lens-cli
index 66106c1..18695ef 100644
--- a/tools/scripts/lens-cli
+++ b/tools/scripts/lens-cli
@@ -19,4 +19,4 @@
# under the License.
#
-exec /usr/local/lens-client/bin/lens-cli.sh "$@"
+exec /usr/local/lens/client/bin/lens-cli.sh "$@"
[25/30] incubator-lens git commit: [maven-release-plugin] prepare for
next development iteration
Posted by am...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/fe7abd04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/fe7abd04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/fe7abd04
Branch: refs/heads/master
Commit: fe7abd048649335d0baa43142ad34d3bd482049a
Parents: 095ad38
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Feb 20 12:51:07 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Fri Feb 20 12:51:07 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +-----
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
pom.xml | 8 ++++----
16 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index f06297c..d04bae0 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.0.0-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index c7ccb3e..f3a9fd6 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index de98263..c65289c 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index db8f8d7..55ac799 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index af8a117..4deb58b 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index a604080..dd62f44 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 6238097..4de3cdc 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 458441b..41305af 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index cf6ab5e..201457c 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 0e31479..11514ea 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 2fa3ceb..f390baa 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 9a0887b..3518130 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 5ccb8c4..3863997 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index fe8d69a..27834bc 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 4c6ca99..f7e1f35 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fe7abd04/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c345d0..71e7929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -170,7 +170,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-falcon.git</url>
- <tag>apache-lens-2.0.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -430,7 +430,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1057,7 +1057,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.0-incubating</version>
+ <version>2.0.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[11/30] incubator-lens git commit: LENS-220 : Update license and
notice for binary distribution (amareshwari)
Posted by am...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/LICENSE-LGPL
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE-LGPL b/bin-dist-files/LICENSE-LGPL
new file mode 100644
index 0000000..cdd4e8d
--- /dev/null
+++ b/bin-dist-files/LICENSE-LGPL
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/NOTICE
----------------------------------------------------------------------
diff --git a/bin-dist-files/NOTICE b/bin-dist-files/NOTICE
new file mode 100644
index 0000000..831ae64
--- /dev/null
+++ b/bin-dist-files/NOTICE
@@ -0,0 +1,56 @@
+Apache Lens (incubating)
+
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+This product includes jquery.flot.js (http://www.flotcharts.org/)
+
+This product includes moment.js(http://momentjs.com/)
+
+This product includes sql.js, codemirror.min.js, codemirror.min.css (http://codemirror.net/)
+
+This product includes stupidtable.min.js (http://joequery.github.io/Stupid-Table-Plugin/)
+
+This product includes javax.mail library. The details on how to obtain the library is available at
+https://glassfish.java.net/javaee5/mail/
+
+This product includes jersey libraries : jersey-server, jersey-client, jersey-media-multipart, jersey-media-json-jackson,
+jersey-media-moxy, jersey-container-grizzly2-servlet, jersey-container-grizzly2-http, jersey-container-servlet,
+jersey-container-servlet-core, jersey-entity-filtering and jersey-common. The details on how to obtain those modules
+are available at https://jersey.java.net/.
+
+This product includes grizzly libraries : grizzly-http-server, grizzly-framework, grizzly-http, grizzly-http-servlet.
+The details on how to obtain those libraries is available at https://grizzly.java.net/.
+
+This product includes javax.ws.rs-api library. The details on how to obtain the library is available at
+http://jax-rs-spec.java.net.
+
+This product includes jaxb-api library. The details on how to obtain the library is available at https://jaxb.java.net/.
+
+This product includes javax.servlet library. The details on how to obtain the library is available at
+http://servlet-spec.java.net/.
+
+This product includes HK2 libraries : hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api, javax.inject
+and osgi-resource-locator. The details on how to obtain those libraries is available at https://hk2.java.net/.
+
+This product includes mimepull library. The details on how to obtain the library is available at
+http://mimepull.java.net.
+
+This product includes javax.annotation API. The details on how to obtain the library is available at
+http://jcp.org/en/jsr/detail?id=250.
+
+This product includes EclipseLink libraries : org.eclipse.persistence.moxy, org.eclipse.persistence.core,
+org.eclipse.persistence.asm and org.eclipse.persistence.antlr. The details on how to obtain those libraries is
+available at http://www.eclipse.org/eclipselink.
+
+This product includes JavaBeans Activation Framework(javax.activation:activation). The details on how to obtain the
+library is available at http://java.sun.com/products/javabeans/jaf/index.jsp.
+
+This product includes c3p0 library. The details on how to obtain the library is available at
+http://www.mchange.com/projects/c3p0/.
+
+This product includes mchange-commons-java. The details on how to obtain the library is available at
+https://github.com/swaldman/mchange-commons-java.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/bin-dist-files/README
----------------------------------------------------------------------
diff --git a/bin-dist-files/README b/bin-dist-files/README
new file mode 100644
index 0000000..3e74fb9
--- /dev/null
+++ b/bin-dist-files/README
@@ -0,0 +1 @@
+README for binary distribution
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java b/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
index a4c5a4d..a13a220 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
@@ -480,8 +480,10 @@ public class LensMetadataClient {
}
return Joiner.on("\n").skipNulls().join(content);
} catch (IOException e) {
+ LOG.error("IO Error reading content ", e);
throw new IllegalStateException(e);
} catch (URISyntaxException e) {
+ LOG.error("URI Error reading content ", e);
throw new IllegalStateException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 896abc8..eef8436 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -34,55 +34,99 @@
<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>
+ <artifactId>lens-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lens</groupId>
- <artifactId>lens-server-api</artifactId>
+ <artifactId>lens-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lens</groupId>
- <artifactId>lens-driver-hive</artifactId>
+ <artifactId>lens-examples</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>lens-cube</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>lens-driver-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>lens-storage-db</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>runtime</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>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -92,6 +136,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
+ <finalName>apache-lens-${project.version}</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<descriptors>
<descriptor>src/main/assembly/bin-dist.xml</descriptor>
@@ -124,7 +169,7 @@
<deb>${project.build.directory}/lens-server_${project.version}.deb</deb>
<dataSet>
<data>
- <src>target/lens-dist-${project.version}-bin/server</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/server</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -132,7 +177,7 @@
</mapper>
</data>
<data>
- <src>target/lens-dist-${project.version}-bin/server/bin</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/server/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -155,7 +200,7 @@
<deb>${project.build.directory}/lens-client_${project.version}.deb</deb>
<dataSet>
<data>
- <src>target/lens-dist-${project.version}-bin/client</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/client</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -163,7 +208,7 @@
</mapper>
</data>
<data>
- <src>target/lens-dist-${project.version}-bin/client/bin</src>
+ <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/client/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
@@ -171,15 +216,6 @@
<filemode>755</filemode>
</mapper>
</data>
- <data>
- <src>target/lens-dist-${project.version}-bin/examples</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <prefix>${mvn.lens.install.dir}/client/examples</prefix>
- <filemode>644</filemode>
- </mapper>
- </data>
</dataSet>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/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
index 2207d4f..4ec2d55 100644
--- a/lens-dist/src/main/assembly/bin-dist.xml
+++ b/lens-dist/src/main/assembly/bin-dist.xml
@@ -28,34 +28,19 @@
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-lens</baseDirectory>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>apache-lens-${project.version}</baseDirectory>
+ <includeBaseDirectory>true</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>
@@ -75,15 +60,11 @@
<fileSets>
<fileSet>
- <directory>../doc/</directory>
- <outputDirectory>/doc/</outputDirectory>
+ <directory>../bin-dist-files/</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>**</include>
</includes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>lib/**</exclude>
- </excludes>
</fileSet>
<fileSet>
@@ -158,7 +139,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/resources</outputDirectory>
+ <outputDirectory>/client/examples/resources</outputDirectory>
<includes>
<include>*.xml</include>
<include>*.sql</include>
@@ -167,7 +148,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/dim1_local</outputDirectory>
+ <outputDirectory>/client/examples/data/dim1_local</outputDirectory>
<includes>
<include>dim1-local.data</include>
</includes>
@@ -175,7 +156,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/dim2_local</outputDirectory>
+ <outputDirectory>/client/examples/data/dim2_local</outputDirectory>
<includes>
<include>dim2-local.data</include>
</includes>
@@ -183,7 +164,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/dim4_local</outputDirectory>
+ <outputDirectory>/client/examples/data/dim4_local</outputDirectory>
<includes>
<include>dim4-local.data</include>
</includes>
@@ -191,7 +172,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact1_local1</outputDirectory>
+ <outputDirectory>/client/examples/data/fact1_local1</outputDirectory>
<includes>
<include>fact1-local1*.data</include>
</includes>
@@ -199,7 +180,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact1_local2</outputDirectory>
+ <outputDirectory>/client/examples/data/fact1_local2</outputDirectory>
<includes>
<include>fact1-local2*.data</include>
</includes>
@@ -207,7 +188,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact1_local3</outputDirectory>
+ <outputDirectory>/client/examples/data/fact1_local3</outputDirectory>
<includes>
<include>fact1-local3*.data</include>
</includes>
@@ -215,7 +196,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact2_local1</outputDirectory>
+ <outputDirectory>/client/examples/data/fact2_local1</outputDirectory>
<includes>
<include>fact2-local1*.data</include>
</includes>
@@ -223,7 +204,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact2_local2</outputDirectory>
+ <outputDirectory>/client/examples/data/fact2_local2</outputDirectory>
<includes>
<include>fact2-local2*.data</include>
</includes>
@@ -231,7 +212,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/fact2_local3</outputDirectory>
+ <outputDirectory>/client/examples/data/fact2_local3</outputDirectory>
<includes>
<include>fact2-local3*.data</include>
</includes>
@@ -239,7 +220,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local1</outputDirectory>
+ <outputDirectory>/client/examples/data/raw_local1</outputDirectory>
<includes>
<include>raw-local1*.data</include>
</includes>
@@ -247,7 +228,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local2</outputDirectory>
+ <outputDirectory>/client/examples/data/raw_local2</outputDirectory>
<includes>
<include>raw-local2*.data</include>
</includes>
@@ -255,7 +236,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local3</outputDirectory>
+ <outputDirectory>/client/examples/data/raw_local3</outputDirectory>
<includes>
<include>raw-local3*.data</include>
</includes>
@@ -263,7 +244,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local4</outputDirectory>
+ <outputDirectory>/client/examples/data/raw_local4</outputDirectory>
<includes>
<include>raw-local4*.data</include>
</includes>
@@ -271,7 +252,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local5</outputDirectory>
+ <outputDirectory>/client/examples/data/raw_local5</outputDirectory>
<includes>
<include>raw-local5*.data</include>
</includes>
@@ -279,7 +260,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/data/raw_local6</outputDirectory>
+ <outputDirectory>/client/examples/data/raw_local6</outputDirectory>
<includes>
<include>raw-local6*.data</include>
</includes>
@@ -287,7 +268,7 @@
<fileSet>
<directory>../lens-examples/src/main/resources/</directory>
- <outputDirectory>/examples/queries</outputDirectory>
+ <outputDirectory>/client/examples/queries</outputDirectory>
<includes>
<include>*.txt</include>
</includes>
@@ -316,6 +297,13 @@
<outputDirectory>/server/webapp/</outputDirectory>
<destName>lens-server.war</destName>
</file>
+
+ <file>
+ <source>../DISCLAIMER</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>DISCLAIMER</destName>
+ </file>
+
</files>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 4e6f322..9f4078a 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -53,7 +53,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>c3p0</groupId>
+ <groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 7cade05..df1dac2 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
+ <artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 2cb8a6f..b0b5305 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -72,7 +72,6 @@
<groupId>org.apache.lens</groupId>
<artifactId>lens-driver-jdbc</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.lens</groupId>
@@ -81,6 +80,12 @@
</dependency>
<dependency>
<groupId>org.apache.lens</groupId>
+ <artifactId>lens-storage-db</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lens</groupId>
<artifactId>lens-driver-hive</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a15463..a245f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<liquibase.version>3.0.7</liquibase.version>
<spring.shell.version>1.0.0.RELEASE</spring.shell.version>
- <c3p0.version>0.9.1.2</c3p0.version>
+ <c3p0.version>0.9.5</c3p0.version>
<hsqldb.version>2.2.9</hsqldb.version>
<dbcp.version>1.4</dbcp.version>
<dbutils.version>1.5</dbutils.version>
@@ -358,6 +358,7 @@
<excludes>
<exclude>README.*</exclude>
<exclude>DEPENDENCIES</exclude>
+ <exclude>**/LICENSE*</exclude>
<!-- Local git repo -->
<exclude>.git/**</exclude>
<!-- For connecting to ReviewBoard thru rbt tools-->
@@ -577,7 +578,6 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -613,12 +613,47 @@
<artifactId>jets3t</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
@@ -657,6 +692,42 @@
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -862,7 +933,7 @@
</dependency>
<dependency>
- <groupId>c3p0</groupId>
+ <groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>${c3p0.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/6ace656f/src/site/apt/lenshome/install-and-run.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/install-and-run.apt b/src/site/apt/lenshome/install-and-run.apt
index 98c1c66..6031cf9 100644
--- a/src/site/apt/lenshome/install-and-run.apt
+++ b/src/site/apt/lenshome/install-and-run.apt
@@ -34,20 +34,24 @@ Installing and Running Lens
+---+
- tar zxvf lens-dist-<verison>-bin.tar.gz
+ tar zxvf apache-lens-<verison>-bin.tar.gz
+---+
- This will result in the creation of a directory named lens-dist-<verison>-bin (where <version> is the release number).
+ This will result in the creation of a directory named apache-lens-<verison> (where <version> is the release number).
+---+
- lens-dist-<verison>-bin
+ apache-lens-<verison>
├── client
- ├── examples
+ ├── LICENSE
+ ├── NOTICE
+ ├── README
+ ├── DISCLAIMER
+ ├── LICENSE*
└── server
+---+
- <lens-dist-verison-bin/client> can be used as the Lens client installation directory and <lens-dist-verison-bin/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
+ <apache-lens-<verison>/client> can be used as the Lens client installation directory and <apache-lens-<verison>/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
** Installing Hive
@@ -95,18 +99,17 @@ Installing and Running Lens
│ ├── lens-config.sh
│ └── lens-ctl
├── conf
+ │ ├── hivedriver-site.xml
+ │ ├── jdbcdriver-site.xml
+ │ ├── lens-env.sh
+ │ ├── lens-site.xml
+ │ └── log4j.properties
+ ├── conf-pseudo-distr
+ │ ├── hivedriver-site.xml
+ │ ├── jdbcdriver-site.xml
│ ├── lens-env.sh
│ ├── lens-site.xml
- │ ├── hive-site.xml
│ └── log4j.properties
- ├── lib
- │ ├── ST4-4.0.4.jar
- │ ├── activation-1.1.jar
- │ ├── ant-1.9.1.jar
- │ ├── ant-launcher-1.9.1.jar
- │ ├── antlr-2.7.7.jar
- …….
- │ └── zookeeper-3.4.5.jar
└── webapp
└── lens-server.war
+---+
[24/30] incubator-lens git commit: [maven-release-plugin] prepare
release apache-lens-2.0.0-incubating
Posted by am...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/095ad38e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/095ad38e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/095ad38e
Branch: refs/heads/master
Commit: 095ad38e9c7ca3fdd28ef456a59f5061074fcc39
Parents: 938ad9e
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Feb 20 12:50:38 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Fri Feb 20 12:50:38 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 9 ++++++---
lens-api/pom.xml | 5 ++---
lens-cli/pom.xml | 5 ++---
lens-client/pom.xml | 5 ++---
lens-cube/pom.xml | 5 ++---
lens-dist/pom.xml | 5 ++---
lens-driver-hive/pom.xml | 5 ++---
lens-driver-jdbc/pom.xml | 5 ++---
lens-examples/pom.xml | 5 ++---
lens-ml-lib/pom.xml | 5 ++---
lens-query-lib/pom.xml | 5 ++---
lens-regression/pom.xml | 5 ++---
lens-server-api/pom.xml | 5 ++---
lens-server/pom.xml | 5 ++---
lens-storage-db/pom.xml | 5 ++---
pom.xml | 11 +++++------
16 files changed, 39 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index a933b41..f06297c 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -17,8 +17,7 @@
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">
+<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>
<parent>
@@ -30,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
<build>
<plugins>
@@ -50,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.0.0-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 58cf04c..c7ccb3e 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -19,14 +19,13 @@
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">
+<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 API</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index ff7eca3..de98263 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 CLI</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 9dc0046..db8f8d7 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -19,13 +19,12 @@
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">
+<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>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 51eadba..af8a117 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 Cube</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index d132bf5..a604080 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 Distribution</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 3ef9617..6238097 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 Hive Driver</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 2e50fbd..458441b 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -19,14 +19,13 @@
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">
+<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 Driver for JDBC</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 6e872b2..cf6ab5e 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -19,14 +19,13 @@
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">
+<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 Examples</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 7cf8e53..0e31479 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 ML Lib</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 09a0431..2fa3ceb 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 Query Library</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 1fa6b84..9a0887b 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -19,14 +19,13 @@
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">
+<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 Regression</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index c7190cc..5ccb8c4 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -19,13 +19,12 @@
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">
+<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>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 608fad4..fe8d69a 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 Server</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 66ae006..4c6ca99 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -19,15 +19,14 @@
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">
+<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 DB storage</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/095ad38e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2684307..9c345d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,7 @@
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">
+<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>
<parent>
@@ -108,7 +107,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -171,7 +170,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-falcon.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.0.0-incubating</tag>
</scm>
<reporting>
@@ -431,7 +430,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</dependency>
</dependencies>
<executions>
@@ -1058,7 +1057,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.0-incubating-SNAPSHOT</version>
+ <version>2.0.0-incubating</version>
</dependency>
</dependencies>
<executions>
[20/30] incubator-lens git commit: LENS-319: Renamed Trainer to Algo
(sharad)
Posted by am...@apache.org.
LENS-319: Renamed Trainer to Algo (sharad)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/49fef8e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/49fef8e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/49fef8e2
Branch: refs/heads/master
Commit: 49fef8e2bb3995ee7d5b3db74bf954c205c187fc
Parents: ff152d9
Author: Sharad Agarwal <sh...@flipkarts-MacBook-Pro.local>
Authored: Wed Feb 18 14:40:17 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Feb 19 10:23:12 2015 +0530
----------------------------------------------------------------------
.../org/apache/lens/client/LensMLClient.java | 14 +-
.../apache/lens/client/LensMLJerseyClient.java | 14 +-
.../java/org/apache/lens/ml/AlgoArgParser.java | 114 ++++++++
.../main/java/org/apache/lens/ml/AlgoParam.java | 53 ++++
.../java/org/apache/lens/ml/Algorithms.java | 32 +-
.../main/java/org/apache/lens/ml/LensML.java | 6 +-
.../java/org/apache/lens/ml/LensMLImpl.java | 66 ++---
.../main/java/org/apache/lens/ml/MLAlgo.java | 53 ++++
.../main/java/org/apache/lens/ml/MLDriver.java | 18 +-
.../main/java/org/apache/lens/ml/MLModel.java | 4 +-
.../main/java/org/apache/lens/ml/MLTrainer.java | 53 ----
.../main/java/org/apache/lens/ml/MLUtils.java | 6 +-
.../org/apache/lens/ml/TrainerArgParser.java | 114 --------
.../java/org/apache/lens/ml/TrainerParam.java | 53 ----
.../org/apache/lens/ml/spark/SparkMLDriver.java | 42 +--
.../lens/ml/spark/algos/BaseSparkAlgo.java | 290 +++++++++++++++++++
.../lens/ml/spark/algos/DecisionTreeAlgo.java | 109 +++++++
.../apache/lens/ml/spark/algos/KMeansAlgo.java | 163 +++++++++++
.../ml/spark/algos/LogisticRegressionAlgo.java | 86 ++++++
.../lens/ml/spark/algos/NaiveBayesAlgo.java | 73 +++++
.../org/apache/lens/ml/spark/algos/SVMAlgo.java | 90 ++++++
.../ml/spark/trainers/BaseSparkTrainer.java | 289 ------------------
.../ml/spark/trainers/DecisionTreeTrainer.java | 109 -------
.../lens/ml/spark/trainers/KMeansTrainer.java | 163 -----------
.../trainers/LogisticRegressionTrainer.java | 86 ------
.../ml/spark/trainers/NaiveBayesTrainer.java | 73 -----
.../lens/ml/spark/trainers/SVMTrainer.java | 90 ------
.../java/org/apache/lens/ml/task/MLTask.java | 8 +-
.../apache/lens/server/ml/MLServiceImpl.java | 6 +-
.../lens/server/ml/MLServiceResource.java | 38 +--
.../java/org/apache/lens/ml/TestMLResource.java | 37 +--
31 files changed, 1177 insertions(+), 1175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
index 1bad7a0..9f7fa26 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLClient.java
@@ -35,9 +35,9 @@ import org.apache.lens.api.LensSessionHandle;
import org.apache.lens.api.ml.ModelMetadata;
import org.apache.lens.api.ml.TestReport;
import org.apache.lens.ml.LensML;
+import org.apache.lens.ml.MLAlgo;
import org.apache.lens.ml.MLModel;
import org.apache.lens.ml.MLTestReport;
-import org.apache.lens.ml.MLTrainer;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -81,7 +81,7 @@ public class LensMLClient implements LensML, Closeable {
*/
@Override
public List<String> getAlgorithms() {
- return client.getTrainerNames();
+ return client.getAlgoNames();
}
/**
@@ -92,7 +92,7 @@ public class LensMLClient implements LensML, Closeable {
*/
@Override
public Map<String, String> getAlgoParamDescription(String algorithm) {
- List<String> paramDesc = client.getParamDescriptionOfTrainer(algorithm);
+ List<String> paramDesc = client.getParamDescriptionOfAlgo(algorithm);
// convert paramDesc to map
Map<String, String> paramDescMap = new LinkedHashMap<String, String>();
for (String str : paramDesc) {
@@ -103,15 +103,15 @@ public class LensMLClient implements LensML, Closeable {
}
/**
- * Get a trainer object instance which could be used to generate a model of the given algorithm.
+ * Get a algo object instance which could be used to generate a model of the given algorithm.
*
* @param algorithm the algorithm
- * @return the trainer for name
+ * @return the algo for name
* @throws LensException the lens exception
*/
@Override
- public MLTrainer getTrainerForName(String algorithm) throws LensException {
- throw new UnsupportedOperationException("MLTrainer cannot be accessed from client");
+ public MLAlgo getAlgoForName(String algorithm) throws LensException {
+ throw new UnsupportedOperationException("MLAlgo cannot be accessed from client");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
index 2b1ece4..af47a41 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
@@ -134,9 +134,9 @@ public class LensMLJerseyClient {
}
}
- public List<String> getTrainerNames() {
- StringList trainerNames = getMLWebTarget().path("trainers").request().get(StringList.class);
- return trainerNames == null ? null : trainerNames.getElements();
+ public List<String> getAlgoNames() {
+ StringList algoNames = getMLWebTarget().path("algos").request().get(StringList.class);
+ return algoNames == null ? null : algoNames.getElements();
}
/**
@@ -234,14 +234,14 @@ public class LensMLJerseyClient {
}
/**
- * Gets the param description of trainer.
+ * Gets the param description of algo.
*
* @param algorithm the algorithm
- * @return the param description of trainer
+ * @return the param description of algo
*/
- public List<String> getParamDescriptionOfTrainer(String algorithm) {
+ public List<String> getParamDescriptionOfAlgo(String algorithm) {
try {
- StringList paramHelp = getMLWebTarget().path("trainers").path(algorithm).request(MediaType.APPLICATION_XML)
+ StringList paramHelp = getMLWebTarget().path("algos").path(algorithm).request(MediaType.APPLICATION_XML)
.get(StringList.class);
return paramHelp.getElements();
} catch (NotFoundException exc) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoArgParser.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoArgParser.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoArgParser.java
new file mode 100644
index 0000000..20da083
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoArgParser.java
@@ -0,0 +1,114 @@
+/**
+ * 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 org.apache.lens.ml;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The Class AlgoArgParser.
+ */
+public final class AlgoArgParser {
+ private AlgoArgParser() {
+ }
+
+ /**
+ * The Class CustomArgParser.
+ *
+ * @param <E> the element type
+ */
+ public abstract static class CustomArgParser<E> {
+
+ /**
+ * Parses the.
+ *
+ * @param value the value
+ * @return the e
+ */
+ public abstract E parse(String value);
+ }
+
+ /** The Constant LOG. */
+ public static final Log LOG = LogFactory.getLog(AlgoArgParser.class);
+
+ /**
+ * Extracts feature names. If the algo has any parameters associated with @AlgoParam annotation, those are set
+ * as well.
+ *
+ * @param algo the algo
+ * @param args the args
+ * @return List of feature column names.
+ */
+ public static List<String> parseArgs(MLAlgo algo, String[] args) {
+ List<String> featureColumns = new ArrayList<String>();
+ Class<? extends MLAlgo> algoClass = algo.getClass();
+ // Get param fields
+ Map<String, Field> fieldMap = new HashMap<String, Field>();
+
+ for (Field fld : algoClass.getDeclaredFields()) {
+ fld.setAccessible(true);
+ AlgoParam paramAnnotation = fld.getAnnotation(AlgoParam.class);
+ if (paramAnnotation != null) {
+ fieldMap.put(paramAnnotation.name(), fld);
+ }
+ }
+
+ for (int i = 0; i < args.length; i += 2) {
+ String key = args[i].trim();
+ String value = args[i + 1].trim();
+
+ try {
+ if ("feature".equalsIgnoreCase(key)) {
+ featureColumns.add(value);
+ } else if (fieldMap.containsKey(key)) {
+ Field f = fieldMap.get(key);
+ if (String.class.equals(f.getType())) {
+ f.set(algo, value);
+ } else if (Integer.TYPE.equals(f.getType())) {
+ f.setInt(algo, Integer.parseInt(value));
+ } else if (Double.TYPE.equals(f.getType())) {
+ f.setDouble(algo, Double.parseDouble(value));
+ } else if (Long.TYPE.equals(f.getType())) {
+ f.setLong(algo, Long.parseLong(value));
+ } else {
+ // check if the algo provides a deserializer for this param
+ String customParserClass = algo.getConf().getProperties().get("lens.ml.args." + key);
+ if (customParserClass != null) {
+ Class<? extends CustomArgParser<?>> clz = (Class<? extends CustomArgParser<?>>) Class
+ .forName(customParserClass);
+ CustomArgParser<?> parser = clz.newInstance();
+ f.set(algo, parser.parse(value));
+ } else {
+ LOG.warn("Ignored param " + key + "=" + value + " as no parser found");
+ }
+ }
+ }
+ } catch (Exception exc) {
+ LOG.error("Error while setting param " + key + " to " + value + " for algo " + algo);
+ }
+ }
+ return featureColumns;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoParam.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoParam.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoParam.java
new file mode 100644
index 0000000..5836f51
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/AlgoParam.java
@@ -0,0 +1,53 @@
+/**
+ * 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 org.apache.lens.ml;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The Interface AlgoParam.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface AlgoParam {
+
+ /**
+ * Name.
+ *
+ * @return the string
+ */
+ String name();
+
+ /**
+ * Help.
+ *
+ * @return the string
+ */
+ String help();
+
+ /**
+ * Default value.
+ *
+ * @return the string
+ */
+ String defaultValue() default "None";
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/Algorithms.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/Algorithms.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/Algorithms.java
index 3b74a09..c1b7212 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/Algorithms.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/Algorithms.java
@@ -32,41 +32,41 @@ import org.apache.lens.api.LensException;
public class Algorithms {
/** The algorithm classes. */
- private final Map<String, Class<? extends MLTrainer>> algorithmClasses
- = new HashMap<String, Class<? extends MLTrainer>>();
+ private final Map<String, Class<? extends MLAlgo>> algorithmClasses
+ = new HashMap<String, Class<? extends MLAlgo>>();
/**
* Register.
*
- * @param trainerClass the trainer class
+ * @param algoClass the algo class
*/
- public void register(Class<? extends MLTrainer> trainerClass) {
- if (trainerClass != null && trainerClass.getAnnotation(Algorithm.class) != null) {
- algorithmClasses.put(trainerClass.getAnnotation(Algorithm.class).name(), trainerClass);
+ public void register(Class<? extends MLAlgo> algoClass) {
+ if (algoClass != null && algoClass.getAnnotation(Algorithm.class) != null) {
+ algorithmClasses.put(algoClass.getAnnotation(Algorithm.class).name(), algoClass);
} else {
- throw new IllegalArgumentException("Not a valid algorithm class: " + trainerClass);
+ throw new IllegalArgumentException("Not a valid algorithm class: " + algoClass);
}
}
/**
- * Gets the trainer for name.
+ * Gets the algo for name.
*
* @param name the name
- * @return the trainer for name
+ * @return the algo for name
* @throws LensException the lens exception
*/
- public MLTrainer getTrainerForName(String name) throws LensException {
- Class<? extends MLTrainer> trainerClass = algorithmClasses.get(name);
- if (trainerClass == null) {
+ public MLAlgo getAlgoForName(String name) throws LensException {
+ Class<? extends MLAlgo> algoClass = algorithmClasses.get(name);
+ if (algoClass == null) {
return null;
}
- Algorithm algoAnnotation = trainerClass.getAnnotation(Algorithm.class);
+ Algorithm algoAnnotation = algoClass.getAnnotation(Algorithm.class);
String description = algoAnnotation.description();
try {
- Constructor<? extends MLTrainer> trainerConstructor = trainerClass.getConstructor(String.class, String.class);
- return trainerConstructor.newInstance(name, description);
+ Constructor<? extends MLAlgo> algoConstructor = algoClass.getConstructor(String.class, String.class);
+ return algoConstructor.newInstance(name, description);
} catch (Exception exc) {
- throw new LensException("Unable to get trainer: " + name, exc);
+ throw new LensException("Unable to get algo: " + name, exc);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/LensML.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/LensML.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/LensML.java
index 9a15ea0..fe65d2f 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/LensML.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/LensML.java
@@ -48,13 +48,13 @@ public interface LensML {
Map<String, String> getAlgoParamDescription(String algorithm);
/**
- * Get a trainer object instance which could be used to generate a model of the given algorithm.
+ * Get a algo object instance which could be used to generate a model of the given algorithm.
*
* @param algorithm the algorithm
- * @return the trainer for name
+ * @return the algo for name
* @throws LensException the lens exception
*/
- MLTrainer getTrainerForName(String algorithm) throws LensException;
+ MLAlgo getAlgoForName(String algorithm) throws LensException;
/**
* Create a model using the given HCatalog table as input. The arguments should contain information needeed to
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/LensMLImpl.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/LensMLImpl.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/LensMLImpl.java
index 7cd0580..2555ca0 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/LensMLImpl.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/LensMLImpl.java
@@ -35,7 +35,7 @@ import org.apache.lens.api.query.LensQuery;
import org.apache.lens.api.query.QueryHandle;
import org.apache.lens.api.query.QueryStatus;
import org.apache.lens.ml.spark.SparkMLDriver;
-import org.apache.lens.ml.spark.trainers.BaseSparkTrainer;
+import org.apache.lens.ml.spark.algos.BaseSparkAlgo;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.commons.io.IOUtils;
@@ -93,25 +93,25 @@ public class LensMLImpl implements LensML {
}
public List<String> getAlgorithms() {
- List<String> trainers = new ArrayList<String>();
+ List<String> algos = new ArrayList<String>();
for (MLDriver driver : drivers) {
- trainers.addAll(driver.getTrainerNames());
+ algos.addAll(driver.getAlgoNames());
}
- return trainers;
+ return algos;
}
/*
* (non-Javadoc)
*
- * @see org.apache.lens.ml.LensML#getTrainerForName(java.lang.String)
+ * @see org.apache.lens.ml.LensML#getAlgoForName(java.lang.String)
*/
- public MLTrainer getTrainerForName(String algorithm) throws LensException {
+ public MLAlgo getAlgoForName(String algorithm) throws LensException {
for (MLDriver driver : drivers) {
- if (driver.isTrainerSupported(algorithm)) {
- return driver.getTrainerInstance(algorithm);
+ if (driver.isAlgoSupported(algorithm)) {
+ return driver.getAlgoInstance(algorithm);
}
}
- throw new LensException("Trainer not supported " + algorithm);
+ throw new LensException("Algo not supported " + algorithm);
}
/*
@@ -120,11 +120,11 @@ public class LensMLImpl implements LensML {
* @see org.apache.lens.ml.LensML#train(java.lang.String, java.lang.String, java.lang.String[])
*/
public String train(String table, String algorithm, String[] args) throws LensException {
- MLTrainer trainer = getTrainerForName(algorithm);
+ MLAlgo algo = getAlgoForName(algorithm);
String modelId = UUID.randomUUID().toString();
- LOG.info("Begin training model " + modelId + ", trainer=" + algorithm + ", table=" + table + ", params="
+ LOG.info("Begin training model " + modelId + ", algo=" + algorithm + ", table=" + table + ", params="
+ Arrays.toString(args));
String database = null;
@@ -134,33 +134,33 @@ public class LensMLImpl implements LensML {
database = "default";
}
- MLModel model = trainer.train(toLensConf(conf), database, table, modelId, args);
+ MLModel model = algo.train(toLensConf(conf), database, table, modelId, args);
LOG.info("Done training model: " + modelId);
model.setCreatedAt(new Date());
- model.setTrainerName(algorithm);
+ model.setAlgoName(algorithm);
Path modelLocation = null;
try {
modelLocation = persistModel(model);
- LOG.info("Model saved: " + modelId + ", trainer: " + algorithm + ", path: " + modelLocation);
+ LOG.info("Model saved: " + modelId + ", algo: " + algorithm + ", path: " + modelLocation);
return model.getId();
} catch (IOException e) {
- throw new LensException("Error saving model " + modelId + " for trainer " + algorithm, e);
+ throw new LensException("Error saving model " + modelId + " for algo " + algorithm, e);
}
}
/**
- * Gets the trainer dir.
+ * Gets the algo dir.
*
- * @param trainerName the trainer name
- * @return the trainer dir
+ * @param algoName the algo name
+ * @return the algo dir
* @throws IOException Signals that an I/O exception has occurred.
*/
- private Path getTrainerDir(String trainerName) throws IOException {
+ private Path getAlgoDir(String algoName) throws IOException {
String modelSaveBaseDir = conf.get(ModelLoader.MODEL_PATH_BASE_DIR, ModelLoader.MODEL_PATH_BASE_DIR_DEFAULT);
- return new Path(new Path(modelSaveBaseDir), trainerName);
+ return new Path(new Path(modelSaveBaseDir), algoName);
}
/**
@@ -172,14 +172,14 @@ public class LensMLImpl implements LensML {
*/
private Path persistModel(MLModel model) throws IOException {
// Get model save path
- Path trainerDir = getTrainerDir(model.getTrainerName());
- FileSystem fs = trainerDir.getFileSystem(conf);
+ Path algoDir = getAlgoDir(model.getAlgoName());
+ FileSystem fs = algoDir.getFileSystem(conf);
- if (!fs.exists(trainerDir)) {
- fs.mkdirs(trainerDir);
+ if (!fs.exists(algoDir)) {
+ fs.mkdirs(algoDir);
}
- Path modelSavePath = new Path(trainerDir, model.getId());
+ Path modelSavePath = new Path(algoDir, model.getId());
ObjectOutputStream outputStream = null;
try {
@@ -202,15 +202,15 @@ public class LensMLImpl implements LensML {
*/
public List<String> getModels(String algorithm) throws LensException {
try {
- Path trainerDir = getTrainerDir(algorithm);
- FileSystem fs = trainerDir.getFileSystem(conf);
- if (!fs.exists(trainerDir)) {
+ Path algoDir = getAlgoDir(algorithm);
+ FileSystem fs = algoDir.getFileSystem(conf);
+ if (!fs.exists(algoDir)) {
return null;
}
List<String> models = new ArrayList<String>();
- for (FileStatus stat : fs.listStatus(trainerDir)) {
+ for (FileStatus stat : fs.listStatus(algoDir)) {
models.add(stat.getPath().getName());
}
@@ -563,15 +563,15 @@ public class LensMLImpl implements LensML {
* @see org.apache.lens.ml.LensML#getAlgoParamDescription(java.lang.String)
*/
public Map<String, String> getAlgoParamDescription(String algorithm) {
- MLTrainer trainer = null;
+ MLAlgo algo = null;
try {
- trainer = getTrainerForName(algorithm);
+ algo = getAlgoForName(algorithm);
} catch (LensException e) {
LOG.error("Error getting algo description : " + algorithm, e);
return null;
}
- if (trainer instanceof BaseSparkTrainer) {
- return ((BaseSparkTrainer) trainer).getArgUsage();
+ if (algo instanceof BaseSparkAlgo) {
+ return ((BaseSparkAlgo) algo).getArgUsage();
}
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/MLAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLAlgo.java
new file mode 100644
index 0000000..7dccf2c
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLAlgo.java
@@ -0,0 +1,53 @@
+/**
+ * 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 org.apache.lens.ml;
+
+import org.apache.lens.api.LensConf;
+import org.apache.lens.api.LensException;
+
+/**
+ * The Interface MLAlgo.
+ */
+public interface MLAlgo {
+ String getName();
+
+ String getDescription();
+
+ /**
+ * Configure.
+ *
+ * @param configuration the configuration
+ */
+ void configure(LensConf configuration);
+
+ LensConf getConf();
+
+ /**
+ * Train.
+ *
+ * @param conf the conf
+ * @param db the db
+ * @param table the table
+ * @param modelId the model id
+ * @param params the params
+ * @return the ML model
+ * @throws LensException the lens exception
+ */
+ MLModel train(LensConf conf, String db, String table, String modelId, String... params) throws LensException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/MLDriver.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLDriver.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLDriver.java
index 562253a..567e717 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLDriver.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLDriver.java
@@ -29,21 +29,21 @@ import org.apache.lens.api.LensException;
public interface MLDriver {
/**
- * Checks if is trainer supported.
+ * Checks if is algo supported.
*
- * @param trainer the trainer
- * @return true, if is trainer supported
+ * @param algo the algo
+ * @return true, if is algo supported
*/
- boolean isTrainerSupported(String trainer);
+ boolean isAlgoSupported(String algo);
/**
- * Gets the trainer instance.
+ * Gets the algo instance.
*
- * @param trainer the trainer
- * @return the trainer instance
+ * @param algo the algo
+ * @return the algo instance
* @throws LensException the lens exception
*/
- MLTrainer getTrainerInstance(String trainer) throws LensException;
+ MLAlgo getAlgoInstance(String algo) throws LensException;
/**
* Inits the.
@@ -67,5 +67,5 @@ public interface MLDriver {
*/
void stop() throws LensException;
- List<String> getTrainerNames();
+ List<String> getAlgoNames();
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/MLModel.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLModel.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLModel.java
index 863cdfe..c177757 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLModel.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLModel.java
@@ -44,10 +44,10 @@ public abstract class MLModel<PREDICTION> implements Serializable {
@Setter
private Date createdAt;
- /** The trainer name. */
+ /** The algo name. */
@Getter
@Setter
- private String trainerName;
+ private String algoName;
/** The table. */
@Getter
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/MLTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLTrainer.java
deleted file mode 100644
index f1ae291..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLTrainer.java
+++ /dev/null
@@ -1,53 +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 org.apache.lens.ml;
-
-import org.apache.lens.api.LensConf;
-import org.apache.lens.api.LensException;
-
-/**
- * The Interface MLTrainer.
- */
-public interface MLTrainer {
- String getName();
-
- String getDescription();
-
- /**
- * Configure.
- *
- * @param configuration the configuration
- */
- void configure(LensConf configuration);
-
- LensConf getConf();
-
- /**
- * Train.
- *
- * @param conf the conf
- * @param db the db
- * @param table the table
- * @param modelId the model id
- * @param params the params
- * @return the ML model
- * @throws LensException the lens exception
- */
- MLModel train(LensConf conf, String db, String table, String modelId, String... params) throws LensException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/MLUtils.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLUtils.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLUtils.java
index 4ea8773..2e240af 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/MLUtils.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/MLUtils.java
@@ -39,12 +39,12 @@ public final class MLUtils {
HIVE_CONF.addResource("lens-site.xml");
}
- public static String getTrainerName(Class<? extends MLTrainer> trainerClass) {
- Algorithm annotation = trainerClass.getAnnotation(Algorithm.class);
+ public static String getAlgoName(Class<? extends MLAlgo> algoClass) {
+ Algorithm annotation = algoClass.getAnnotation(Algorithm.class);
if (annotation != null) {
return annotation.name();
}
- throw new IllegalArgumentException("Trainer should be decorated with annotation - " + Algorithm.class.getName());
+ throw new IllegalArgumentException("Algo should be decorated with annotation - " + Algorithm.class.getName());
}
public static MLServiceImpl getMLService() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerArgParser.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerArgParser.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerArgParser.java
deleted file mode 100644
index 92c025d..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerArgParser.java
+++ /dev/null
@@ -1,114 +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 org.apache.lens.ml;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * The Class TrainerArgParser.
- */
-public final class TrainerArgParser {
- private TrainerArgParser() {
- }
-
- /**
- * The Class CustomArgParser.
- *
- * @param <E> the element type
- */
- public abstract static class CustomArgParser<E> {
-
- /**
- * Parses the.
- *
- * @param value the value
- * @return the e
- */
- public abstract E parse(String value);
- }
-
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(TrainerArgParser.class);
-
- /**
- * Extracts feature names. If the trainer has any parameters associated with @TrainerParam annotation, those are set
- * as well.
- *
- * @param trainer the trainer
- * @param args the args
- * @return List of feature column names.
- */
- public static List<String> parseArgs(MLTrainer trainer, String[] args) {
- List<String> featureColumns = new ArrayList<String>();
- Class<? extends MLTrainer> trainerClass = trainer.getClass();
- // Get param fields
- Map<String, Field> fieldMap = new HashMap<String, Field>();
-
- for (Field fld : trainerClass.getDeclaredFields()) {
- fld.setAccessible(true);
- TrainerParam paramAnnotation = fld.getAnnotation(TrainerParam.class);
- if (paramAnnotation != null) {
- fieldMap.put(paramAnnotation.name(), fld);
- }
- }
-
- for (int i = 0; i < args.length; i += 2) {
- String key = args[i].trim();
- String value = args[i + 1].trim();
-
- try {
- if ("feature".equalsIgnoreCase(key)) {
- featureColumns.add(value);
- } else if (fieldMap.containsKey(key)) {
- Field f = fieldMap.get(key);
- if (String.class.equals(f.getType())) {
- f.set(trainer, value);
- } else if (Integer.TYPE.equals(f.getType())) {
- f.setInt(trainer, Integer.parseInt(value));
- } else if (Double.TYPE.equals(f.getType())) {
- f.setDouble(trainer, Double.parseDouble(value));
- } else if (Long.TYPE.equals(f.getType())) {
- f.setLong(trainer, Long.parseLong(value));
- } else {
- // check if the trainer provides a deserializer for this param
- String customParserClass = trainer.getConf().getProperties().get("lens.ml.args." + key);
- if (customParserClass != null) {
- Class<? extends CustomArgParser<?>> clz = (Class<? extends CustomArgParser<?>>) Class
- .forName(customParserClass);
- CustomArgParser<?> parser = clz.newInstance();
- f.set(trainer, parser.parse(value));
- } else {
- LOG.warn("Ignored param " + key + "=" + value + " as no parser found");
- }
- }
- }
- } catch (Exception exc) {
- LOG.error("Error while setting param " + key + " to " + value + " for trainer " + trainer);
- }
- }
- return featureColumns;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerParam.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerParam.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerParam.java
deleted file mode 100644
index fe8af60..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/TrainerParam.java
+++ /dev/null
@@ -1,53 +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 org.apache.lens.ml;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The Interface TrainerParam.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface TrainerParam {
-
- /**
- * Name.
- *
- * @return the string
- */
- String name();
-
- /**
- * Help.
- *
- * @return the string
- */
- String help();
-
- /**
- * Default value.
- *
- * @return the string
- */
- String defaultValue() default "None";
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/SparkMLDriver.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/SparkMLDriver.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/SparkMLDriver.java
index b19e8ea..1e452f1 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/SparkMLDriver.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/SparkMLDriver.java
@@ -26,9 +26,9 @@ import java.util.List;
import org.apache.lens.api.LensConf;
import org.apache.lens.api.LensException;
import org.apache.lens.ml.Algorithms;
+import org.apache.lens.ml.MLAlgo;
import org.apache.lens.ml.MLDriver;
-import org.apache.lens.ml.MLTrainer;
-import org.apache.lens.ml.spark.trainers.*;
+import org.apache.lens.ml.spark.algos.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -90,46 +90,46 @@ public class SparkMLDriver implements MLDriver {
/*
* (non-Javadoc)
*
- * @see org.apache.lens.ml.MLDriver#isTrainerSupported(java.lang.String)
+ * @see org.apache.lens.ml.MLDriver#isAlgoSupported(java.lang.String)
*/
@Override
- public boolean isTrainerSupported(String name) {
+ public boolean isAlgoSupported(String name) {
return algorithms.isAlgoSupported(name);
}
/*
* (non-Javadoc)
*
- * @see org.apache.lens.ml.MLDriver#getTrainerInstance(java.lang.String)
+ * @see org.apache.lens.ml.MLDriver#getAlgoInstance(java.lang.String)
*/
@Override
- public MLTrainer getTrainerInstance(String name) throws LensException {
+ public MLAlgo getAlgoInstance(String name) throws LensException {
checkStarted();
- if (!isTrainerSupported(name)) {
+ if (!isAlgoSupported(name)) {
return null;
}
- MLTrainer trainer = null;
+ MLAlgo algo = null;
try {
- trainer = algorithms.getTrainerForName(name);
- if (trainer instanceof BaseSparkTrainer) {
- ((BaseSparkTrainer) trainer).setSparkContext(sparkContext);
+ algo = algorithms.getAlgoForName(name);
+ if (algo instanceof BaseSparkAlgo) {
+ ((BaseSparkAlgo) algo).setSparkContext(sparkContext);
}
} catch (LensException exc) {
- LOG.error("Error creating trainer object", exc);
+ LOG.error("Error creating algo object", exc);
}
- return trainer;
+ return algo;
}
/**
- * Register trainers.
+ * Register algos.
*/
- private void registerTrainers() {
- algorithms.register(NaiveBayesTrainer.class);
- algorithms.register(SVMTrainer.class);
- algorithms.register(LogisticRegressionTrainer.class);
- algorithms.register(DecisionTreeTrainer.class);
+ private void registerAlgos() {
+ algorithms.register(NaiveBayesAlgo.class);
+ algorithms.register(SVMAlgo.class);
+ algorithms.register(LogisticRegressionAlgo.class);
+ algorithms.register(DecisionTreeAlgo.class);
}
/*
@@ -140,7 +140,7 @@ public class SparkMLDriver implements MLDriver {
@Override
public void init(LensConf conf) throws LensException {
sparkConf = new SparkConf();
- registerTrainers();
+ registerAlgos();
for (String key : conf.getProperties().keySet()) {
if (key.startsWith("lens.ml.sparkdriver.")) {
sparkConf.set(key.substring("lens.ml.sparkdriver.".length()), conf.getProperties().get(key));
@@ -253,7 +253,7 @@ public class SparkMLDriver implements MLDriver {
}
@Override
- public List<String> getTrainerNames() {
+ public List<String> getAlgoNames() {
return algorithms.getAlgorithmNames();
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/BaseSparkAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/BaseSparkAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/BaseSparkAlgo.java
new file mode 100644
index 0000000..22cda6d
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/BaseSparkAlgo.java
@@ -0,0 +1,290 @@
+/**
+ * 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 org.apache.lens.ml.spark.algos;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+import org.apache.lens.api.LensConf;
+import org.apache.lens.api.LensException;
+import org.apache.lens.ml.AlgoParam;
+import org.apache.lens.ml.Algorithm;
+import org.apache.lens.ml.MLAlgo;
+import org.apache.lens.ml.MLModel;
+
+import org.apache.lens.ml.spark.TableTrainingSpec;
+import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.mllib.regression.LabeledPoint;
+import org.apache.spark.rdd.RDD;
+
+/**
+ * The Class BaseSparkAlgo.
+ */
+public abstract class BaseSparkAlgo implements MLAlgo {
+
+ /** The Constant LOG. */
+ public static final Log LOG = LogFactory.getLog(BaseSparkAlgo.class);
+
+ /** The name. */
+ private final String name;
+
+ /** The description. */
+ private final String description;
+
+ /** The spark context. */
+ protected JavaSparkContext sparkContext;
+
+ /** The params. */
+ protected Map<String, String> params;
+
+ /** The conf. */
+ protected transient LensConf conf;
+
+ /** The training fraction. */
+ @AlgoParam(name = "trainingFraction", help = "% of dataset to be used for training", defaultValue = "0")
+ protected double trainingFraction;
+
+ /** The use training fraction. */
+ private boolean useTrainingFraction;
+
+ /** The label. */
+ @AlgoParam(name = "label", help = "Name of column which is used as a training label for supervised learning")
+ protected String label;
+
+ /** The partition filter. */
+ @AlgoParam(name = "partition", help = "Partition filter used to create create HCatInputFormats")
+ protected String partitionFilter;
+
+ /** The features. */
+ @AlgoParam(name = "feature", help = "Column name(s) which are to be used as sample features")
+ protected List<String> features;
+
+ /**
+ * Instantiates a new base spark algo.
+ *
+ * @param name the name
+ * @param description the description
+ */
+ public BaseSparkAlgo(String name, String description) {
+ this.name = name;
+ this.description = description;
+ }
+
+ public void setSparkContext(JavaSparkContext sparkContext) {
+ this.sparkContext = sparkContext;
+ }
+
+ @Override
+ public LensConf getConf() {
+ return conf;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.MLAlgo#configure(org.apache.lens.api.LensConf)
+ */
+ @Override
+ public void configure(LensConf configuration) {
+ this.conf = configuration;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.MLAlgo#train(org.apache.lens.api.LensConf, java.lang.String, java.lang.String,
+ * java.lang.String, java.lang.String[])
+ */
+ @Override
+ public MLModel<?> train(LensConf conf, String db, String table, String modelId, String... params)
+ throws LensException {
+ parseParams(params);
+
+ TableTrainingSpec.TableTrainingSpecBuilder builder = TableTrainingSpec.newBuilder().hiveConf(toHiveConf(conf))
+ .database(db).table(table).partitionFilter(partitionFilter).featureColumns(features).labelColumn(label);
+
+ if (useTrainingFraction) {
+ builder.trainingFraction(trainingFraction);
+ }
+
+ TableTrainingSpec spec = builder.build();
+ LOG.info("Training " + " with " + features.size() + " features");
+
+ spec.createRDDs(sparkContext);
+
+ RDD<LabeledPoint> trainingRDD = spec.getTrainingRDD();
+ BaseSparkClassificationModel<?> model = trainInternal(modelId, trainingRDD);
+ model.setTable(table);
+ model.setParams(Arrays.asList(params));
+ model.setLabelColumn(label);
+ model.setFeatureColumns(features);
+ return model;
+ }
+
+ /**
+ * To hive conf.
+ *
+ * @param conf the conf
+ * @return the hive conf
+ */
+ protected HiveConf toHiveConf(LensConf conf) {
+ HiveConf hiveConf = new HiveConf();
+ for (String key : conf.getProperties().keySet()) {
+ hiveConf.set(key, conf.getProperties().get(key));
+ }
+ return hiveConf;
+ }
+
+ /**
+ * Parses the params.
+ *
+ * @param args the args
+ */
+ public void parseParams(String[] args) {
+ if (args.length % 2 != 0) {
+ throw new IllegalArgumentException("Invalid number of params " + args.length);
+ }
+
+ params = new LinkedHashMap<String, String>();
+
+ for (int i = 0; i < args.length; i += 2) {
+ if ("f".equalsIgnoreCase(args[i]) || "feature".equalsIgnoreCase(args[i])) {
+ if (features == null) {
+ features = new ArrayList<String>();
+ }
+ features.add(args[i + 1]);
+ } else if ("l".equalsIgnoreCase(args[i]) || "label".equalsIgnoreCase(args[i])) {
+ label = args[i + 1];
+ } else {
+ params.put(args[i].replaceAll("\\-+", ""), args[i + 1]);
+ }
+ }
+
+ if (params.containsKey("trainingFraction")) {
+ // Get training Fraction
+ String trainingFractionStr = params.get("trainingFraction");
+ try {
+ trainingFraction = Double.parseDouble(trainingFractionStr);
+ useTrainingFraction = true;
+ } catch (NumberFormatException nfe) {
+ throw new IllegalArgumentException("Invalid training fraction", nfe);
+ }
+ }
+
+ if (params.containsKey("partition") || params.containsKey("p")) {
+ partitionFilter = params.containsKey("partition") ? params.get("partition") : params.get("p");
+ }
+
+ parseAlgoParams(params);
+ }
+
+ /**
+ * Gets the param value.
+ *
+ * @param param the param
+ * @param defaultVal the default val
+ * @return the param value
+ */
+ public double getParamValue(String param, double defaultVal) {
+ if (params.containsKey(param)) {
+ try {
+ return Double.parseDouble(params.get(param));
+ } catch (NumberFormatException nfe) {
+ LOG.warn("Couldn't parse param value: " + param + " as double.");
+ }
+ }
+ return defaultVal;
+ }
+
+ /**
+ * Gets the param value.
+ *
+ * @param param the param
+ * @param defaultVal the default val
+ * @return the param value
+ */
+ public int getParamValue(String param, int defaultVal) {
+ if (params.containsKey(param)) {
+ try {
+ return Integer.parseInt(params.get(param));
+ } catch (NumberFormatException nfe) {
+ LOG.warn("Couldn't parse param value: " + param + " as integer.");
+ }
+ }
+ return defaultVal;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public Map<String, String> getArgUsage() {
+ Map<String, String> usage = new LinkedHashMap<String, String>();
+ Class<?> clz = this.getClass();
+ // Put class name and description as well as part of the usage
+ Algorithm algorithm = clz.getAnnotation(Algorithm.class);
+ if (algorithm != null) {
+ usage.put("Algorithm Name", algorithm.name());
+ usage.put("Algorithm Description", algorithm.description());
+ }
+
+ // Get all algo params including base algo params
+ while (clz != null) {
+ for (Field field : clz.getDeclaredFields()) {
+ AlgoParam param = field.getAnnotation(AlgoParam.class);
+ if (param != null) {
+ usage.put("[param] " + param.name(), param.help() + " Default Value = " + param.defaultValue());
+ }
+ }
+
+ if (clz.equals(BaseSparkAlgo.class)) {
+ break;
+ }
+ clz = clz.getSuperclass();
+ }
+ return usage;
+ }
+
+ /**
+ * Parses the algo params.
+ *
+ * @param params the params
+ */
+ public abstract void parseAlgoParams(Map<String, String> params);
+
+ /**
+ * Train internal.
+ *
+ * @param modelId the model id
+ * @param trainingRDD the training rdd
+ * @return the base spark classification model
+ * @throws LensException the lens exception
+ */
+ protected abstract BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
+ throws LensException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/DecisionTreeAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/DecisionTreeAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/DecisionTreeAlgo.java
new file mode 100644
index 0000000..a6d66c5
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/DecisionTreeAlgo.java
@@ -0,0 +1,109 @@
+/**
+ * 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 org.apache.lens.ml.spark.algos;
+
+import java.util.Map;
+
+import org.apache.lens.api.LensException;
+import org.apache.lens.ml.AlgoParam;
+import org.apache.lens.ml.Algorithm;
+import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
+import org.apache.lens.ml.spark.models.DecisionTreeClassificationModel;
+import org.apache.lens.ml.spark.models.SparkDecisionTreeModel;
+
+import org.apache.spark.mllib.regression.LabeledPoint;
+import org.apache.spark.mllib.tree.DecisionTree$;
+import org.apache.spark.mllib.tree.configuration.Algo$;
+import org.apache.spark.mllib.tree.impurity.Entropy$;
+import org.apache.spark.mllib.tree.impurity.Gini$;
+import org.apache.spark.mllib.tree.impurity.Impurity;
+import org.apache.spark.mllib.tree.impurity.Variance$;
+import org.apache.spark.mllib.tree.model.DecisionTreeModel;
+import org.apache.spark.rdd.RDD;
+
+import scala.Enumeration;
+
+/**
+ * The Class DecisionTreeAlgo.
+ */
+@Algorithm(name = "spark_decision_tree", description = "Spark Decision Tree classifier algo")
+public class DecisionTreeAlgo extends BaseSparkAlgo {
+
+ /** The algo. */
+ @AlgoParam(name = "algo", help = "Decision tree algorithm. Allowed values are 'classification' and 'regression'")
+ private Enumeration.Value algo;
+
+ /** The decision tree impurity. */
+ @AlgoParam(name = "impurity", help = "Impurity measure used by the decision tree. "
+ + "Allowed values are 'gini', 'entropy' and 'variance'")
+ private Impurity decisionTreeImpurity;
+
+ /** The max depth. */
+ @AlgoParam(name = "maxDepth", help = "Max depth of the decision tree. Integer values expected.",
+ defaultValue = "100")
+ private int maxDepth;
+
+ /**
+ * Instantiates a new decision tree algo.
+ *
+ * @param name the name
+ * @param description the description
+ */
+ public DecisionTreeAlgo(String name, String description) {
+ super(name, description);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#parseAlgoParams(java.util.Map)
+ */
+ @Override
+ public void parseAlgoParams(Map<String, String> params) {
+ String dtreeAlgoName = params.get("algo");
+ if ("classification".equalsIgnoreCase(dtreeAlgoName)) {
+ algo = Algo$.MODULE$.Classification();
+ } else if ("regression".equalsIgnoreCase(dtreeAlgoName)) {
+ algo = Algo$.MODULE$.Regression();
+ }
+
+ String impurity = params.get("impurity");
+ if ("gini".equals(impurity)) {
+ decisionTreeImpurity = Gini$.MODULE$;
+ } else if ("entropy".equals(impurity)) {
+ decisionTreeImpurity = Entropy$.MODULE$;
+ } else if ("variance".equals(impurity)) {
+ decisionTreeImpurity = Variance$.MODULE$;
+ }
+
+ maxDepth = getParamValue("maxDepth", 100);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
+ */
+ @Override
+ protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
+ throws LensException {
+ DecisionTreeModel model = DecisionTree$.MODULE$.train(trainingRDD, algo, decisionTreeImpurity, maxDepth);
+ return new DecisionTreeClassificationModel(modelId, new SparkDecisionTreeModel(model));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/KMeansAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/KMeansAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/KMeansAlgo.java
new file mode 100644
index 0000000..7ca5a79
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/KMeansAlgo.java
@@ -0,0 +1,163 @@
+/**
+ * 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 org.apache.lens.ml.spark.algos;
+
+import java.util.List;
+
+import org.apache.lens.api.LensConf;
+import org.apache.lens.api.LensException;
+import org.apache.lens.ml.*;
+import org.apache.lens.ml.spark.HiveTableRDD;
+import org.apache.lens.ml.spark.models.KMeansClusteringModel;
+
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.metastore.api.FieldSchema;
+import org.apache.hadoop.hive.ql.metadata.Hive;
+import org.apache.hadoop.hive.ql.metadata.Table;
+import org.apache.hadoop.io.WritableComparable;
+import org.apache.hive.hcatalog.data.HCatRecord;
+import org.apache.spark.api.java.JavaPairRDD;
+import org.apache.spark.api.java.JavaRDD;
+import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.api.java.function.Function;
+import org.apache.spark.mllib.clustering.KMeans;
+import org.apache.spark.mllib.clustering.KMeansModel;
+import org.apache.spark.mllib.linalg.Vector;
+import org.apache.spark.mllib.linalg.Vectors;
+
+import scala.Tuple2;
+
+/**
+ * The Class KMeansAlgo.
+ */
+@Algorithm(name = "spark_kmeans_algo", description = "Spark MLLib KMeans algo")
+public class KMeansAlgo implements MLAlgo {
+
+ /** The conf. */
+ private transient LensConf conf;
+
+ /** The spark context. */
+ private JavaSparkContext sparkContext;
+
+ /** The part filter. */
+ @AlgoParam(name = "partition", help = "Partition filter to be used while constructing table RDD")
+ private String partFilter = null;
+
+ /** The k. */
+ @AlgoParam(name = "k", help = "Number of cluster")
+ private int k;
+
+ /** The max iterations. */
+ @AlgoParam(name = "maxIterations", help = "Maximum number of iterations", defaultValue = "100")
+ private int maxIterations = 100;
+
+ /** The runs. */
+ @AlgoParam(name = "runs", help = "Number of parallel run", defaultValue = "1")
+ private int runs = 1;
+
+ /** The initialization mode. */
+ @AlgoParam(name = "initializationMode",
+ help = "initialization model, either \"random\" or \"k-means||\" (default).", defaultValue = "k-means||")
+ private String initializationMode = "k-means||";
+
+ @Override
+ public String getName() {
+ return getClass().getAnnotation(Algorithm.class).name();
+ }
+
+ @Override
+ public String getDescription() {
+ return getClass().getAnnotation(Algorithm.class).description();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.MLAlgo#configure(org.apache.lens.api.LensConf)
+ */
+ @Override
+ public void configure(LensConf configuration) {
+ this.conf = configuration;
+ }
+
+ @Override
+ public LensConf getConf() {
+ return conf;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.MLAlgo#train(org.apache.lens.api.LensConf, java.lang.String, java.lang.String,
+ * java.lang.String, java.lang.String[])
+ */
+ @Override
+ public MLModel train(LensConf conf, String db, String table, String modelId, String... params) throws LensException {
+ List<String> features = AlgoArgParser.parseArgs(this, params);
+ final int[] featurePositions = new int[features.size()];
+ final int NUM_FEATURES = features.size();
+
+ JavaPairRDD<WritableComparable, HCatRecord> rdd = null;
+ try {
+ // Map feature names to positions
+ Table tbl = Hive.get(toHiveConf(conf)).getTable(db, table);
+ List<FieldSchema> allCols = tbl.getAllCols();
+ int f = 0;
+ for (int i = 0; i < tbl.getAllCols().size(); i++) {
+ String colName = allCols.get(i).getName();
+ if (features.contains(colName)) {
+ featurePositions[f++] = i;
+ }
+ }
+
+ rdd = HiveTableRDD.createHiveTableRDD(sparkContext, toHiveConf(conf), db, table, partFilter);
+ JavaRDD<Vector> trainableRDD = rdd.map(new Function<Tuple2<WritableComparable, HCatRecord>, Vector>() {
+ @Override
+ public Vector call(Tuple2<WritableComparable, HCatRecord> v1) throws Exception {
+ HCatRecord hCatRecord = v1._2();
+ double[] arr = new double[NUM_FEATURES];
+ for (int i = 0; i < NUM_FEATURES; i++) {
+ Object val = hCatRecord.get(featurePositions[i]);
+ arr[i] = val == null ? 0d : (Double) val;
+ }
+ return Vectors.dense(arr);
+ }
+ });
+
+ KMeansModel model = KMeans.train(trainableRDD.rdd(), k, maxIterations, runs, initializationMode);
+ return new KMeansClusteringModel(modelId, model);
+ } catch (Exception e) {
+ throw new LensException("KMeans algo failed for " + db + "." + table, e);
+ }
+ }
+
+ /**
+ * To hive conf.
+ *
+ * @param conf the conf
+ * @return the hive conf
+ */
+ private HiveConf toHiveConf(LensConf conf) {
+ HiveConf hiveConf = new HiveConf();
+ for (String key : conf.getProperties().keySet()) {
+ hiveConf.set(key, conf.getProperties().get(key));
+ }
+ return hiveConf;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/LogisticRegressionAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/LogisticRegressionAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/LogisticRegressionAlgo.java
new file mode 100644
index 0000000..106b3c5
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/LogisticRegressionAlgo.java
@@ -0,0 +1,86 @@
+/**
+ * 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 org.apache.lens.ml.spark.algos;
+
+import java.util.Map;
+
+import org.apache.lens.api.LensException;
+import org.apache.lens.ml.AlgoParam;
+import org.apache.lens.ml.Algorithm;
+import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
+import org.apache.lens.ml.spark.models.LogitRegressionClassificationModel;
+
+import org.apache.spark.mllib.classification.LogisticRegressionModel;
+import org.apache.spark.mllib.classification.LogisticRegressionWithSGD;
+import org.apache.spark.mllib.regression.LabeledPoint;
+import org.apache.spark.rdd.RDD;
+
+/**
+ * The Class LogisticRegressionAlgo.
+ */
+@Algorithm(name = "spark_logistic_regression", description = "Spark logistic regression algo")
+public class LogisticRegressionAlgo extends BaseSparkAlgo {
+
+ /** The iterations. */
+ @AlgoParam(name = "iterations", help = "Max number of iterations", defaultValue = "100")
+ private int iterations;
+
+ /** The step size. */
+ @AlgoParam(name = "stepSize", help = "Step size", defaultValue = "1.0d")
+ private double stepSize;
+
+ /** The min batch fraction. */
+ @AlgoParam(name = "minBatchFraction", help = "Fraction for batched learning", defaultValue = "1.0d")
+ private double minBatchFraction;
+
+ /**
+ * Instantiates a new logistic regression algo.
+ *
+ * @param name the name
+ * @param description the description
+ */
+ public LogisticRegressionAlgo(String name, String description) {
+ super(name, description);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#parseAlgoParams(java.util.Map)
+ */
+ @Override
+ public void parseAlgoParams(Map<String, String> params) {
+ iterations = getParamValue("iterations", 100);
+ stepSize = getParamValue("stepSize", 1.0d);
+ minBatchFraction = getParamValue("minBatchFraction", 1.0d);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
+ */
+ @Override
+ protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
+ throws LensException {
+ LogisticRegressionModel lrModel = LogisticRegressionWithSGD.train(trainingRDD, iterations, stepSize,
+ minBatchFraction);
+ return new LogitRegressionClassificationModel(modelId, lrModel);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/NaiveBayesAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/NaiveBayesAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/NaiveBayesAlgo.java
new file mode 100644
index 0000000..f7652d1
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/NaiveBayesAlgo.java
@@ -0,0 +1,73 @@
+/**
+ * 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 org.apache.lens.ml.spark.algos;
+
+import java.util.Map;
+
+import org.apache.lens.api.LensException;
+import org.apache.lens.ml.AlgoParam;
+import org.apache.lens.ml.Algorithm;
+import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
+import org.apache.lens.ml.spark.models.NaiveBayesClassificationModel;
+
+import org.apache.spark.mllib.classification.NaiveBayes;
+import org.apache.spark.mllib.regression.LabeledPoint;
+import org.apache.spark.rdd.RDD;
+
+/**
+ * The Class NaiveBayesAlgo.
+ */
+@Algorithm(name = "spark_naive_bayes", description = "Spark Naive Bayes classifier algo")
+public class NaiveBayesAlgo extends BaseSparkAlgo {
+
+ /** The lambda. */
+ @AlgoParam(name = "lambda", help = "Lambda parameter for naive bayes learner", defaultValue = "1.0d")
+ private double lambda = 1.0;
+
+ /**
+ * Instantiates a new naive bayes algo.
+ *
+ * @param name the name
+ * @param description the description
+ */
+ public NaiveBayesAlgo(String name, String description) {
+ super(name, description);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#parseAlgoParams(java.util.Map)
+ */
+ @Override
+ public void parseAlgoParams(Map<String, String> params) {
+ lambda = getParamValue("lambda", 1.0d);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
+ */
+ @Override
+ protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
+ throws LensException {
+ return new NaiveBayesClassificationModel(modelId, NaiveBayes.train(trainingRDD, lambda));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/SVMAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/SVMAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/SVMAlgo.java
new file mode 100644
index 0000000..09251b7
--- /dev/null
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/algos/SVMAlgo.java
@@ -0,0 +1,90 @@
+/**
+ * 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 org.apache.lens.ml.spark.algos;
+
+import java.util.Map;
+
+import org.apache.lens.api.LensException;
+import org.apache.lens.ml.AlgoParam;
+import org.apache.lens.ml.Algorithm;
+import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
+import org.apache.lens.ml.spark.models.SVMClassificationModel;
+
+import org.apache.spark.mllib.classification.SVMModel;
+import org.apache.spark.mllib.classification.SVMWithSGD;
+import org.apache.spark.mllib.regression.LabeledPoint;
+import org.apache.spark.rdd.RDD;
+
+/**
+ * The Class SVMAlgo.
+ */
+@Algorithm(name = "spark_svm", description = "Spark SVML classifier algo")
+public class SVMAlgo extends BaseSparkAlgo {
+
+ /** The min batch fraction. */
+ @AlgoParam(name = "minBatchFraction", help = "Fraction for batched learning", defaultValue = "1.0d")
+ private double minBatchFraction;
+
+ /** The reg param. */
+ @AlgoParam(name = "regParam", help = "regularization parameter for gradient descent", defaultValue = "1.0d")
+ private double regParam;
+
+ /** The step size. */
+ @AlgoParam(name = "stepSize", help = "Iteration step size", defaultValue = "1.0d")
+ private double stepSize;
+
+ /** The iterations. */
+ @AlgoParam(name = "iterations", help = "Number of iterations", defaultValue = "100")
+ private int iterations;
+
+ /**
+ * Instantiates a new SVM algo.
+ *
+ * @param name the name
+ * @param description the description
+ */
+ public SVMAlgo(String name, String description) {
+ super(name, description);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#parseAlgoParams(java.util.Map)
+ */
+ @Override
+ public void parseAlgoParams(Map<String, String> params) {
+ minBatchFraction = getParamValue("minBatchFraction", 1.0);
+ regParam = getParamValue("regParam", 1.0);
+ stepSize = getParamValue("stepSize", 1.0);
+ iterations = getParamValue("iterations", 100);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.lens.ml.spark.algos.BaseSparkAlgo#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
+ */
+ @Override
+ protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
+ throws LensException {
+ SVMModel svmModel = SVMWithSGD.train(trainingRDD, iterations, stepSize, regParam, minBatchFraction);
+ return new SVMClassificationModel(modelId, svmModel);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/BaseSparkTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/BaseSparkTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/BaseSparkTrainer.java
deleted file mode 100644
index f75e41c..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/BaseSparkTrainer.java
+++ /dev/null
@@ -1,289 +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 org.apache.lens.ml.spark.trainers;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-import org.apache.lens.api.LensConf;
-import org.apache.lens.api.LensException;
-import org.apache.lens.ml.Algorithm;
-import org.apache.lens.ml.MLModel;
-import org.apache.lens.ml.MLTrainer;
-import org.apache.lens.ml.TrainerParam;
-import org.apache.lens.ml.spark.TableTrainingSpec;
-import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.mllib.regression.LabeledPoint;
-import org.apache.spark.rdd.RDD;
-
-/**
- * The Class BaseSparkTrainer.
- */
-public abstract class BaseSparkTrainer implements MLTrainer {
-
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(BaseSparkTrainer.class);
-
- /** The name. */
- private final String name;
-
- /** The description. */
- private final String description;
-
- /** The spark context. */
- protected JavaSparkContext sparkContext;
-
- /** The params. */
- protected Map<String, String> params;
-
- /** The conf. */
- protected transient LensConf conf;
-
- /** The training fraction. */
- @TrainerParam(name = "trainingFraction", help = "% of dataset to be used for training", defaultValue = "0")
- protected double trainingFraction;
-
- /** The use training fraction. */
- private boolean useTrainingFraction;
-
- /** The label. */
- @TrainerParam(name = "label", help = "Name of column which is used as a training label for supervised learning")
- protected String label;
-
- /** The partition filter. */
- @TrainerParam(name = "partition", help = "Partition filter used to create create HCatInputFormats")
- protected String partitionFilter;
-
- /** The features. */
- @TrainerParam(name = "feature", help = "Column name(s) which are to be used as sample features")
- protected List<String> features;
-
- /**
- * Instantiates a new base spark trainer.
- *
- * @param name the name
- * @param description the description
- */
- public BaseSparkTrainer(String name, String description) {
- this.name = name;
- this.description = description;
- }
-
- public void setSparkContext(JavaSparkContext sparkContext) {
- this.sparkContext = sparkContext;
- }
-
- @Override
- public LensConf getConf() {
- return conf;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.MLTrainer#configure(org.apache.lens.api.LensConf)
- */
- @Override
- public void configure(LensConf configuration) {
- this.conf = configuration;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.MLTrainer#train(org.apache.lens.api.LensConf, java.lang.String, java.lang.String,
- * java.lang.String, java.lang.String[])
- */
- @Override
- public MLModel<?> train(LensConf conf, String db, String table, String modelId, String... params)
- throws LensException {
- parseParams(params);
-
- TableTrainingSpec.TableTrainingSpecBuilder builder = TableTrainingSpec.newBuilder().hiveConf(toHiveConf(conf))
- .database(db).table(table).partitionFilter(partitionFilter).featureColumns(features).labelColumn(label);
-
- if (useTrainingFraction) {
- builder.trainingFraction(trainingFraction);
- }
-
- TableTrainingSpec spec = builder.build();
- LOG.info("Training " + " with " + features.size() + " features");
-
- spec.createRDDs(sparkContext);
-
- RDD<LabeledPoint> trainingRDD = spec.getTrainingRDD();
- BaseSparkClassificationModel<?> model = trainInternal(modelId, trainingRDD);
- model.setTable(table);
- model.setParams(Arrays.asList(params));
- model.setLabelColumn(label);
- model.setFeatureColumns(features);
- return model;
- }
-
- /**
- * To hive conf.
- *
- * @param conf the conf
- * @return the hive conf
- */
- protected HiveConf toHiveConf(LensConf conf) {
- HiveConf hiveConf = new HiveConf();
- for (String key : conf.getProperties().keySet()) {
- hiveConf.set(key, conf.getProperties().get(key));
- }
- return hiveConf;
- }
-
- /**
- * Parses the params.
- *
- * @param args the args
- */
- public void parseParams(String[] args) {
- if (args.length % 2 != 0) {
- throw new IllegalArgumentException("Invalid number of params " + args.length);
- }
-
- params = new LinkedHashMap<String, String>();
-
- for (int i = 0; i < args.length; i += 2) {
- if ("f".equalsIgnoreCase(args[i]) || "feature".equalsIgnoreCase(args[i])) {
- if (features == null) {
- features = new ArrayList<String>();
- }
- features.add(args[i + 1]);
- } else if ("l".equalsIgnoreCase(args[i]) || "label".equalsIgnoreCase(args[i])) {
- label = args[i + 1];
- } else {
- params.put(args[i].replaceAll("\\-+", ""), args[i + 1]);
- }
- }
-
- if (params.containsKey("trainingFraction")) {
- // Get training Fraction
- String trainingFractionStr = params.get("trainingFraction");
- try {
- trainingFraction = Double.parseDouble(trainingFractionStr);
- useTrainingFraction = true;
- } catch (NumberFormatException nfe) {
- throw new IllegalArgumentException("Invalid training fraction", nfe);
- }
- }
-
- if (params.containsKey("partition") || params.containsKey("p")) {
- partitionFilter = params.containsKey("partition") ? params.get("partition") : params.get("p");
- }
-
- parseTrainerParams(params);
- }
-
- /**
- * Gets the param value.
- *
- * @param param the param
- * @param defaultVal the default val
- * @return the param value
- */
- public double getParamValue(String param, double defaultVal) {
- if (params.containsKey(param)) {
- try {
- return Double.parseDouble(params.get(param));
- } catch (NumberFormatException nfe) {
- LOG.warn("Couldn't parse param value: " + param + " as double.");
- }
- }
- return defaultVal;
- }
-
- /**
- * Gets the param value.
- *
- * @param param the param
- * @param defaultVal the default val
- * @return the param value
- */
- public int getParamValue(String param, int defaultVal) {
- if (params.containsKey(param)) {
- try {
- return Integer.parseInt(params.get(param));
- } catch (NumberFormatException nfe) {
- LOG.warn("Couldn't parse param value: " + param + " as integer.");
- }
- }
- return defaultVal;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public Map<String, String> getArgUsage() {
- Map<String, String> usage = new LinkedHashMap<String, String>();
- Class<?> clz = this.getClass();
- // Put class name and description as well as part of the usage
- Algorithm algorithm = clz.getAnnotation(Algorithm.class);
- if (algorithm != null) {
- usage.put("Algorithm Name", algorithm.name());
- usage.put("Algorithm Description", algorithm.description());
- }
-
- // Get all trainer params including base trainer params
- while (clz != null) {
- for (Field field : clz.getDeclaredFields()) {
- TrainerParam param = field.getAnnotation(TrainerParam.class);
- if (param != null) {
- usage.put("[param] " + param.name(), param.help() + " Default Value = " + param.defaultValue());
- }
- }
-
- if (clz.equals(BaseSparkTrainer.class)) {
- break;
- }
- clz = clz.getSuperclass();
- }
- return usage;
- }
-
- /**
- * Parses the trainer params.
- *
- * @param params the params
- */
- public abstract void parseTrainerParams(Map<String, String> params);
-
- /**
- * Train internal.
- *
- * @param modelId the model id
- * @param trainingRDD the training rdd
- * @return the base spark classification model
- * @throws LensException the lens exception
- */
- protected abstract BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
- throws LensException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/49fef8e2/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/DecisionTreeTrainer.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/DecisionTreeTrainer.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/DecisionTreeTrainer.java
deleted file mode 100644
index 96fbf28..0000000
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/spark/trainers/DecisionTreeTrainer.java
+++ /dev/null
@@ -1,109 +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 org.apache.lens.ml.spark.trainers;
-
-import java.util.Map;
-
-import org.apache.lens.api.LensException;
-import org.apache.lens.ml.Algorithm;
-import org.apache.lens.ml.TrainerParam;
-import org.apache.lens.ml.spark.models.BaseSparkClassificationModel;
-import org.apache.lens.ml.spark.models.DecisionTreeClassificationModel;
-import org.apache.lens.ml.spark.models.SparkDecisionTreeModel;
-
-import org.apache.spark.mllib.regression.LabeledPoint;
-import org.apache.spark.mllib.tree.DecisionTree$;
-import org.apache.spark.mllib.tree.configuration.Algo$;
-import org.apache.spark.mllib.tree.impurity.Entropy$;
-import org.apache.spark.mllib.tree.impurity.Gini$;
-import org.apache.spark.mllib.tree.impurity.Impurity;
-import org.apache.spark.mllib.tree.impurity.Variance$;
-import org.apache.spark.mllib.tree.model.DecisionTreeModel;
-import org.apache.spark.rdd.RDD;
-
-import scala.Enumeration;
-
-/**
- * The Class DecisionTreeTrainer.
- */
-@Algorithm(name = "spark_decision_tree", description = "Spark Decision Tree classifier trainer")
-public class DecisionTreeTrainer extends BaseSparkTrainer {
-
- /** The algo. */
- @TrainerParam(name = "algo", help = "Decision tree algorithm. Allowed values are 'classification' and 'regression'")
- private Enumeration.Value algo;
-
- /** The decision tree impurity. */
- @TrainerParam(name = "impurity", help = "Impurity measure used by the decision tree. "
- + "Allowed values are 'gini', 'entropy' and 'variance'")
- private Impurity decisionTreeImpurity;
-
- /** The max depth. */
- @TrainerParam(name = "maxDepth", help = "Max depth of the decision tree. Integer values expected.",
- defaultValue = "100")
- private int maxDepth;
-
- /**
- * Instantiates a new decision tree trainer.
- *
- * @param name the name
- * @param description the description
- */
- public DecisionTreeTrainer(String name, String description) {
- super(name, description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#parseTrainerParams(java.util.Map)
- */
- @Override
- public void parseTrainerParams(Map<String, String> params) {
- String dtreeAlgoName = params.get("algo");
- if ("classification".equalsIgnoreCase(dtreeAlgoName)) {
- algo = Algo$.MODULE$.Classification();
- } else if ("regression".equalsIgnoreCase(dtreeAlgoName)) {
- algo = Algo$.MODULE$.Regression();
- }
-
- String impurity = params.get("impurity");
- if ("gini".equals(impurity)) {
- decisionTreeImpurity = Gini$.MODULE$;
- } else if ("entropy".equals(impurity)) {
- decisionTreeImpurity = Entropy$.MODULE$;
- } else if ("variance".equals(impurity)) {
- decisionTreeImpurity = Variance$.MODULE$;
- }
-
- maxDepth = getParamValue("maxDepth", 100);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.lens.ml.spark.trainers.BaseSparkTrainer#trainInternal(java.lang.String, org.apache.spark.rdd.RDD)
- */
- @Override
- protected BaseSparkClassificationModel trainInternal(String modelId, RDD<LabeledPoint> trainingRDD)
- throws LensException {
- DecisionTreeModel model = DecisionTree$.MODULE$.train(trainingRDD, algo, decisionTreeImpurity, maxDepth);
- return new DecisionTreeClassificationModel(modelId, new SparkDecisionTreeModel(model));
- }
-}
[10/30] incubator-lens git commit: LENS-228 : Add convenient binary
distribution for release (Srikanth Sundarrajan via amareshwari)
Posted by am...@apache.org.
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>
[15/30] incubator-lens git commit: LENS-10: Updates branching,
versioning and compatibility strategies (Amareshwari Sriramadasu via
prongs)
Posted by am...@apache.org.
LENS-10: Updates branching, versioning and compatibility strategies (Amareshwari Sriramadasu via prongs)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/534ef2f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/534ef2f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/534ef2f2
Branch: refs/heads/master
Commit: 534ef2f2e77170fd1583891c338dd95d92d7588a
Parents: 4639f6b
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Feb 17 15:17:17 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Wed Feb 18 10:27:53 2015 +0530
----------------------------------------------------------------------
src/site/apt/developer/contribute.apt | 36 ++++++++++++++++++++++++++
src/site/apt/releases/incompatibility.apt | 18 -------------
src/site/apt/releases/release-note.apt | 18 -------------
src/site/site.xml | 4 +--
4 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/534ef2f2/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt b/src/site/apt/developer/contribute.apt
index 5eb5ff5..91e7b81 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -527,3 +527,39 @@ Developer Documentation : How to contribute to Apache Lens?
Run the command mvn apache-rat:check. If check needs to be excluded for any file, it should be put in excludes section
in parent project pom's apache-rat-plugin.
+
+** What is versioning strategy in Lens?
+
+ Lens follows three number versioning which is major.minor.revision. If the current release is 2.0.0, the next usual
+ development release will be 2.1.0. If there needs to be separate release on released version and not from development
+ branch (usually critical patch release), it will be 2.0.1. If the next release is not compatible with previous
+ release, then the major version needs to be incremented, then it would become 3.0.0. This way all 2.x.x releases will
+ be compatible with one another. And incompatibility is clearly communicated to users through major version number
+ change.
+
+ The jira fix version for all the issues in 2.0.x is called 2.0, and 2.1.x is called 2.1. For patch releases from
+ release branch, the jira fix version can be exact patch release version number.
+
+** What is the branching strategy in Lens?
+
+ Lens has two main branches - <<master>> and <<current-release-line>>. All the day to day development happens on
+ <<master>> branch. <<current-release-line>> branch is used to make releases. When <<master>> branch is ready for
+ release (all improvements/features/bug fixes marked for release are fixed and all tests passing), <<master>> will be
+ merged to <<current-release-line>>. The version number on <<master>> will be incremented to next development version.
+ The only issues that can be cherry-picked into <<current-release-line>> till release is rolled are
+ critical/blocker bugs, documentation changes and test case changes. Once all the issues are verified for the release,
+ and release will be triggered from <<current-release-line>>.
+
+ If a critical release (not pulling code from master) needs to be made, a new branch will be created with release
+ number, by checking out <<current-release-line>> branch. And changes will be put on the branch. Once the branch is
+ ready they will merged to <<current-release-line>> and released. The changes should be cherry-picked back into
+ <<master>> from <<current-release-line>> once the release is made and resolving conflicts in <<master>> if any.
+ Having two main branches makes all release tags to be created on <current-release-line> branch and removes the pile
+ up of old and stale branches, which are created by one for each release.
+
+ For major version increments, <<current-release-line>> will be branched to a a <$major.x-line> and
+ <<current-release-line>> and master will be moved to next major version.
+
+ There can be feature branches created from <<master>>, if feature is not actively developed in <<master>> branch
+ directly. For a feature branch to be created a contirbutor can start discuss thread on dev list for consensus on
+ whether it is required.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/534ef2f2/src/site/apt/releases/incompatibility.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/incompatibility.apt b/src/site/apt/releases/incompatibility.apt
deleted file mode 100644
index 8a8293a..0000000
--- a/src/site/apt/releases/incompatibility.apt
+++ /dev/null
@@ -1,18 +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.
-~~
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/534ef2f2/src/site/apt/releases/release-note.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-note.apt b/src/site/apt/releases/release-note.apt
deleted file mode 100644
index 8a8293a..0000000
--- a/src/site/apt/releases/release-note.apt
+++ /dev/null
@@ -1,18 +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.
-~~
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/534ef2f2/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index a134ff2..9faaa80 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -47,8 +47,8 @@
</menu>
<menu name="Releases" >
<item name="Download" href="./releases/download.html" />
- <item name="Compatibility" href="./releases/incompatibility.html" />
- <item name="Release Notes" href="./releases/release-note.html" />
+ <item name="Compatibility" href="./releases/compatibility.html" />
+ <item name="All Releases" href="./releases/release-history.html" />
</menu>
<menu name="User Documentation">
<item name="Lens User Guide" href="./user/index.html" />
[23/30] incubator-lens git commit: LENS-335 : Fix checkstyle version
property usage in pom (amareshwari)
Posted by am...@apache.org.
LENS-335 : Fix checkstyle version property usage in pom (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/938ad9ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/938ad9ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/938ad9ed
Branch: refs/heads/master
Commit: 938ad9ed785ca3e05546fffa35f6078d10ed1b97
Parents: 632403e
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Feb 20 11:38:18 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Fri Feb 20 11:38:18 2015 +0530
----------------------------------------------------------------------
lens-api/pom.xml | 27 ---------------------------
lens-cli/pom.xml | 27 ---------------------------
lens-client/pom.xml | 31 -------------------------------
lens-driver-hive/pom.xml | 27 ---------------------------
lens-driver-jdbc/pom.xml | 32 --------------------------------
lens-examples/pom.xml | 31 -------------------------------
lens-ml-lib/pom.xml | 27 ---------------------------
lens-query-lib/pom.xml | 31 -------------------------------
lens-server-api/pom.xml | 32 --------------------------------
lens-storage-db/pom.xml | 31 -------------------------------
pom.xml | 5 ++---
11 files changed, 2 insertions(+), 299 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 4bfc007..58cf04c 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -71,33 +71,6 @@
</plugins>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index c4a2ef8..ff7eca3 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -186,33 +186,6 @@
<argLine>-Xms256m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index a0f40ab..9dc0046 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -124,35 +124,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 5a948a8..3ef9617 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -71,33 +71,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 9872130..2e50fbd 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -82,36 +82,4 @@
<artifactId>hadoop-client</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 2fac616..6e872b2 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -57,35 +57,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 82dc372..7cf8e53 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -173,33 +173,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index c4b9885..09a0431 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -72,35 +72,4 @@
<artifactId>hadoop-client</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 59b546a..c7190cc 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -56,36 +56,4 @@
<artifactId>testng</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 560c15a..66ae006 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -58,35 +58,4 @@
<artifactId>hadoop-client</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.lens</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>checkstyle-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>checkstyle.xml</configLocation>
- <headerLocation>checkstyle-java-header.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/938ad9ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c499c7c..2684307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,6 @@
<jersey.version>2.3.1</jersey.version>
<grizzly.version>2.3.6</grizzly.version>
<metrics.version>3.0.2</metrics.version>
- <lens.checkstyle.version>2.0.0-incubating-SNAPSHOT</lens.checkstyle.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<liquibase.version>3.0.7</liquibase.version>
<spring.shell.version>1.0.0.RELEASE</spring.shell.version>
@@ -432,7 +431,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
+ <version>2.0.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1059,7 +1058,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>${lens.checkstyle.version}</version>
+ <version>2.0.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[09/30] incubator-lens git commit: LENS-219 License and Notice file
for source release. Amareshwari Sriramadasu via Srikanth Sundarrajan
Posted by am...@apache.org.
LENS-219 License and Notice file for source release. Amareshwari Sriramadasu via Srikanth Sundarrajan
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/5a4a3d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/5a4a3d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/5a4a3d8a
Branch: refs/heads/master
Commit: 5a4a3d8a8ca14b4c0d8317cbe611f65bff68248a
Parents: d27bf4c
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Fri Feb 13 12:32:28 2015 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Fri Feb 13 12:40:45 2015 +0530
----------------------------------------------------------------------
LICENSE | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
NOTICE | 16 ++++++++++
2 files changed, 118 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5a4a3d8a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 261eeb9..21e24b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,105 @@
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.
+
+
+The following files are under MIT License
+
+For lens-server/src/main/webapp/static/css/codemirror.min.css
+lens-server/src/main/webapp/static/js/libs/codemirror.min.js
+lens-server/src/main/webapp/static/js/libs/sql.js
+
+Copyright (C) 2014 by Marijn Haverbeke <ma...@gmail.com> and others
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+For lens-server/src/main/webapp/static/js/libs/jquery.flot.js
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For lens-server/src/main/webapp/static/js/libs/moment.js
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+For lens-server/src/main/webapp/static/js/libs/stupidtable.min.js
+
+Copyright (c) 2012 Joseph McCullough
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5a4a3d8a/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..b196dc3
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,16 @@
+Apache Lens (incubating)
+
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+This product includes jquery.flot.js (http://www.flotcharts.org/)
+
+This product includes moment.js(http://momentjs.com/)
+
+This product includes sql.js, codemirror.min.js, codemirror.min.css (http://codemirror.net/)
+
+This product includes stupidtable.min.js (http://joequery.github.io/Stupid-Table-Plugin/)
+