From 65cb214f0983099ca87569c734bfd8f887a0bb60 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 10:50:44 +0100
Subject: [PATCH 01/13] Remove composer dependency

---
 build.xml | 56 ++++++-------------------------------------------------
 1 file changed, 6 insertions(+), 50 deletions(-)

diff --git a/build.xml b/build.xml
index 75f07e8..1690bf9 100644
--- a/build.xml
+++ b/build.xml
@@ -22,18 +22,6 @@
     <property file="${basedir}/build.default.properties"/>
     <property file="${basedir}/build.${os.family}.${os.distribution}.properties"/>
     <property file="${basedir}/build.${os.family}.properties"/>
-    
-    <!-- initialize the library specific properties -->
-    <property name="codepool" value="vendor"/>
-    
-    <!-- initialize the directory where we can find the real build files -->
-    <property name="vendor.dir" value ="${basedir}/${codepool}" />
-    <property name="build.dir" value="${vendor.dir}/appserver-io/build" />
-
-    <!-- ==================================================================== -->
-    <!-- Import the common build configuration file                           -->
-    <!-- ==================================================================== -->
-    <import file="${build.dir}/common.xml" optional="true"/>
 
     <!-- ==================================================================== -->
     <!-- Create some basic properties which we need for further processing    -->
@@ -43,6 +31,9 @@
     <property name="lib.dir" value="${basedir}/lib" />
     <property name="hub.address" value="appserver.io"/>
     <property name="custom-lib.dir" value="${basedir}/custom-lib" />
+    <property name="php-src.dir" value="${basedir}/src" />
+    <property name="php-test.dir" value="${basedir}/tests" />
+    <property name="php-target.dir" value="${basedir}/target"/>
     <property name="hub.snapshot-path" value="/var/www/builds.appserver.io/${os.qualified.path}"/>
 
     <!-- ==================================================================== -->
@@ -54,49 +45,14 @@
     <property name="package.specific-dir" value="${php-target.dir}/"/>
 
     <!-- ==================================================================== -->
-    <!-- Checks if composer has installed it's dependencies                   -->
-    <!-- ==================================================================== -->
-    <target name="is-composer-installed">
-        <condition property="composer.present">
-            <available file="${build.dir}" type="dir"/>
-        </condition>
-    </target>
-    
-    <!-- ==================================================================== -->
-    <!-- Installs all dependencies defined in composer.json                   -->
-    <!-- ==================================================================== -->
-    <target name="composer-install" depends="is-composer-installed" unless="composer.present" description="Installs all dependencies defined in composer.json">
-        <exec dir="${basedir}" executable="composer">
-            <arg line="--no-interaction --dev install"/>
-        </exec>
-    </target>
-
-    <!-- ==================================================================== -->
-    <!-- Updates composer dependencies defined in composer.json               -->
-    <!-- ==================================================================== -->
-    <target name="composer-update" depends="is-composer-installed" if="composer.present" description="Updates composer dependencies defined in composer.json">
-        <exec dir="${basedir}" executable="composer">
-            <arg line="--no-interaction --dev update"/>
-        </exec>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Checks if the build- and deployment stub has already been initialized -->
-    <!-- ===================================================================== -->
-    <target name="composer-init">
-        <antcall target="composer-install"/>
-        <antcall target="composer-update"/>
-    </target>
-    
-    <!-- ==================================================================== -->
-    <!-- Deletes the directory with the generated artefacts                   -->
+    <!-- Cleans the directories with the generated source files               -->
     <!-- ==================================================================== -->
     <target name="clean" description="Cleans build directory in preparation for new build.">
         <delete dir="${php-target.dir}" includeemptydirs="true" quiet="false" verbose="true" failonerror="true"/>
     </target>
-    
+
     <!-- ==================================================================== -->
-    <!-- Prepares the directory to temporarily store generated artefacts      -->
+    <!-- Prepares all the required directories                                -->
     <!-- ==================================================================== -->
     <target name="prepare" depends="clean" description="Prepares all the required directories.">
         <mkdir dir="${php-target.dir}" />

