From c4052ccb3bf8afccbd657a987fff1d5d45da5c52 Mon Sep 17 00:00:00 2001
From: Rogiel <rogiel@rogiel.com>
Date: Mon, 19 Sep 2011 16:03:39 -0300
Subject: [PATCH] Divides 'dist' folder into several assembly specific
 distribution parts

The 'dist' folder has been renamed to 'distribution' and divided into 2
subfolders:
 - 'distribution/global' -> included in all assemblies
 - 'distribution/sql' -> included in SQL assemblies
---
 {dist => distribution/global}/LICENSE                  |  0
 {dist => distribution/global}/README                   |  0
 {dist => distribution/global}/config/config.xml        |  0
 .../global}/config/properties/database.properties      |  0
 .../global}/config/properties/template.properties      |  0
 .../global}/config/properties/vfs.properties           |  0
 {dist => distribution/global}/start.sh                 |  0
 {dist => distribution/sql}/sql/actor_skill.sql         |  0
 {dist => distribution/sql}/sql/character.sql           |  0
 {dist => distribution/sql}/sql/character_friend.sql    |  0
 {dist => distribution/sql}/sql/character_shortcut.sql  |  0
 {dist => distribution/sql}/sql/clan.sql                |  0
 {dist => distribution/sql}/sql/item.sql                |  0
 {dist => distribution/sql}/sql/log_chat.sql            |  0
 {dist => distribution/sql}/sql/npc.sql                 |  0
 src/assembly/distribution-h2-bin.xml                   | 10 +++++++---
 src/assembly/distribution-mysql5-bin.xml               | 10 +++++++---
 src/assembly/distribution-src.xml                      |  4 ++--
 18 files changed, 16 insertions(+), 8 deletions(-)
 rename {dist => distribution/global}/LICENSE (100%)
 rename {dist => distribution/global}/README (100%)
 rename {dist => distribution/global}/config/config.xml (100%)
 rename {dist => distribution/global}/config/properties/database.properties (100%)
 rename {dist => distribution/global}/config/properties/template.properties (100%)
 rename {dist => distribution/global}/config/properties/vfs.properties (100%)
 rename {dist => distribution/global}/start.sh (100%)
 rename {dist => distribution/sql}/sql/actor_skill.sql (100%)
 rename {dist => distribution/sql}/sql/character.sql (100%)
 rename {dist => distribution/sql}/sql/character_friend.sql (100%)
 rename {dist => distribution/sql}/sql/character_shortcut.sql (100%)
 rename {dist => distribution/sql}/sql/clan.sql (100%)
 rename {dist => distribution/sql}/sql/item.sql (100%)
 rename {dist => distribution/sql}/sql/log_chat.sql (100%)
 rename {dist => distribution/sql}/sql/npc.sql (100%)

diff --git a/dist/LICENSE b/distribution/global/LICENSE
similarity index 100%
rename from dist/LICENSE
rename to distribution/global/LICENSE
diff --git a/dist/README b/distribution/global/README
similarity index 100%
rename from dist/README
rename to distribution/global/README
diff --git a/dist/config/config.xml b/distribution/global/config/config.xml
similarity index 100%
rename from dist/config/config.xml
rename to distribution/global/config/config.xml
diff --git a/dist/config/properties/database.properties b/distribution/global/config/properties/database.properties
similarity index 100%
rename from dist/config/properties/database.properties
rename to distribution/global/config/properties/database.properties
diff --git a/dist/config/properties/template.properties b/distribution/global/config/properties/template.properties
similarity index 100%
rename from dist/config/properties/template.properties
rename to distribution/global/config/properties/template.properties
diff --git a/dist/config/properties/vfs.properties b/distribution/global/config/properties/vfs.properties
similarity index 100%
rename from dist/config/properties/vfs.properties
rename to distribution/global/config/properties/vfs.properties
diff --git a/dist/start.sh b/distribution/global/start.sh
similarity index 100%
rename from dist/start.sh
rename to distribution/global/start.sh
diff --git a/dist/sql/actor_skill.sql b/distribution/sql/sql/actor_skill.sql
similarity index 100%
rename from dist/sql/actor_skill.sql
rename to distribution/sql/sql/actor_skill.sql
diff --git a/dist/sql/character.sql b/distribution/sql/sql/character.sql
similarity index 100%
rename from dist/sql/character.sql
rename to distribution/sql/sql/character.sql
diff --git a/dist/sql/character_friend.sql b/distribution/sql/sql/character_friend.sql
similarity index 100%
rename from dist/sql/character_friend.sql
rename to distribution/sql/sql/character_friend.sql
diff --git a/dist/sql/character_shortcut.sql b/distribution/sql/sql/character_shortcut.sql
similarity index 100%
rename from dist/sql/character_shortcut.sql
rename to distribution/sql/sql/character_shortcut.sql
diff --git a/dist/sql/clan.sql b/distribution/sql/sql/clan.sql
similarity index 100%
rename from dist/sql/clan.sql
rename to distribution/sql/sql/clan.sql
diff --git a/dist/sql/item.sql b/distribution/sql/sql/item.sql
similarity index 100%
rename from dist/sql/item.sql
rename to distribution/sql/sql/item.sql
diff --git a/dist/sql/log_chat.sql b/distribution/sql/sql/log_chat.sql
similarity index 100%
rename from dist/sql/log_chat.sql
rename to distribution/sql/sql/log_chat.sql
diff --git a/dist/sql/npc.sql b/distribution/sql/sql/npc.sql
similarity index 100%
rename from dist/sql/npc.sql
rename to distribution/sql/sql/npc.sql
diff --git a/src/assembly/distribution-h2-bin.xml b/src/assembly/distribution-h2-bin.xml
index 31b8dcfa2..b65c20d1e 100644
--- a/src/assembly/distribution-h2-bin.xml
+++ b/src/assembly/distribution-h2-bin.xml
@@ -4,8 +4,8 @@
 	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>h2-bin</id>
 	<formats>
-		<format>tar.gz</format>
-		<format>tar.bz2</format>
+<!-- 		<format>tar.gz</format> -->
+<!-- 		<format>tar.bz2</format> -->
 		<format>zip</format>
 	</formats>
 	<baseDirectory></baseDirectory>
@@ -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>
diff --git a/src/assembly/distribution-mysql5-bin.xml b/src/assembly/distribution-mysql5-bin.xml
index 40b697b55..072becec2 100644
--- a/src/assembly/distribution-mysql5-bin.xml
+++ b/src/assembly/distribution-mysql5-bin.xml
@@ -4,8 +4,8 @@
 	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>mysql5-bin</id>
 	<formats>
-		<format>tar.gz</format>
-		<format>tar.bz2</format>
+<!-- 		<format>tar.gz</format> -->
+<!-- 		<format>tar.bz2</format> -->
 		<format>zip</format>
 	</formats>
 	<baseDirectory></baseDirectory>
@@ -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>
diff --git a/src/assembly/distribution-src.xml b/src/assembly/distribution-src.xml
index b3759cdc2..525a6de14 100644
--- a/src/assembly/distribution-src.xml
+++ b/src/assembly/distribution-src.xml
@@ -4,8 +4,8 @@
 	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>src</id>
 	<formats>
-		<format>tar.gz</format>
-		<format>tar.bz2</format>
+<!-- 		<format>tar.gz</format> -->
+<!-- 		<format>tar.bz2</format> -->
 		<format>zip</format>
 	</formats>
 	<baseDirectory></baseDirectory>