Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F2B510DFB for ; Tue, 29 Apr 2014 20:13:59 +0000 (UTC) Received: (qmail 18065 invoked by uid 500); 29 Apr 2014 20:13:58 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 18024 invoked by uid 500); 29 Apr 2014 20:13:58 -0000 Mailing-List: contact commits-help@phoenix.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.incubator.apache.org Delivered-To: mailing list commits@phoenix.incubator.apache.org Received: (qmail 18017 invoked by uid 99); 29 Apr 2014 20:13:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 20:13:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 20:13:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F30FD238889B; Tue, 29 Apr 2014 20:13:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1591083 - in /incubator/phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/publish/presentations/ site/source/src/site/markdo... Date: Tue, 29 Apr 2014 20:13:31 -0000 To: commits@phoenix.incubator.apache.org From: jamestaylor@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140429201331.F30FD238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jamestaylor Date: Tue Apr 29 20:13:30 2014 New Revision: 1591083 URL: http://svn.apache.org/r1591083 Log: Add video link to ApacheCon Added: incubator/phoenix/site/publish/presentations/ApacheCon2014-16x9.pdf (with props) incubator/phoenix/site/publish/presentations/HBaseCon2013-4x3.pdf (with props) incubator/phoenix/site/publish/presentations/HadoopSummit2013-16x9.pdf (with props) Removed: incubator/phoenix/site/publish/presentations/ApacheCon16x9.pdf incubator/phoenix/site/source/src/site/resources/presentations/ApacheCon16x9.pdf Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/Driver.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java incubator/phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java incubator/phoenix/site/publish/resources.html incubator/phoenix/site/source/src/site/markdown/resources.md Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/Driver.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/Driver.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/Driver.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/Driver.java Tue Apr 29 20:13:30 2014 @@ -17,7 +17,7 @@ import org.h2.message.DbException; import org.h2.message.TraceSystem; import org.h2.upgrade.DbUpgrade; -//## Java 1.7 ## +/*## Java 1.7 ## import java.util.logging.Logger; //*/ @@ -138,7 +138,7 @@ public class Driver implements java.sql. /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public Logger getParentLogger() { return null; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java Tue Apr 29 20:13:30 2014 @@ -1440,7 +1440,7 @@ public class JdbcCallableStatement exten * @param parameterIndex the parameter index (1, 2, ...) * @param type the class of the returned value */ -//## Java 1.7 ## +/*## Java 1.7 ## public T getObject(int parameterIndex, Class type) { return null; } @@ -1452,7 +1452,7 @@ public class JdbcCallableStatement exten * @param parameterName the parameter name * @param type the class of the returned value */ -//## Java 1.7 ## +/*## Java 1.7 ## public T getObject(String parameterName, Class type) { return null; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java Tue Apr 29 20:13:30 2014 @@ -49,7 +49,7 @@ import java.sql.SQLXML; import java.sql.SQLClientInfoException; //*/ -//## Java 1.7 ## +/*## Java 1.7 ## import java.util.concurrent.Executor; //*/ @@ -1678,7 +1678,7 @@ public class JdbcConnection extends Trac * * @param schema the schema */ -//## Java 1.7 ## +/*## Java 1.7 ## public void setSchema(String schema) { // not supported } @@ -1687,7 +1687,7 @@ public class JdbcConnection extends Trac /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public String getSchema() { return null; } @@ -1698,7 +1698,7 @@ public class JdbcConnection extends Trac * * @param executor the executor used by this method */ -//## Java 1.7 ## +/*## Java 1.7 ## public void abort(Executor executor) { // not supported } @@ -1710,7 +1710,7 @@ public class JdbcConnection extends Trac * @param executor the executor used by this method * @param milliseconds the TCP connection timeout */ -//## Java 1.7 ## +/*## Java 1.7 ## public void setNetworkTimeout(Executor executor, int milliseconds) { // not supported } @@ -1719,7 +1719,7 @@ public class JdbcConnection extends Trac /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public int getNetworkTimeout() { return 0; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java Tue Apr 29 20:13:30 2014 @@ -2885,7 +2885,7 @@ public class JdbcDatabaseMetaData extend /** * [Not supported] */ - //## Java 1.7 ## + /*## Java 1.7 ## public boolean generatedKeyAlwaysReturned() { return true; } @@ -2902,7 +2902,7 @@ public class JdbcDatabaseMetaData extend * @param columnNamePattern null (to get all objects) or a column name * (uppercase for unquoted names) */ - //## Java 1.7 ## + /*## Java 1.7 ## public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) { return null; Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java Tue Apr 29 20:13:30 2014 @@ -3431,7 +3431,7 @@ public class JdbcResultSet extends Trace * @param columnIndex the column index (1, 2, ...) * @param type the class of the returned value */ -//## Java 1.7 ## +/*## Java 1.7 ## public T getObject(int columnIndex, Class type) { return null; } @@ -3443,7 +3443,7 @@ public class JdbcResultSet extends Trace * @param columnName the column name * @param type the class of the returned value */ -//## Java 1.7 ## +/*## Java 1.7 ## public T getObject(String columnName, Class type) { return null; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java Tue Apr 29 20:13:30 2014 @@ -876,7 +876,7 @@ public class JdbcStatement extends Trace /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public void closeOnCompletion() { // not supported } @@ -885,7 +885,7 @@ public class JdbcStatement extends Trace /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public boolean isCloseOnCompletion() { return true; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java Tue Apr 29 20:13:30 2014 @@ -35,7 +35,7 @@ import org.h2.util.New; import org.h2.message.DbException; //*/ -//## Java 1.7 ## +/*## Java 1.7 ## import java.util.logging.Logger; //*/ @@ -330,7 +330,7 @@ public class JdbcConnectionPool implemen /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public Logger getParentLogger() { return null; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java Tue Apr 29 20:13:30 2014 @@ -26,7 +26,7 @@ import org.h2.jdbc.JdbcConnection; import org.h2.message.TraceObject; import org.h2.util.StringUtils; -//## Java 1.7 ## +/*## Java 1.7 ## import java.util.logging.Logger; //*/ @@ -381,7 +381,7 @@ public class JdbcDataSource extends Trac /** * [Not supported] */ -//## Java 1.7 ## +/*## Java 1.7 ## public Logger getParentLogger() { return null; } Modified: incubator/phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java URL: http://svn.apache.org/viewvc/incubator/phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java (original) +++ incubator/phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java Tue Apr 29 20:13:30 2014 @@ -853,7 +853,7 @@ public class SimpleResultSet implements * @param columnIndex the column index (1, 2, ...) * @param type the class of the returned value */ -//## Java 1.7 ## +/*## Java 1.7 ## public T getObject(int columnIndex, Class type) { return null; } @@ -865,7 +865,7 @@ public class SimpleResultSet implements * @param columnName the column name * @param type the class of the returned value */ -//## Java 1.7 ## +/*## Java 1.7 ## public T getObject(String columnName, Class type) { return null; } Added: incubator/phoenix/site/publish/presentations/ApacheCon2014-16x9.pdf URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/presentations/ApacheCon2014-16x9.pdf?rev=1591083&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/phoenix/site/publish/presentations/ApacheCon2014-16x9.pdf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/phoenix/site/publish/presentations/HBaseCon2013-4x3.pdf URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/presentations/HBaseCon2013-4x3.pdf?rev=1591083&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/phoenix/site/publish/presentations/HBaseCon2013-4x3.pdf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/phoenix/site/publish/presentations/HadoopSummit2013-16x9.pdf URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/presentations/HadoopSummit2013-16x9.pdf?rev=1591083&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/phoenix/site/publish/presentations/HadoopSummit2013-16x9.pdf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/phoenix/site/publish/resources.html URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/resources.html?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/site/publish/resources.html (original) +++ incubator/phoenix/site/publish/resources.html Tue Apr 29 20:13:30 2014 @@ -1,7 +1,7 @@ @@ -127,21 +127,25 @@ Conference - Title + Video + Presentation ApacheCon 2014 - How Apache Phoenix enables interactive, low latency applications over your HBase data + How Apache Phoenix enables interactive, low latency applications over your HBase data + ApacheCon2014-16x9.pdf Hadoop Summit 2013 How (and why) Phoenix puts the SQL back into NoSQL + HadoopSummit2013-16x9.pdf HBaseCon 2013 How (and why) Phoenix puts the SQL back into NoSQL + HBaseCon2013-4x3.pdf Modified: incubator/phoenix/site/source/src/site/markdown/resources.md URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/resources.md?rev=1591083&r1=1591082&r2=1591083&view=diff ============================================================================== --- incubator/phoenix/site/source/src/site/markdown/resources.md (original) +++ incubator/phoenix/site/source/src/site/markdown/resources.md Tue Apr 29 20:13:30 2014 @@ -1,8 +1,8 @@ #Resources Below are some prior presentations that have been done on Apache Phoenix. -| Conference | Title | -|------------|-------| -| ApacheCon 2014 | [How Apache Phoenix enables interactive, low latency applications over your HBase data](http://phoenix.incubator.apache.org/presentations/ApacheCon16x9.pdf) | -| Hadoop Summit 2013 | [How (and why) Phoenix puts the SQL back into NoSQL](http://www.youtube.com/watch?v=YHsHdQ08trg) | -| HBaseCon 2013 | [How (and why) Phoenix puts the SQL back into NoSQL](http://www.cloudera.com/content/cloudera/en/resources/library/hbasecon/hbasecon-2013--how-and-why-phoenix-puts-the-sql-back-into-nosql-video.html) | +| Conference | Video | Presentation | +|------------|-------|--------------| +| ApacheCon 2014 | [How Apache Phoenix enables interactive, low latency applications over your HBase data](https://www.youtube.com/watch?v=9qfBnFyKZwM) | [ApacheCon2014-16x9.pdf](http://phoenix.incubator.apache.org/presentations/ApacheCon2014-16x9.pdf) | +| Hadoop Summit 2013 | [How (and why) Phoenix puts the SQL back into NoSQL](http://www.youtube.com/watch?v=YHsHdQ08trg) | [HadoopSummit2013-16x9.pdf](http://phoenix.incubator.apache.org/presentations/HadoopSummit2013-16x9.pdf) | +| HBaseCon 2013 | [How (and why) Phoenix puts the SQL back into NoSQL](http://www.cloudera.com/content/cloudera/en/resources/library/hbasecon/hbasecon-2013--how-and-why-phoenix-puts-the-sql-back-into-nosql-video.html) | [HBaseCon2013-4x3.pdf](http://phoenix.incubator.apache.org/presentations/HBaseCon2013-4x3.pdf) |