phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
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 GMT
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> T getObject(int parameterIndex, Class<T> 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> T getObject(String parameterName, Class<T> 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> T getObject(int columnIndex, Class<T> 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> T getObject(String columnName, Class<T> 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> T getObject(int columnIndex, Class<T> 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> T getObject(String columnName, Class<T> 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 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-04-23
+ Generated by Apache Maven Doxia at 2014-04-29
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -127,21 +127,25 @@
  <thead> 
   <tr class="a"> 
    <th>Conference </th> 
-   <th>Title </th> 
+   <th>Video </th> 
+   <th>Presentation </th> 
   </tr> 
  </thead> 
  <tbody> 
   <tr class="b"> 
    <td>ApacheCon 2014 </td> 
-   <td><a class="externalLink" href="http://phoenix.incubator.apache.org/presentations/ApacheCon16x9.pdf">How
Apache Phoenix enables interactive, low latency applications over your HBase data</a>
</td> 
+   <td><a class="externalLink" href="https://www.youtube.com/watch?v=9qfBnFyKZwM">How
Apache Phoenix enables interactive, low latency applications over your HBase data</a>
</td> 
+   <td><a class="externalLink" href="http://phoenix.incubator.apache.org/presentations/ApacheCon2014-16x9.pdf">ApacheCon2014-16x9.pdf</a>
</td> 
   </tr> 
   <tr class="a"> 
    <td>Hadoop Summit 2013 </td> 
    <td><a class="externalLink" href="http://www.youtube.com/watch?v=YHsHdQ08trg">How
(and why) Phoenix puts the SQL back into NoSQL</a> </td> 
+   <td><a class="externalLink" href="http://phoenix.incubator.apache.org/presentations/HadoopSummit2013-16x9.pdf">HadoopSummit2013-16x9.pdf</a>
</td> 
   </tr> 
   <tr class="b"> 
    <td>HBaseCon 2013 </td> 
    <td><a class="externalLink" href="http://www.cloudera.com/content/cloudera/en/resources/library/hbasecon/hbasecon-2013--how-and-why-phoenix-puts-the-sql-back-into-nosql-video.html">How
(and why) Phoenix puts the SQL back into NoSQL</a> </td> 
+   <td><a class="externalLink" href="http://phoenix.incubator.apache.org/presentations/HBaseCon2013-4x3.pdf">HBaseCon2013-4x3.pdf</a>
</td> 
   </tr> 
  </tbody> 
 </table>

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)
|



Mime
View raw message