You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/07 19:28:27 UTC

[49/59] [partial] calcite git commit: [CALCITE-1078] Detach avatica from the core calcite Maven project

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopParameterMetaData.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopParameterMetaData.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopParameterMetaData.java
deleted file mode 100644
index f7117e9..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopParameterMetaData.java
+++ /dev/null
@@ -1,85 +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.calcite.avatica.noop;
-
-import java.sql.ParameterMetaData;
-import java.sql.SQLException;
-
-/**
- * An implementation of {@link ParameterMetaData} which does nothing.
- */
-public class AvaticaNoopParameterMetaData implements ParameterMetaData {
-
-  private static final AvaticaNoopParameterMetaData INSTANCE = new AvaticaNoopParameterMetaData();
-
-  public static AvaticaNoopParameterMetaData getInstance() {
-    return INSTANCE;
-  }
-
-  private AvaticaNoopParameterMetaData() {}
-
-  private UnsupportedOperationException unsupported() {
-    return new UnsupportedOperationException("Unsupported");
-  }
-
-  @Override public <T> T unwrap(Class<T> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    return false;
-  }
-
-  @Override public int getParameterCount() throws SQLException {
-    return 0;
-  }
-
-  @Override public int isNullable(int param) throws SQLException {
-    return 0;
-  }
-
-  @Override public boolean isSigned(int param) throws SQLException {
-    return false;
-  }
-
-  @Override public int getPrecision(int param) throws SQLException {
-    return 0;
-  }
-
-  @Override public int getScale(int param) throws SQLException {
-    return 0;
-  }
-
-  @Override public int getParameterType(int param) throws SQLException {
-    return 0;
-  }
-
-  @Override public String getParameterTypeName(int param) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public String getParameterClassName(int param) throws SQLException {
-    return "java.lang.Object";
-  }
-
-  @Override public int getParameterMode(int param) throws SQLException {
-    return 0;
-  }
-
-}
-
-// End AvaticaNoopParameterMetaData.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopPreparedStatement.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopPreparedStatement.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopPreparedStatement.java
deleted file mode 100644
index b8ad8cc..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopPreparedStatement.java
+++ /dev/null
@@ -1,344 +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.calcite.avatica.noop;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-/**
- * A {@link PreparedStatement} instance which does nothing.
- */
-public class AvaticaNoopPreparedStatement implements PreparedStatement {
-
-  private static final AvaticaNoopPreparedStatement INSTANCE = new AvaticaNoopPreparedStatement();
-
-  public static AvaticaNoopPreparedStatement getInstance() {
-    return INSTANCE;
-  }
-
-  private AvaticaNoopPreparedStatement() {}
-
-  private UnsupportedOperationException unsupported() {
-    return new UnsupportedOperationException("Unsupported");
-  }
-
-  @Override public ResultSet executeQuery(String sql) throws SQLException {
-    return AvaticaNoopResultSet.getInstance();
-  }
-
-  @Override public int executeUpdate(String sql) throws SQLException {
-    return 1;
-  }
-
-  @Override public void close() throws SQLException {}
-
-  @Override public int getMaxFieldSize() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setMaxFieldSize(int max) throws SQLException {}
-
-  @Override public int getMaxRows() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setMaxRows(int max) throws SQLException {}
-
-  @Override public void setEscapeProcessing(boolean enable) throws SQLException {}
-
-  @Override public int getQueryTimeout() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setQueryTimeout(int seconds) throws SQLException {}
-
-  @Override public void cancel() throws SQLException {}
-
-  @Override public SQLWarning getWarnings() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void clearWarnings() throws SQLException {}
-
-  @Override public void setCursorName(String name) throws SQLException {}
-
-  @Override public boolean execute(String sql) throws SQLException {
-    return false;
-  }
-
-  @Override public ResultSet getResultSet() throws SQLException {
-    return AvaticaNoopResultSet.getInstance();
-  }
-
-  @Override public int getUpdateCount() throws SQLException {
-    return 1;
-  }
-
-  @Override public boolean getMoreResults() throws SQLException {
-    return false;
-  }
-
-  @Override public void setFetchDirection(int direction) throws SQLException {}
-
-  @Override public int getFetchDirection() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setFetchSize(int rows) throws SQLException {}
-
-  @Override public int getFetchSize() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getResultSetConcurrency() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getResultSetType() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void addBatch(String sql) throws SQLException {}
-
-  @Override public void clearBatch() throws SQLException {}
-
-  @Override public int[] executeBatch() throws SQLException {
-    return new int[0];
-  }
-
-  @Override public Connection getConnection() throws SQLException {
-    return AvaticaNoopConnection.getInstance();
-  }
-
-  @Override public boolean getMoreResults(int current) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public ResultSet getGeneratedKeys() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-    return 1;
-  }
-
-  @Override public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
-    return 1;
-  }
-
-  @Override public int executeUpdate(String sql, String[] columnNames) throws SQLException {
-    return 1;
-  }
-
-  @Override public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
-    return true;
-  }
-
-  @Override public boolean execute(String sql, int[] columnIndexes) throws SQLException {
-    return true;
-  }
-
-  @Override public boolean execute(String sql, String[] columnNames) throws SQLException {
-    return true;
-  }
-
-  @Override public int getResultSetHoldability() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isClosed() throws SQLException {
-    return false;
-  }
-
-  @Override public void setPoolable(boolean poolable) throws SQLException {}
-
-  @Override public boolean isPoolable() throws SQLException {
-    return true;
-  }
-
-  @Override public void closeOnCompletion() throws SQLException {}
-
-  @Override public boolean isCloseOnCompletion() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public <T> T unwrap(Class<T> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    return false;
-  }
-
-  @Override public ResultSet executeQuery() throws SQLException {
-    return AvaticaNoopResultSet.getInstance();
-  }
-
-  @Override public int executeUpdate() throws SQLException {
-    return 1;
-  }
-
-  @Override public void setNull(int parameterIndex, int sqlType) throws SQLException {}
-
-  @Override public void setBoolean(int parameterIndex, boolean x) throws SQLException {}
-
-  @Override public void setByte(int parameterIndex, byte x) throws SQLException {}
-
-  @Override public void setShort(int parameterIndex, short x) throws SQLException {}
-
-  @Override public void setInt(int parameterIndex, int x) throws SQLException {}
-
-  @Override public void setLong(int parameterIndex, long x) throws SQLException {}
-
-  @Override public void setFloat(int parameterIndex, float x) throws SQLException {}
-
-  @Override public void setDouble(int parameterIndex, double x) throws SQLException {}
-
-  @Override public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {}
-
-  @Override public void setString(int parameterIndex, String x) throws SQLException {}
-
-  @Override public void setBytes(int parameterIndex, byte[] x) throws SQLException {}
-
-  @Override public void setDate(int parameterIndex, Date x) throws SQLException {}
-
-  @Override public void setTime(int parameterIndex, Time x) throws SQLException {}
-
-  @Override public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {}
-
-  @Override public void setAsciiStream(int parameterIndex, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void setUnicodeStream(int parameterIndex, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void setBinaryStream(int parameterIndex, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void clearParameters() throws SQLException {}
-
-  @Override public void setObject(int parameterIndex, Object x, int targetSqlType)
-      throws SQLException {}
-
-  @Override public void setObject(int parameterIndex, Object x) throws SQLException {}
-
-  @Override public boolean execute() throws SQLException {
-    return false;
-  }
-
-  @Override public void addBatch() throws SQLException {}
-
-  @Override public void setCharacterStream(int parameterIndex, Reader reader, int length)
-      throws SQLException {}
-
-  @Override public void setRef(int parameterIndex, Ref x) throws SQLException {}
-
-  @Override public void setBlob(int parameterIndex, Blob x) throws SQLException {}
-
-  @Override public void setClob(int parameterIndex, Clob x) throws SQLException {}
-
-  @Override public void setArray(int parameterIndex, Array x) throws SQLException {}
-
-  @Override public ResultSetMetaData getMetaData() throws SQLException {
-    return AvaticaNoopResultSetMetaData.getInstance();
-  }
-
-  @Override public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {}
-
-  @Override public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {}
-
-  @Override public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
-      throws SQLException {}
-
-  @Override public void setNull(int parameterIndex, int sqlType, String typeName)
-      throws SQLException {}
-
-  @Override public void setURL(int parameterIndex, URL x) throws SQLException {}
-
-  @Override public ParameterMetaData getParameterMetaData() throws SQLException {
-    return AvaticaNoopParameterMetaData.getInstance();
-  }
-
-  @Override public void setRowId(int parameterIndex, RowId x) throws SQLException {}
-
-  @Override public void setNString(int parameterIndex, String value) throws SQLException {}
-
-  @Override public void setNCharacterStream(int parameterIndex, Reader value, long length)
-      throws SQLException {}
-
-  @Override public void setNClob(int parameterIndex, NClob value) throws SQLException {}
-
-  @Override public void setClob(int parameterIndex, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void setBlob(int parameterIndex, InputStream inputStream, long length)
-      throws SQLException {}
-
-  @Override public void setNClob(int parameterIndex, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {}
-
-  @Override public void setObject(int parameterIndex, Object x, int targetSqlType,
-      int scaleOrLength)
-      throws SQLException {}
-
-  @Override public void setAsciiStream(int parameterIndex, InputStream x, long length)
-      throws SQLException {}
-
-  @Override public void setBinaryStream(int parameterIndex, InputStream x, long length)
-      throws SQLException {}
-
-  @Override public void setCharacterStream(int parameterIndex, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {}
-
-  @Override public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {}
-
-  @Override public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {}
-
-  @Override public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {}
-
-  @Override public void setClob(int parameterIndex, Reader reader) throws SQLException {}
-
-  @Override public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {}
-
-  @Override public void setNClob(int parameterIndex, Reader reader) throws SQLException {}
-}
-
-// End AvaticaNoopPreparedStatement.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSet.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSet.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSet.java
deleted file mode 100644
index 2d71184..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSet.java
+++ /dev/null
@@ -1,661 +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.calcite.avatica.noop;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Map;
-
-/**
- * A {@link ResultSet} implementation which does nothing.
- */
-public class AvaticaNoopResultSet implements ResultSet {
-
-  private static final AvaticaNoopResultSet INSTANCE = new AvaticaNoopResultSet();
-
-  public static AvaticaNoopResultSet getInstance() {
-    return INSTANCE;
-  }
-
-  private AvaticaNoopResultSet() {}
-
-  private UnsupportedOperationException unsupported() {
-    return new UnsupportedOperationException("unsupported");
-  }
-
-  @Override public <T> T unwrap(Class<T> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean next() throws SQLException {
-    return false;
-  }
-
-  @Override public void close() throws SQLException {}
-
-  @Override public boolean wasNull() throws SQLException {
-    return false;
-  }
-
-  @Override public String getString(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean getBoolean(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public byte getByte(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public short getShort(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getInt(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public long getLong(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public float getFloat(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public double getDouble(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public byte[] getBytes(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Date getDate(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Time getTime(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Timestamp getTimestamp(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public InputStream getAsciiStream(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public InputStream getUnicodeStream(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public InputStream getBinaryStream(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public String getString(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean getBoolean(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public byte getByte(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public short getShort(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getInt(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public long getLong(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public float getFloat(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public double getDouble(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public byte[] getBytes(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Date getDate(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Time getTime(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Timestamp getTimestamp(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public InputStream getAsciiStream(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public InputStream getUnicodeStream(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public InputStream getBinaryStream(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public SQLWarning getWarnings() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void clearWarnings() throws SQLException {}
-
-  @Override public String getCursorName() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public ResultSetMetaData getMetaData() throws SQLException {
-    return AvaticaNoopResultSetMetaData.getInstance();
-  }
-
-  @Override public Object getObject(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Object getObject(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int findColumn(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Reader getCharacterStream(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Reader getCharacterStream(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isBeforeFirst() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isAfterLast() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isFirst() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isLast() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void beforeFirst() throws SQLException {}
-
-  @Override public void afterLast() throws SQLException {}
-
-  @Override public boolean first() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean last() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getRow() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean absolute(int row) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean relative(int rows) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean previous() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setFetchDirection(int direction) throws SQLException {}
-
-  @Override public int getFetchDirection() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setFetchSize(int rows) throws SQLException {}
-
-  @Override public int getFetchSize() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getType() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getConcurrency() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean rowUpdated() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean rowInserted() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean rowDeleted() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void updateNull(int columnIndex) throws SQLException {}
-
-  @Override public void updateBoolean(int columnIndex, boolean x) throws SQLException {}
-
-  @Override public void updateByte(int columnIndex, byte x) throws SQLException {}
-
-  @Override public void updateShort(int columnIndex, short x) throws SQLException {}
-
-  @Override public void updateInt(int columnIndex, int x) throws SQLException {}
-
-  @Override public void updateLong(int columnIndex, long x) throws SQLException {}
-
-  @Override public void updateFloat(int columnIndex, float x) throws SQLException {}
-
-  @Override public void updateDouble(int columnIndex, double x) throws SQLException {}
-
-  @Override public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {}
-
-  @Override public void updateString(int columnIndex, String x) throws SQLException {}
-
-  @Override public void updateBytes(int columnIndex, byte[] x) throws SQLException {}
-
-  @Override public void updateDate(int columnIndex, Date x) throws SQLException {}
-
-  @Override public void updateTime(int columnIndex, Time x) throws SQLException {}
-
-  @Override public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {}
-
-  @Override public void updateAsciiStream(int columnIndex, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void updateBinaryStream(int columnIndex, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void updateCharacterStream(int columnIndex, Reader x, int length)
-      throws SQLException {}
-
-  @Override public void updateObject(int columnIndex, Object x, int scaleOrLength)
-      throws SQLException {}
-
-  @Override public void updateObject(int columnIndex, Object x) throws SQLException {}
-
-  @Override public void updateNull(String columnLabel) throws SQLException {}
-
-  @Override public void updateBoolean(String columnLabel, boolean x) throws SQLException {}
-
-  @Override public void updateByte(String columnLabel, byte x) throws SQLException {}
-
-  @Override public void updateShort(String columnLabel, short x) throws SQLException {}
-
-  @Override public void updateInt(String columnLabel, int x) throws SQLException {}
-
-  @Override public void updateLong(String columnLabel, long x) throws SQLException {}
-
-  @Override public void updateFloat(String columnLabel, float x) throws SQLException {}
-
-  @Override public void updateDouble(String columnLabel, double x) throws SQLException {}
-
-  @Override public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {}
-
-  @Override public void updateString(String columnLabel, String x) throws SQLException {}
-
-  @Override public void updateBytes(String columnLabel, byte[] x) throws SQLException {}
-
-  @Override public void updateDate(String columnLabel, Date x) throws SQLException {}
-
-  @Override public void updateTime(String columnLabel, Time x) throws SQLException {}
-
-  @Override public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {}
-
-  @Override public void updateAsciiStream(String columnLabel, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void updateBinaryStream(String columnLabel, InputStream x, int length)
-      throws SQLException {}
-
-  @Override public void updateCharacterStream(String columnLabel, Reader reader, int length)
-      throws SQLException {}
-
-  @Override public void updateObject(String columnLabel, Object x, int scaleOrLength)
-      throws SQLException {}
-
-  @Override public void updateObject(String columnLabel, Object x) throws SQLException {}
-
-  @Override public void insertRow() throws SQLException {}
-
-  @Override public void updateRow() throws SQLException {}
-
-  @Override public void deleteRow() throws SQLException {}
-
-  @Override public void refreshRow() throws SQLException {}
-
-  @Override public void cancelRowUpdates() throws SQLException {}
-
-  @Override public void moveToInsertRow() throws SQLException {}
-
-  @Override public void moveToCurrentRow() throws SQLException {}
-
-  @Override public Statement getStatement() throws SQLException {
-    return AvaticaNoopStatement.getInstance();
-  }
-
-  @Override public Object getObject(int columnIndex, Map<String, Class<?>> map)
-      throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Ref getRef(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Blob getBlob(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Clob getClob(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Array getArray(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Object getObject(String columnLabel, Map<String, Class<?>> map)
-      throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Ref getRef(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Blob getBlob(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Clob getClob(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Array getArray(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Date getDate(int columnIndex, Calendar cal) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Date getDate(String columnLabel, Calendar cal) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Time getTime(int columnIndex, Calendar cal) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Time getTime(String columnLabel, Calendar cal) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public URL getURL(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public URL getURL(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void updateRef(int columnIndex, Ref x) throws SQLException {}
-
-  @Override public void updateRef(String columnLabel, Ref x) throws SQLException {}
-
-  @Override public void updateBlob(int columnIndex, Blob x) throws SQLException {}
-
-  @Override public void updateBlob(String columnLabel, Blob x) throws SQLException {}
-
-  @Override public void updateClob(int columnIndex, Clob x) throws SQLException {}
-
-  @Override public void updateClob(String columnLabel, Clob x) throws SQLException {}
-
-  @Override public void updateArray(int columnIndex, Array x) throws SQLException {}
-
-  @Override public void updateArray(String columnLabel, Array x) throws SQLException {}
-
-  @Override public RowId getRowId(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public RowId getRowId(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void updateRowId(int columnIndex, RowId x) throws SQLException {}
-
-  @Override public void updateRowId(String columnLabel, RowId x) throws SQLException {}
-
-  @Override public int getHoldability() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isClosed() throws SQLException {
-    return false;
-  }
-
-  @Override public void updateNString(int columnIndex, String nString) throws SQLException {}
-
-  @Override public void updateNString(String columnLabel, String nString) throws SQLException {}
-
-  @Override public void updateNClob(int columnIndex, NClob nClob) throws SQLException {}
-
-  @Override public void updateNClob(String columnLabel, NClob nClob) throws SQLException {}
-
-  @Override public NClob getNClob(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public NClob getNClob(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public SQLXML getSQLXML(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public SQLXML getSQLXML(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {}
-
-  @Override public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {}
-
-  @Override public String getNString(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public String getNString(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Reader getNCharacterStream(int columnIndex) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public Reader getNCharacterStream(String columnLabel) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void updateNCharacterStream(int columnIndex, Reader x, long length)
-      throws SQLException {}
-
-  @Override public void updateNCharacterStream(String columnLabel, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void updateAsciiStream(int columnIndex, InputStream x, long length)
-      throws SQLException {}
-
-  @Override public void updateBinaryStream(int columnIndex, InputStream x, long length)
-      throws SQLException {}
-
-  @Override public void updateCharacterStream(int columnIndex, Reader x, long length)
-      throws SQLException {}
-
-  @Override public void updateAsciiStream(String columnLabel, InputStream x, long length)
-      throws SQLException {}
-
-  @Override public void updateBinaryStream(String columnLabel, InputStream x, long length)
-      throws SQLException {}
-
-  @Override public void updateCharacterStream(String columnLabel, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void updateBlob(int columnIndex, InputStream inputStream, long length)
-      throws SQLException {}
-
-  @Override public void updateBlob(String columnLabel, InputStream inputStream, long length)
-      throws SQLException {}
-
-  @Override public void updateClob(int columnIndex, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void updateClob(String columnLabel, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void updateNClob(int columnIndex, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void updateNClob(String columnLabel, Reader reader, long length)
-      throws SQLException {}
-
-  @Override public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {}
-
-  @Override public void updateNCharacterStream(String columnLabel, Reader reader)
-      throws SQLException {}
-
-  @Override public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {}
-
-  @Override public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {}
-
-  @Override public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {}
-
-  @Override public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {}
-
-  @Override public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {}
-
-  @Override public void updateCharacterStream(String columnLabel, Reader reader)
-      throws SQLException {}
-
-  @Override public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {}
-
-  @Override public void updateBlob(String columnLabel, InputStream inputStream)
-      throws SQLException {}
-
-  @Override public void updateClob(int columnIndex, Reader reader) throws SQLException {}
-
-  @Override public void updateClob(String columnLabel, Reader reader) throws SQLException {}
-
-  @Override public void updateNClob(int columnIndex, Reader reader) throws SQLException {}
-
-  @Override public void updateNClob(String columnLabel, Reader reader) throws SQLException {}
-
-  @Override public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-    throw unsupported();
-  }
-
-}
-
-// End AvaticaNoopResultSet.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSetMetaData.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSetMetaData.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSetMetaData.java
deleted file mode 100644
index ddc8c3b..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopResultSetMetaData.java
+++ /dev/null
@@ -1,133 +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.calcite.avatica.noop;
-
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-
-/**
- * A {@link ResultSetMetaData} implementation which does nothing.
- */
-public class AvaticaNoopResultSetMetaData implements ResultSetMetaData {
-
-  private static final AvaticaNoopResultSetMetaData INSTANCE = new AvaticaNoopResultSetMetaData();
-
-  public static AvaticaNoopResultSetMetaData getInstance() {
-    return INSTANCE;
-  }
-
-  private AvaticaNoopResultSetMetaData() {}
-
-  private UnsupportedOperationException unsupported() {
-    return new UnsupportedOperationException("Unsupported");
-  }
-
-  @Override public <T> T unwrap(Class<T> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getColumnCount() throws SQLException {
-    return 0;
-  }
-
-  @Override public boolean isAutoIncrement(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public boolean isCaseSensitive(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public boolean isSearchable(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public boolean isCurrency(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public int isNullable(int column) throws SQLException {
-    return 0;
-  }
-
-  @Override public boolean isSigned(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public int getColumnDisplaySize(int column) throws SQLException {
-    return 0;
-  }
-
-  @Override public String getColumnLabel(int column) throws SQLException {
-    return "";
-  }
-
-  @Override public String getColumnName(int column) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public String getSchemaName(int column) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getPrecision(int column) throws SQLException {
-    return 0;
-  }
-
-  @Override public int getScale(int column) throws SQLException {
-    return 0;
-  }
-
-  @Override public String getTableName(int column) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public String getCatalogName(int column) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getColumnType(int column) throws SQLException {
-    return 0;
-  }
-
-  @Override public String getColumnTypeName(int column) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isReadOnly(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public boolean isWritable(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public boolean isDefinitelyWritable(int column) throws SQLException {
-    return false;
-  }
-
-  @Override public String getColumnClassName(int column) throws SQLException {
-    throw unsupported();
-  }
-
-}
-
-// End AvaticaNoopResultSetMetaData.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopStatement.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopStatement.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopStatement.java
deleted file mode 100644
index 079cea4..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/AvaticaNoopStatement.java
+++ /dev/null
@@ -1,191 +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.calcite.avatica.noop;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-
-/**
- * A {@link Statement} implementation which does nothing.
- */
-public class AvaticaNoopStatement implements Statement {
-
-  private static final AvaticaNoopStatement INSTANCE = new AvaticaNoopStatement();
-
-  public static AvaticaNoopStatement getInstance() {
-    return INSTANCE;
-  }
-
-  private AvaticaNoopStatement() {}
-
-  private UnsupportedOperationException unsupported() {
-    return new UnsupportedOperationException("Unsupported");
-  }
-
-  @Override public ResultSet executeQuery(String sql) throws SQLException {
-    return AvaticaNoopResultSet.getInstance();
-  }
-
-  @Override public int executeUpdate(String sql) throws SQLException {
-    return 1;
-  }
-
-  @Override public void close() throws SQLException {}
-
-  @Override public int getMaxFieldSize() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setMaxFieldSize(int max) throws SQLException {}
-
-  @Override public int getMaxRows() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setMaxRows(int max) throws SQLException {}
-
-  @Override public void setEscapeProcessing(boolean enable) throws SQLException {}
-
-  @Override public int getQueryTimeout() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setQueryTimeout(int seconds) throws SQLException {}
-
-  @Override public void cancel() throws SQLException {}
-
-  @Override public SQLWarning getWarnings() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void clearWarnings() throws SQLException {}
-
-  @Override public void setCursorName(String name) throws SQLException {}
-
-  @Override public boolean execute(String sql) throws SQLException {
-    return false;
-  }
-
-  @Override public ResultSet getResultSet() throws SQLException {
-    return AvaticaNoopResultSet.getInstance();
-  }
-
-  @Override public int getUpdateCount() throws SQLException {
-    return 1;
-  }
-
-  @Override public boolean getMoreResults() throws SQLException {
-    return false;
-  }
-
-  @Override public void setFetchDirection(int direction) throws SQLException {}
-
-  @Override public int getFetchDirection() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void setFetchSize(int rows) throws SQLException {}
-
-  @Override public int getFetchSize() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getResultSetConcurrency() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int getResultSetType() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public void addBatch(String sql) throws SQLException {}
-
-  @Override public void clearBatch() throws SQLException {}
-
-  @Override public int[] executeBatch() throws SQLException {
-    return new int[0];
-  }
-
-  @Override public Connection getConnection() throws SQLException {
-    return AvaticaNoopConnection.getInstance();
-  }
-
-  @Override public boolean getMoreResults(int current) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public ResultSet getGeneratedKeys() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-    return 1;
-  }
-
-  @Override public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
-    return 1;
-  }
-
-  @Override public int executeUpdate(String sql, String[] columnNames) throws SQLException {
-    return 1;
-  }
-
-  @Override public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
-    return true;
-  }
-
-  @Override public boolean execute(String sql, int[] columnIndexes) throws SQLException {
-    return true;
-  }
-
-  @Override public boolean execute(String sql, String[] columnNames) throws SQLException {
-    return true;
-  }
-
-  @Override public int getResultSetHoldability() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isClosed() throws SQLException {
-    return false;
-  }
-
-  @Override public void setPoolable(boolean poolable) throws SQLException {}
-
-  @Override public boolean isPoolable() throws SQLException {
-    return true;
-  }
-
-  @Override public void closeOnCompletion() throws SQLException {}
-
-  @Override public boolean isCloseOnCompletion() throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public <T> T unwrap(Class<T> iface) throws SQLException {
-    throw unsupported();
-  }
-
-  @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    throw unsupported();
-  }
-}
-
-// End AvaticaNoopStatement.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/PackageMarker.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/PackageMarker.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/PackageMarker.java
deleted file mode 100644
index 6ae1905..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/PackageMarker.java
+++ /dev/null
@@ -1,37 +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.calcite.avatica.noop;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This is a dummy annotation that forces javac to produce output for
- * otherwise empty package-info.java.
- *
- * <p>The result is maven-compiler-plugin can properly identify the scope of
- * changed files
- *
- * <p>See more details in
- * <a href="https://jira.codehaus.org/browse/MCOMPILER-205">
- *   maven-compiler-plugin: incremental compilation broken</a>
- */
-@Retention(RetentionPolicy.SOURCE)
-public @interface PackageMarker {
-}
-
-// End PackageMarker.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/package-info.java
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/package-info.java b/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/package-info.java
deleted file mode 100644
index da1c5c4..0000000
--- a/avatica-noop/src/main/java/org/apache/calcite/avatica/noop/package-info.java
+++ /dev/null
@@ -1,24 +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.
- */
-
-/**
- * A no-operation implementation of a JDBC driver built for testing Avatica.
- */
-@PackageMarker
-package org.apache.calcite.avatica.noop;
-
-// End package-info.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-noop/src/main/resources/META-INF/services/java.sql.Driver
----------------------------------------------------------------------
diff --git a/avatica-noop/src/main/resources/META-INF/services/java.sql.Driver b/avatica-noop/src/main/resources/META-INF/services/java.sql.Driver
deleted file mode 100644
index 24845b0..0000000
--- a/avatica-noop/src/main/resources/META-INF/services/java.sql.Driver
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.calcite.avatica.noop.AvaticaNoopDriver

http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-server/pom.xml b/avatica-server/pom.xml
deleted file mode 100644
index 9a896f5..0000000
--- a/avatica-server/pom.xml
+++ /dev/null
@@ -1,196 +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>
-  <parent>
-    <groupId>org.apache.calcite</groupId>
-    <artifactId>calcite</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>calcite-avatica-server</artifactId>
-  <packaging>jar</packaging>
-  <name>Calcite Avatica Server</name>
-  <description>JDBC server.</description>
-
-  <properties>
-    <top.dir>${project.basedir}/..</top.dir>
-  </properties>
-
-  <dependencies>
-    <!-- Sorted by groupId, artifactId; calcite dependencies first. Put versions
-         in dependencyManagement in the root POM, not here. -->
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-avatica</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-avatica</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <!-- Used in RemoteDriverTest but dependency not detected by maven-dependency-plugin:2.8:analyze -->
-      <groupId>net.hydromatic</groupId>
-      <artifactId>scott-data-hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <!-- Used in RemoteDriverTest but dependency not detected by maven-dependency-plugin:2.8:analyze -->
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.stephenc.jcip</groupId>
-      <artifactId>jcip-annotations</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.12.1,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!-- Parent module has the same plugin and does the work of
-           generating -sources.jar for each project. But without the
-           plugin declared here, IDEs don't know the sources are
-           available. -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>jar-no-fork</goal>
-              <goal>test-jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>${maven-dependency-plugin.version}</version>
-        <!-- configurations do not cascade, so all of the definition from
-             ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
-        <executions>
-          <execution>
-            <id>analyze</id>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <!-- ignore "unused but declared" warnings -->
-              <ignoredUnusedDeclaredDependencies>
-                <ignoredUnusedDeclaredDependency>io.dropwizard.metrics:metrics-core</ignoredUnusedDeclaredDependency>
-                <ignoredUnusedDeclaredDependency>net.hydromatic:scott-data-hsqldb</ignoredUnusedDeclaredDependency>
-                <ignoredUnusedDeclaredDependency>org.hsqldb:hsqldb</ignoredUnusedDeclaredDependency>
-                <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-api</ignoredUnusedDeclaredDependency>
-                <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-log4j12</ignoredUnusedDeclaredDependency>
-              </ignoredUnusedDeclaredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>