From 19f0a6b7b0ef188fe76c1a66042f6b60f0369f30 Mon Sep 17 00:00:00 2001
From: Loki <loki@magefree>
Date: Mon, 19 Sep 2011 20:58:03 +0300
Subject: [PATCH] move Mage-Server and Mage-Client jars to lib

---
 Mage.Client/release/startClient.bat            | 2 +-
 Mage.Client/src/main/assembly/distribution.xml | 2 +-
 Mage.Server/release/startServer.bat            | 2 +-
 Mage.Server/release/startServer.sh             | 2 +-
 Mage.Server/src/main/assembly/distribution.xml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mage.Client/release/startClient.bat b/Mage.Client/release/startClient.bat
index a1205e36155..b3a23ae4893 100644
--- a/Mage.Client/release/startClient.bat
+++ b/Mage.Client/release/startClient.bat
@@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files\Java\jre6"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-start javaw -jar .\Mage-Client-${project.version}.jar -Xms256M -Xmx1024M
\ No newline at end of file
+start javaw -jar .\lib\Mage-Client-${project.version}.jar -Xms256M -Xmx1024M
\ No newline at end of file
diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
index dbb7bbdf724..bf3fbc2f18e 100644
--- a/Mage.Client/src/main/assembly/distribution.xml
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -9,7 +9,7 @@
   </formats>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory>/lib</outputDirectory>
       <includes>
         <include>org.mage:Mage-Client</include>
       </includes>
diff --git a/Mage.Server/release/startServer.bat b/Mage.Server/release/startServer.bat
index 5bca97b5943..d2f82b638bf 100644
--- a/Mage.Server/release/startServer.bat
+++ b/Mage.Server/release/startServer.bat
@@ -1,3 +1,3 @@
 @ECHO OFF
-java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./Mage-Server-${project.version}.jar
+java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/Mage-Server-${project.version}.jar
 pause
\ No newline at end of file
diff --git a/Mage.Server/release/startServer.sh b/Mage.Server/release/startServer.sh
index e17f74f5f38..0e310275166 100644
--- a/Mage.Server/release/startServer.sh
+++ b/Mage.Server/release/startServer.sh
@@ -1 +1 @@
-java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./Mage-Server-${project.version}.jar
+java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/Mage-Server-${project.version}.jar
diff --git a/Mage.Server/src/main/assembly/distribution.xml b/Mage.Server/src/main/assembly/distribution.xml
index e7085d46548..e2513721fda 100644
--- a/Mage.Server/src/main/assembly/distribution.xml
+++ b/Mage.Server/src/main/assembly/distribution.xml
@@ -9,7 +9,7 @@
     </formats>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>/lib</outputDirectory>
             <includes>
                 <include>org.mage:Mage-Server</include>
             </includes>