From 2f5b5fd7e6e7c94cedbb2eeeb5a5f8445dcaf814 Mon Sep 17 00:00:00 2001
From: Rogiel <rogiel@rogiel.com>
Date: Mon, 19 Sep 2011 15:59:28 -0300
Subject: [PATCH 1/2] Add support for derby database

Apache Derby is an simple embeddable SQL database. It stores data in a
plain file.
---
 pom.xml                                  | 15 ++++++-
 src/assembly/distribution-derby-bin.xml  | 50 ++++++++++++++++++++++++
 src/assembly/distribution-h2-bin.xml     |  5 ++-
 src/assembly/distribution-mysql5-bin.xml |  5 ++-
 4 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 src/assembly/distribution-derby-bin.xml

diff --git a/pom.xml b/pom.xml
index e3c654f85..1621984a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,9 +93,18 @@
 					<descriptors>
 						<descriptor>src/assembly/distribution-mysql5-bin.xml</descriptor>
 						<descriptor>src/assembly/distribution-h2-bin.xml</descriptor>
+						<descriptor>src/assembly/distribution-derby-bin.xml</descriptor>
 						<descriptor>src/assembly/distribution-src.xml</descriptor>
 					</descriptors>
 				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>assembly</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -168,6 +177,11 @@
 			<type>jar</type>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.8.1.2</version>
+		</dependency>
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
@@ -234,7 +248,6 @@
 			<type>jar</type>
 			<scope>runtime</scope>
 		</dependency>
-		<!-- vfs -->
 	</dependencies>
 
 	<repositories>
diff --git a/src/assembly/distribution-derby-bin.xml b/src/assembly/distribution-derby-bin.xml
new file mode 100644
index 000000000..3a629a1a1
--- /dev/null
+++ b/src/assembly/distribution-derby-bin.xml
@@ -0,0 +1,50 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>derby-bin</id>
+	<formats>
+<!-- 		<format>tar.gz</format> -->
+<!-- 		<format>tar.bz2</format> -->
+		<format>zip</format>
+	</formats>
+	<baseDirectory></baseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>data/**</include>
+			</includes>
+			<excludes>
+				<exclude>.gitignore</exclude>
+				<exclude>data/cache/**</exclude>
+				<exclude>data/pathing.db</exclude>
+				<exclude>data/database.h2.*</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/dist</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.build.directory}</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>${project.artifactId}-${project.version}.jar</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>/libs</outputDirectory>
+			<useProjectArtifact>true</useProjectArtifact>
+			<unpack>false</unpack>
+			<scope>runtime</scope>
+			<excludes>
+				<exclude>mysql:*</exclude>
+				<exclude>com.h2database:*</exclude>
+			</excludes>
+		</dependencySet>
+	</dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/src/assembly/distribution-h2-bin.xml b/src/assembly/distribution-h2-bin.xml
index b65c20d1e..49830ebcb 100644
--- a/src/assembly/distribution-h2-bin.xml
+++ b/src/assembly/distribution-h2-bin.xml
@@ -46,8 +46,9 @@
 			<unpack>false</unpack>
 			<scope>runtime</scope>
 			<excludes>
-				<exclude>mysql:mysql-connector-java</exclude>
+				<exclude>mysql:*</exclude>
+				<exclude>org.apache.derby:*</exclude>
 			</excludes>
 		</dependencySet>
 	</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/assembly/distribution-mysql5-bin.xml b/src/assembly/distribution-mysql5-bin.xml
index 072becec2..d65156332 100644
--- a/src/assembly/distribution-mysql5-bin.xml
+++ b/src/assembly/distribution-mysql5-bin.xml
@@ -46,8 +46,9 @@
 			<unpack>false</unpack>
 			<scope>runtime</scope>
 			<excludes>
-				<exclude>com.h2database:h2</exclude>
+				<exclude>com.h2database:*</exclude>
+				<exclude>org.apache.derby:*</exclude>
 			</excludes>
 		</dependencySet>
 	</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>

From 470236e9714c1ad2583549ef92988ca1640ef33d Mon Sep 17 00:00:00 2001
From: Rogiel <rogiel@rogiel.com>
Date: Mon, 19 Sep 2011 16:05:44 -0300
Subject: [PATCH 2/2] Rebase to 'master'

---
 src/assembly/distribution-derby-bin.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/assembly/distribution-derby-bin.xml b/src/assembly/distribution-derby-bin.xml
index 3a629a1a1..6d8beadce 100644
--- a/src/assembly/distribution-derby-bin.xml
+++ b/src/assembly/distribution-derby-bin.xml
@@ -24,7 +24,11 @@
 			</excludes>
 		</fileSet>
 		<fileSet>
-			<directory>${project.basedir}/dist</directory>
+			<directory>${project.basedir}/distribution/global</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/distribution/sql</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
 		<fileSet>