From 73871427d4ca7202bfd85245ee132bfe5b7d9737 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 11:07:04 +0100
Subject: [PATCH 02/13] Add composer commands

---
 build.xml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/build.xml b/build.xml
index 1690bf9..269d265 100644
--- a/build.xml
+++ b/build.xml
@@ -95,6 +95,41 @@
             </fileset>
         </copy>
     </target>
+
+    <!-- ==================================================================== -->
+    <!-- Checks if composer has installed it's dependencies                   -->
+    <!-- ==================================================================== -->
+    <target name="is-composer-installed">
+        <condition property="composer.present">
+            <available file="${build.dir}" type="dir"/>
+        </condition>
+    </target>
+    
+    <!-- ==================================================================== -->
+    <!-- Installs all dependencies defined in composer.json                   -->
+    <!-- ==================================================================== -->
+    <target name="composer-install" depends="is-composer-installed" unless="composer.present" description="Installs all dependencies defined in composer.json">
+        <exec dir="${basedir}" executable="composer">
+            <arg line="--no-interaction --dev install"/>
+        </exec>
+    </target>
+
+    <!-- ==================================================================== -->
+    <!-- Updates composer dependencies defined in composer.json               -->
+    <!-- ==================================================================== -->
+    <target name="composer-update" depends="is-composer-installed" if="composer.present" description="Updates composer dependencies defined in composer.json">
+        <exec dir="${basedir}" executable="composer">
+            <arg line="--no-interaction --dev update"/>
+        </exec>
+    </target>
+
+    <!-- ===================================================================== -->
+    <!-- Checks if the build- and deployment stub has already been initialized -->
+    <!-- ===================================================================== -->
+    <target name="composer-init">
+        <antcall target="composer-install"/>
+        <antcall target="composer-update"/>
+    </target>
     
     <!-- ==================================================================== -->
     <!-- Builds the runtime                                                   -->

From f6774963106eedc072318ee945876beb3fd59863 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 11:24:56 +0100
Subject: [PATCH 03/13] Refactoring appserver-io/appserver tag/branch for build

---
 build.default.properties | 1 +
 build.xml                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.default.properties b/build.default.properties
index feee4bf..eee1417 100644
--- a/build.default.properties
+++ b/build.default.properties
@@ -33,6 +33,7 @@ webapps.version.example = latest
 # Download URL + version
 appserver.url     = https://github.com/appserver-io/appserver
 appserver.version = 1.0.0
+appserver.tag = master
 
 # Suffix is used to mark versions as alpha, beta, etc. set it to e.g. "alpha." to do so, leave empty ("") otherwise
 appserver.version.suffix = alpha.
diff --git a/build.xml b/build.xml
index 269d265..55676e0 100644
--- a/build.xml
+++ b/build.xml
@@ -1084,7 +1084,7 @@
 	<target name="install-sources" unless="${runtime.only}" depends="install-composer" description="Install ApplicationServer packages.">
 		<!-- clone the sources from github -->
 		<exec dir="${php-target.dir}" executable="git">
-			<arg line="clone ${appserver.url} --branch=${appserver.version} download" />
+			<arg line="clone ${appserver.url} --branch=${appserver.tag} download" />
 		</exec>
 		<!-- copy the sources to the target directory -->
 		<copy todir="${appserver.compile.prefix}">

From 570654cc0ffb3447a6153b0488a9b4471506f7c3 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 11:26:40 +0100
Subject: [PATCH 04/13] Refactoring appserver-io/appserver tag/branch for build

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 55676e0..8b13e8b 100644
--- a/build.xml
+++ b/build.xml
@@ -1755,7 +1755,7 @@
         </exec>
         <!-- clone the sources from github -->
         <exec dir="${php-target.dir}" executable="git">
-            <arg line="clone ${appserver.url} --branch=${appserver.version} download" />
+            <arg line="clone ${appserver.url} --branch=${appserver.tag} download" />
         </exec>
         <!-- copy the sources to the target directory -->
         <copy todir="${php-target.dir}/appserver">

