Permalink
Browse files

* Renamed to SQLDroid

* Bumped to version 0.3.0
  • Loading branch information...
1 parent bd4042b commit 5c711c7db55d95aae681d175434d27a4a302fc1c @donv donv committed Jan 24, 2012
View
@@ -3,5 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="bin/classes"/>
</classpath>
View
@@ -1 +1 @@
-<manifest package="com.lemadi.storage.database"></manifest>
+<manifest package="org.sqldroid"></manifest>
View
@@ -3,11 +3,11 @@ require 'lib/sqldroid/version'
ANDROID_SDK_HOME = File.dirname(File.dirname(`which dx`))
PKG_DIR = File.expand_path "pkg"
-JAR = "sqldroid-#{Sqldroid::VERSION}.jar"
+JAR = "sqldroid-#{SQLDroid::VERSION}.jar"
JAR_IN_PKG = "#{PKG_DIR}/#{JAR}"
LIB_DIR = File.expand_path 'lib/sqldroid'
JAR_IN_GEM = "#{LIB_DIR}/#{JAR}"
-GEM_FILE = "sqldroid-#{Sqldroid::VERSION}.gem"
+GEM_FILE = "sqldroid-#{SQLDroid::VERSION}.gem"
GEM_FILE_PKG = "#{PKG_DIR}/#{GEM_FILE}"
JAVA_SRC_FILES = Dir[File.expand_path 'src/**/*.java']
@@ -18,8 +18,8 @@ task :jar => JAR_IN_PKG
file JAR_IN_PKG => JAVA_SRC_FILES do
FileUtils.mkdir_p 'bin'
sh "javac -cp #{ANDROID_SDK_HOME}/platforms/android-11/android.jar -d bin -sourcepath src src/*/*/*.java"
+ FileUtils.mkdir_p PKG_DIR
Dir.chdir 'bin' do
- FileUtils.mkdir_p PKG_DIR
sh "jar cf #{PKG_DIR}/#{JAR} org"
end
end
View
@@ -1,6 +1,6 @@
require "sqldroid/version"
-require "sqldroid/sqldroid-#{Sqldroid::VERSION}.jar"
+require "sqldroid/sqldroid-#{SQLDroid::VERSION}.jar"
-module Sqldroid
+module SQLDroid
# No code, yet.
end
View
@@ -1,3 +1,3 @@
-module Sqldroid
- VERSION = "0.2.3"
+module SQLDroid
+ VERSION = "0.3.0"
end
@@ -1,13 +1,13 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
+#
# This file must be checked in Version Control Systems.
-#
+#
# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
# project structure.
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
-target=android-11
+target=android-4
View
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jardesc>
- <jar path="sqldroid/pkg/sqldroid-0.2.1.jar"/>
- <options buildIfNeeded="true" compress="true" descriptionLocation="/sqldroid/my-export-bin.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
- <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
- <selectedProjects/>
- <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
- <sealing sealJar="false">
- <packagesToSeal/>
- <packagesToUnSeal/>
- </sealing>
- </manifest>
- <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
- <javaElement handleIdentifier="=sqldroid/src"/>
- </selectedElements>
-</jardesc>
View
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="MacRoman" standalone="no"?>
-<jardesc>
- <jar path="sqldroid/pkg/sqldroid-0.2.1-src.jar"/>
- <options buildIfNeeded="true" compress="true" descriptionLocation="/sqldroid/sqldroid-src.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
- <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
- <selectedProjects/>
- <selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false">
- <javaElement handleIdentifier="=sqldroid/src"/>
- </selectedElements>
-</jardesc>
View
@@ -4,7 +4,7 @@ require "sqldroid/version"
Gem::Specification.new do |s|
s.name = "sqldroid"
- s.version = Sqldroid::VERSION
+ s.version = SQLDroid::VERSION
s.authors = ["donv"]
s.email = ["uwe@kubosch.no"]
s.homepage = "http://sqldroid.org/"
@@ -48,7 +48,7 @@
* @param info currently not used
*/
public SQLDroidConnection(String url, Properties info) throws SQLException {
- Log.i("Sqldroid", "new sqlite jdbc from url '" + url + "', " + "'" + info + "'");
+ Log.i("SQLDroid", "new sqlite jdbc from url '" + url + "', " + "'" + info + "'");
// Make a filename from url
String dbQname;
@@ -57,7 +57,7 @@ public SQLDroidConnection(String url, Properties info) throws SQLException {
}
else {
// there does not seem to be any possibility of error handling.
- // So we could check that the url starts with SqldroidDriver.sqldroidPrefix
+ // So we could check that the url starts with SQLDroidDriver.sqldroidPrefix
// but if it doesn't there's nothing we can do (no Exception is specified)
// so it has to be assumed that the URL is valid when passed to this method.
dbQname = url.substring(SQLDroidDriver.sqldroidPrefix.length());
@@ -90,7 +90,7 @@ public void clearWarnings() throws SQLException {
}
/** This will create and return an exception. For API levels less than 9 this will return
- * a SqldroidSQLException, for later APIs it will return a SQLException.
+ * a SQLDroidSQLException, for later APIs it will return a SQLException.
*/
public static SQLException chainException (android.database.SQLException sqlException) {
if ( sqlThrowable < 0 || sqlThrowable >= 9 ) {
@@ -106,12 +106,12 @@ public static SQLException chainException (android.database.SQLException sqlExce
}
}
// if the code above worked correctly, then the exception will have been returned. Otherwise, we need
- // to go through this clause and create a SqldroidSQLException
+ // to go through this clause and create a SQLDroidSQLException
try {
// avoid a direct reference to the sqldroidSQLException so that app > API level 9 do not need that class.
- final Constructor<?> c = SQLDroidConnection.class.getClassLoader().loadClass("org.sqldroid.SqldroidSQLException").getDeclaredConstructor(new Class[] {android.database.SQLException.class});
- // SqldroidSQLException is an instance of (direct subclass of) SQLException, so the cast below is correct although
- // the instance created will always be a SqldroidSQLException
+ final Constructor<?> c = SQLDroidConnection.class.getClassLoader().loadClass("org.sqldroid.SQLDroidSQLException").getDeclaredConstructor(new Class[] {android.database.SQLException.class});
+ // SQLDroidSQLException is an instance of (direct subclass of) SQLException, so the cast below is correct although
+ // the instance created will always be a SQLDroidSQLException
return (SQLException)c.newInstance(new Object[]{sqlException});
} catch (Exception e) {
return new SQLException ("Unable to Chain SQLException " + sqlException.getMessage());
@@ -225,7 +225,7 @@ public boolean isReadOnly() throws SQLException {
public String nativeSQL(String sql) throws SQLException {
System.err.println(" ********************* not implemented @ " + DebugPrinter.getFileName() + " line " + DebugPrinter.getLineNumber());
sqlitedb.execSQL(sql);
- return "Sqldroid: no return info available from sqlite";
+ return "SQLDroid: no return info available from sqlite";
}
@Override
@@ -359,7 +359,7 @@ public void setTypeMap(Map<String, Class<?>> arg0) throws SQLException {
@Override
protected void finalize() throws Throwable {
- Log.i("Sqldroid", " --- Finalize Sqldroid, closing db.");
+ Log.i("SQLDroid", " --- Finalize SQLDroid, closing db.");
if (sqlitedb != null) {
sqlitedb.close();
}
@@ -568,7 +568,7 @@ public Timestamp getTimestamp(int index) throws SQLException {
break;
}
- //System.err.println("SqldroidResultSet Timestamp:getTimestamp(int) " + md.getColumnType(index) + " Value " + getString(index) + " TimeStamp " + timestamp);
+ //System.err.println("SQLDroidResultSet Timestamp:getTimestamp(int) " + md.getColumnType(index) + " Value " + getString(index) + " TimeStamp " + timestamp);
return timestamp;
} catch (android.database.SQLException e) {
throw SQLDroidConnection.chainException(e);

0 comments on commit 5c711c7

Please sign in to comment.