Integration new appserver-io-psr/cli + appserver-io-psr/application-s…

…erver dependencies

composer.json

@@ -18,12 +18,14 @@
         "appserver-io-psr/epb": "5.0.*",
         "appserver-io-psr/pms": "1.0.*",
         "appserver-io-psr/mop": "1.2.*",
+        "appserver-io-psr/cli": "dev-master",
         "appserver-io-psr/auth": "2.0.*",
         "appserver-io-psr/naming": "1.1.*",
         "appserver-io-psr/servlet": "3.2.*",
         "appserver-io-psr/security": "1.4.*",
         "appserver-io-psr/deployment": "2.0.*",
         "appserver-io-psr/application": "1.4.*",
+        "appserver-io-psr/application-server": "dev-master",
         "appserver-io/rmi": "3.2.*",
         "appserver-io/http": "2.2.*",
         "appserver-io/lang": "3.0.*",
@@ -92,5 +94,15 @@
         "post-update-cmd": [
             "AppserverIo\\Appserver\\Meta\\Composer\\Script\\Setup::postUpdate"
         ]
-    }
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../appserver-io-psr/cli"
+        },
+        {
+            "type": "path",
+            "url": "../../appserver-io-psr/application-server"
+        }
+    ]
 }

server.php

@@ -25,8 +25,8 @@
 
 use AppserverIo\Storage\GenericStackable;
 use AppserverIo\Appserver\Naming\NamingDirectory;
-use AppserverIo\Appserver\Core\Utilities\DirectoryKeys;
 use AppserverIo\Appserver\Core\Utilities\Runlevels;
+use AppserverIo\Appserver\Core\Utilities\DirectoryKeys;
 
 declare (ticks = 1);
 

src/AppserverIo/Appserver/Application/Application.php

@@ -34,13 +34,12 @@
 use AppserverIo\Appserver\Core\Api\Node\ProvisionerNodeInterface;
 use AppserverIo\Appserver\Core\Api\Node\ClassLoaderNodeInterface;
 use AppserverIo\Appserver\Naming\Utils\NamingDirectoryKeys;
-use AppserverIo\Appserver\Application\Interfaces\ContextInterface;
-use AppserverIo\Psr\Context\ContextInterface as Context;
 use AppserverIo\Psr\Application\ManagerInterface;
 use AppserverIo\Psr\Application\ApplicationInterface;
 use AppserverIo\Psr\Application\ProvisionerInterface;
 use AppserverIo\Psr\Application\DirectoryAwareInterface;
 use AppserverIo\Psr\Application\FilesystemAwareInterface;
+use AppserverIo\Psr\ApplicationServer\ContextInterface;
 
 /**
  * The application instance holds all information about the deployed application
@@ -66,7 +65,7 @@
  * @property string                                                         $containerRunlevel Runlevel of the container the application is bound to
  * @property \AppserverIo\Psr\Naming\NamingDirectoryInterface               $namingDirectory   The naming directory instance
  */
-class Application extends \Thread implements ApplicationInterface, DirectoryAwareInterface, FilesystemAwareInterface, Context
+class Application extends \Thread implements ApplicationInterface, DirectoryAwareInterface, FilesystemAwareInterface, \AppserverIo\Psr\Context\ContextInterface
 {
 
     /**
@@ -171,7 +170,7 @@ public function injectLoggers(GenericStackable $loggers)
     /**
      * The initial context instance.
      *
-     * @param \AppserverIo\Appserver\Application\Interfaces\ContextInterface $initialContext The initial context instance
+     * @param \AppserverIo\Psr\ApplicationServer\ContextInterface $initialContext The initial context instance
      *
      * @return void
      */
@@ -409,7 +408,7 @@ public function getUniqueName()
      * @param string $className The API service class name to return the instance for
      *
      * @return object The service instance
-     * @see \AppserverIo\Appserver\Application\Interfaces\ContextInterface::newService()
+     * @see \AppserverIo\Psr\ApplicationServer\ContextInterface::newService()
      */
     public function newService($className)
     {
@@ -419,7 +418,7 @@ public function newService($className)
     /**
      * Returns the initial context instance.
      *
-     * @return \AppserverIo\Appserver\Application\Interfaces\ContextInterface The initial Context
+     * @return \AppserverIo\Psr\ApplicationServer\ContextInterface The initial Context
      */
     public function getInitialContext()
     {