From dc9f841a7c80bf5349a84a276ab9bf854b087a6f Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 19:15:34 +0100
Subject: [PATCH 05/13] Deactivate admin/api applications in default build

---
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 8b13e8b..7739b1d 100644
--- a/build.xml
+++ b/build.xml
@@ -329,8 +329,10 @@
     <!-- Get the latest versions of the default webapps                       -->
     <!-- ==================================================================== -->
     <target name="get-default-webapps" depends="prepare" description="Get the latest versions of the default webapps">
-        <get src="${webapps.download.baseurl}${webapps.name.admin}/${webapps.name.admin}-${webapps.version.admin}.phar" dest="${basedir}/webapps/${webapps.name.admin}.phar" usetimestamp="true"/>
+        <!--
+    	<get src="${webapps.download.baseurl}${webapps.name.admin}/${webapps.name.admin}-${webapps.version.admin}.phar" dest="${basedir}/webapps/${webapps.name.admin}.phar" usetimestamp="true"/>
         <get src="${webapps.download.baseurl}${webapps.name.api}/${webapps.name.api}-${webapps.version.api}.phar" dest="${basedir}/webapps/${webapps.name.api}.phar" usetimestamp="true"/>
+        -->
         <get src="${webapps.download.baseurl}${webapps.name.example}/${webapps.name.example}-${webapps.version.example}.phar" dest="${basedir}/webapps/${webapps.name.example}.phar" usetimestamp="true"/>
     </target>
 

From cdaaeae3607c4b6a1a766ca16c091740819cf551 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 19:37:21 +0100
Subject: [PATCH 06/13] Bugfixing Travis-CI build

---
 .travis.yml |  1 -
 build.xml   | 41 +++++------------------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 66d78a1..cb5f0a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ before_install:
  
 script:
   - sudo chown $USER /opt
-  - ant composer-init
   - ant -Dprepare.distribution.build=false build
   - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml
 
diff --git a/build.xml b/build.xml
index 7739b1d..1b6aba8 100644
--- a/build.xml
+++ b/build.xml
@@ -95,47 +95,12 @@
             </fileset>
         </copy>
     </target>
-
-    <!-- ==================================================================== -->
-    <!-- Checks if composer has installed it's dependencies                   -->
-    <!-- ==================================================================== -->
-    <target name="is-composer-installed">
-        <condition property="composer.present">
-            <available file="${build.dir}" type="dir"/>
-        </condition>
-    </target>
-    
-    <!-- ==================================================================== -->
-    <!-- Installs all dependencies defined in composer.json                   -->
-    <!-- ==================================================================== -->
-    <target name="composer-install" depends="is-composer-installed" unless="composer.present" description="Installs all dependencies defined in composer.json">
-        <exec dir="${basedir}" executable="composer">
-            <arg line="--no-interaction --dev install"/>
-        </exec>
-    </target>
-
-    <!-- ==================================================================== -->
-    <!-- Updates composer dependencies defined in composer.json               -->
-    <!-- ==================================================================== -->
-    <target name="composer-update" depends="is-composer-installed" if="composer.present" description="Updates composer dependencies defined in composer.json">
-        <exec dir="${basedir}" executable="composer">
-            <arg line="--no-interaction --dev update"/>
-        </exec>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Checks if the build- and deployment stub has already been initialized -->
-    <!-- ===================================================================== -->
-    <target name="composer-init">
-        <antcall target="composer-install"/>
-        <antcall target="composer-update"/>
-    </target>
     
     <!-- ==================================================================== -->
     <!-- Builds the runtime                                                   -->
     <!-- ==================================================================== -->
     <target name="build" description="Runs the PHPUnit tests and generates a report.">
-        <antcall target="build-runtime"/>
+        <antcall target="install-composer"/>
         <antcall target="run-integration-tests"/>
     </target>
 	
@@ -1102,6 +1067,10 @@
     <!-- Runs the PHPUnit integration tests                                   -->
     <!-- ==================================================================== -->
     <target name="run-integration-tests" description="Runs the PHPUnit integration tests.">
