incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: JDBC project now converted to thrift re-package, and now compiles with java 7. Still not offically supported.
Date Mon, 27 May 2013 17:18:33 GMT
Updated Branches:
  refs/heads/0.1.5 f86600aba -> 776589536


JDBC project now converted to thrift re-package, and now compiles with java 7.  Still not
offically supported.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/77658953
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/77658953
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/77658953

Branch: refs/heads/0.1.5
Commit: 776589536378feb58618382acbaee141cf862cf8
Parents: f86600a
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon May 27 13:17:13 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon May 27 13:17:13 2013 -0400

----------------------------------------------------------------------
 src/blur-jdbc/pom.xml                              |   78 +++------------
 src/blur-jdbc/src/assemble/bin.xml                 |    8 ++
 .../org/apache/blur/jdbc/BlurDatabaseMetaData.java |    2 +-
 .../org/apache/blur/jdbc/BlurResultSetRecords.java |    4 +-
 .../org/apache/blur/jdbc/BlurResultSetRows.java    |    4 +-
 .../java/org/apache/blur/jdbc/BlurStatement.java   |    4 +-
 .../AbstractBlurPreparedStatement.java             |   14 ++--
 .../jdbc/abstractimpl/AbstractBlurResultSet.java   |   14 ++--
 .../jdbc/abstractimpl/AbstractBlurStatement.java   |   14 ++--
 src/pom.xml                                        |    1 +
 10 files changed, 52 insertions(+), 91 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/pom.xml b/src/blur-jdbc/pom.xml
index adccd4c..1830533 100644
--- a/src/blur-jdbc/pom.xml
+++ b/src/blur-jdbc/pom.xml
@@ -1,28 +1,21 @@
 <?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.
--->
+<!-- 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">
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
 		<version>0.1.5</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.blur</groupId>
@@ -34,17 +27,17 @@ under the License.
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-thrift</artifactId>
-			<version>0.1.3</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-util</artifactId>
-			<version>0.1.3</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
+			<version>${log4j.version}</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -68,6 +61,7 @@ under the License.
 	</dependencies>
 
 	<build>
+		<finalName>blur-jdbc-${project.version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -77,48 +71,6 @@ under the License.
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/../../../lib
-							</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
-							<excludeArtifactIds>junit,commons-cli,commons-logging,hadoop-core,slf4j-api,slf4j-log4j12</excludeArtifactIds>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attached</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
-
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/assemble/bin.xml b/src/blur-jdbc/src/assemble/bin.xml
new file mode 100644
index 0000000..463fdbc
--- /dev/null
+++ b/src/blur-jdbc/src/assemble/bin.xml
@@ -0,0 +1,8 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>bin</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
index 299e87d..fd3098a 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
@@ -31,13 +31,13 @@ import java.util.TreeMap;
 import org.apache.blur.jdbc.abstractimpl.AbstractBlurDatabaseMetaData;
 import org.apache.blur.jdbc.util.EmptyResultSet;
 import org.apache.blur.jdbc.util.SimpleStringResultSet;
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.BlurClientManager;
 import org.apache.blur.thrift.commands.BlurCommand;
 import org.apache.blur.thrift.generated.Blur.Client;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.thrift.TException;
 
 
 public class BlurDatabaseMetaData extends AbstractBlurDatabaseMetaData {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
index c7c54cb..c86e574 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
@@ -33,6 +33,8 @@ import java.util.Set;
 
 import org.apache.blur.jdbc.abstractimpl.AbstractBlurResultSet;
 import org.apache.blur.jdbc.parser.Parser;
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
+import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResult;
@@ -43,8 +45,6 @@ import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.SimpleQuery;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.thrift.TException;
 
 
 public class BlurResultSetRecords extends AbstractBlurResultSet {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
index bb2a510..662864f 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
@@ -31,6 +31,8 @@ import java.util.Random;
 
 import org.apache.blur.jdbc.abstractimpl.AbstractBlurResultSet;
 import org.apache.blur.jdbc.parser.Parser;
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
+import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResult;
@@ -42,8 +44,6 @@ import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.SimpleQuery;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.thrift.TException;
 
 
 public class BlurResultSetRows extends AbstractBlurResultSet {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurStatement.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurStatement.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurStatement.java
index 7e622f0..274e16d 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurStatement.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurStatement.java
@@ -24,10 +24,10 @@ import java.util.List;
 
 import org.apache.blur.jdbc.abstractimpl.AbstractBlurStatement;
 import org.apache.blur.jdbc.parser.Parser;
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.BlurClient;
-import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.thrift.TException;
+import org.apache.blur.thrift.generated.BlurException;
 
 
 public class BlurStatement extends AbstractBlurStatement {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java
b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java
index 99cc495..eef2bec 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java
@@ -448,12 +448,12 @@ public class AbstractBlurPreparedStatement implements PreparedStatement
{
 
   // java 7
 
-//  public void closeOnCompletion() throws SQLException {
-//    throwExceptionDelegate.closeOnCompletion();
-//  }
-//
-//  public boolean isCloseOnCompletion() throws SQLException {
-//    return throwExceptionDelegate.isCloseOnCompletion();
-//  }
+  public void closeOnCompletion() throws SQLException {
+    throw new SQLException("No supported");
+  }
+
+  public boolean isCloseOnCompletion() throws SQLException {
+    throw new SQLException("No supported");
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java
b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java
index 954643d..ab33e70 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java
@@ -819,11 +819,11 @@ public abstract class AbstractBlurResultSet implements ResultSet {
 
   // java 7
 
-//  public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
{
-//    return throwExceptionDelegate.getObject(columnIndex, type);
-//  }
-//
-//  public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
{
-//    return throwExceptionDelegate.getObject(columnLabel, type);
-//  }
+  public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
{
+    throw new SQLException("No supported");
+  }
+
+  public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
{
+    throw new SQLException("No supported");
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java
----------------------------------------------------------------------
diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java
b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java
index 4e621c5..ff0f203 100644
--- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java
+++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java
@@ -211,12 +211,12 @@ public class AbstractBlurStatement implements Statement {
 
   // java 7
 
-//  public void closeOnCompletion() throws SQLException {
-//    throwExceptionDelegate.closeOnCompletion();
-//  }
-//
-//  public boolean isCloseOnCompletion() throws SQLException {
-//    return throwExceptionDelegate.isCloseOnCompletion();
-//  }
+  public void closeOnCompletion() throws SQLException {
+    throw new SQLException("No supported");
+  }
+
+  public boolean isCloseOnCompletion() throws SQLException {
+    throw new SQLException("No supported");
+  }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/77658953/src/pom.xml
----------------------------------------------------------------------
diff --git a/src/pom.xml b/src/pom.xml
index 6a5cb65..e4954a3 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -67,6 +67,7 @@ under the License.
 		<module>blur-util</module>
 		<module>blur-gui</module>
 		<module>blur-shell</module>
+		<module>blur-jdbc</module>
 		<module>distribution</module>
 	</modules>
 


Mime
View raw message