+        <!-- install the sources -->
+        <exec dir="${appserver.compile.prefix}" executable="${appserver.compile.prefix}/bin/php">
+            <arg line="${appserver.compile.prefix}/bin/composer.phar install"/>
+        </exec>
         <exec executable="${appserver.compile.prefix}/bin/php" dir="${basedir}" failonerror="true">
             <arg line="${vendor.dir}/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
         </exec>

From fb91280671176348c848d6d698d62219889dd961 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 19:39:40 +0100
Subject: [PATCH 07/13] Bugfixing Travis-CI build

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 1b6aba8..d1558a8 100644
--- a/build.xml
+++ b/build.xml
@@ -1072,7 +1072,7 @@
             <arg line="${appserver.compile.prefix}/bin/composer.phar install"/>
         </exec>
         <exec executable="${appserver.compile.prefix}/bin/php" dir="${basedir}" failonerror="true">
-            <arg line="${vendor.dir}/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
+            <arg line="${appserver.compile.prefix}/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
         </exec>
     </target>
 

From 3e18903eda9e9c99e1b08d53d28f87fbacf351e8 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 20:22:31 +0100
Subject: [PATCH 08/13] Bugfixing Travis-CI build

---
 build.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index d1558a8..274a13f 100644
--- a/build.xml
+++ b/build.xml
@@ -1067,10 +1067,13 @@
     <!-- Runs the PHPUnit integration tests                                   -->
     <!-- ==================================================================== -->
     <target name="run-integration-tests" description="Runs the PHPUnit integration tests.">
-        <!-- install the sources -->
+        <!-- copy the composer.json file to the installation directory -->
+        <copy file="${basedir}/composer.json" todir="${appserver.compile.prefix}"/>
+        <!-- install the build utilities (PHPUnit etc.) -->
         <exec dir="${appserver.compile.prefix}" executable="${appserver.compile.prefix}/bin/php">
             <arg line="${appserver.compile.prefix}/bin/composer.phar install"/>
         </exec>
+    	<!-- run the PHPUnit test for the runtime -->
         <exec executable="${appserver.compile.prefix}/bin/php" dir="${basedir}" failonerror="true">
             <arg line="${appserver.compile.prefix}/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
         </exec>

From 0c776aca6a0690efa33bfad5a7141affcf6eb6b6 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 20:37:08 +0100
Subject: [PATCH 09/13] Bugfixing Travis-CI build

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 274a13f..a809c47 100644
--- a/build.xml
+++ b/build.xml
@@ -1075,7 +1075,7 @@
         </exec>
     	<!-- run the PHPUnit test for the runtime -->
         <exec executable="${appserver.compile.prefix}/bin/php" dir="${basedir}" failonerror="true">
-            <arg line="${appserver.compile.prefix}/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
+            <arg line="${appserver.compile.prefix}/vendor/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
         </exec>
     </target>
 

From 4e54059d600a26760a0906a8a64ae838d9f03a12 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Tue, 25 Nov 2014 20:39:27 +0100
Subject: [PATCH 10/13] Bugfixing Travis-CI build

---
 build.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index a809c47..c1f6d5b 100644
--- a/build.xml
+++ b/build.xml
@@ -1067,8 +1067,14 @@
     <!-- Runs the PHPUnit integration tests                                   -->
     <!-- ==================================================================== -->
     <target name="run-integration-tests" description="Runs the PHPUnit integration tests.">
-        <!-- copy the composer.json file to the installation directory -->
-        <copy file="${basedir}/composer.json" todir="${appserver.compile.prefix}"/>
+        <!-- copy the build files to the installation directory -->
+        <copy file="${appserver.compile.prefix}">
+            <fileset dir="${basedir}">
+                <include name="phpunit.xml"/>
+            	<include name="composer.json"/>
+                <include name="bootstrap.php"/>
+        	</fileset>
+        </copy>
         <!-- install the build utilities (PHPUnit etc.) -->
         <exec dir="${appserver.compile.prefix}" executable="${appserver.compile.prefix}/bin/php">
             <arg line="${appserver.compile.prefix}/bin/composer.phar install"/>

From 6905cdf272e2f5efa5ad75cc8147cbdd356a6872 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Wed, 26 Nov 2014 09:42:28 +0100
Subject: [PATCH 11/13] Bugfixing Travis-CI build

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c1f6d5b..43fd514 100644
--- a/build.xml
+++ b/build.xml
@@ -1068,7 +1068,7 @@
     <!-- ==================================================================== -->
     <target name="run-integration-tests" description="Runs the PHPUnit integration tests.">
         <!-- copy the build files to the installation directory -->
-        <copy file="${appserver.compile.prefix}">
+        <copy todir="${appserver.compile.prefix}">
             <fileset dir="${basedir}">
                 <include name="phpunit.xml"/>
             	<include name="composer.json"/>

From 6e1f0708c64baf8f74fe8a359de66b6b34f85286 Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Wed, 26 Nov 2014 10:29:04 +0100
Subject: [PATCH 12/13] Bugfixing Travis-CI build

---
 build.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 43fd514..e8b7fa1 100644
--- a/build.xml
+++ b/build.xml
@@ -100,7 +100,7 @@
     <!-- Builds the runtime                                                   -->
     <!-- ==================================================================== -->
     <target name="build" description="Runs the PHPUnit tests and generates a report.">
-        <antcall target="install-composer"/>
+        <antcall target="install-sources"/>
         <antcall target="run-integration-tests"/>
     </target>
 	
@@ -1067,19 +1067,6 @@
     <!-- Runs the PHPUnit integration tests                                   -->
     <!-- ==================================================================== -->
     <target name="run-integration-tests" description="Runs the PHPUnit integration tests.">
-        <!-- copy the build files to the installation directory -->
-        <copy todir="${appserver.compile.prefix}">
-            <fileset dir="${basedir}">
-                <include name="phpunit.xml"/>
-            	<include name="composer.json"/>
-                <include name="bootstrap.php"/>
-        	</fileset>
-        </copy>
-        <!-- install the build utilities (PHPUnit etc.) -->
-        <exec dir="${appserver.compile.prefix}" executable="${appserver.compile.prefix}/bin/php">
-            <arg line="${appserver.compile.prefix}/bin/composer.phar install"/>
-        </exec>
-    	<!-- run the PHPUnit test for the runtime -->
         <exec executable="${appserver.compile.prefix}/bin/php" dir="${basedir}" failonerror="true">
             <arg line="${appserver.compile.prefix}/vendor/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
         </exec>

From 06e007e9cfc377d12903df4cb75a8220ef11848a Mon Sep 17 00:00:00 2001
From: Tim Wagner <t.wagner@techdivision.com>
Date: Wed, 26 Nov 2014 10:39:57 +0100
Subject: [PATCH 13/13] Bugfixing Travis-CI build

---
 build.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index e8b7fa1..7b339af 100644
--- a/build.xml
+++ b/build.xml
@@ -1067,9 +1067,15 @@
     <!-- Runs the PHPUnit integration tests                                   -->
     <!-- ==================================================================== -->
     <target name="run-integration-tests" description="Runs the PHPUnit integration tests.">
+    	<!-- install the build utilities (PHPUnit etc.) -->
+        <exec dir="${basedir}" executable="${appserver.compile.prefix}/bin/php">
+            <arg line="${appserver.compile.prefix}/bin/composer.phar install"/>
+        </exec>
+    	<!-- execute the integration tests for the runtime -->
         <exec executable="${appserver.compile.prefix}/bin/php" dir="${basedir}" failonerror="true">
-            <arg line="${appserver.compile.prefix}/vendor/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
+            <arg line="${basedir}/vendor/bin/phpunit --bootstrap bootstrap.php --configuration phpunit.xml" />
         </exec>
+    	<!-- exectue PHP unit tests here -->
     </target>
 
     <!-- ==================================================================== -->