Merge pull request #100 from wagnert/master

 Make minor customizations for appserver.io 1.1.15

Author: wagnert

composer.json

@@ -10,9 +10,11 @@
         "jms/serializer": "~1.0",
         "doctrine/orm": "2.5.*",
         "appserver-io/routlt": "2.4.*",
-        "appserver-io/console": "7.0.*"
+        "appserver-io/console": "10.0.*",
+        "appserver-io/provisioning": "1.0.*"
     },
     "require-dev": {
+        "appserver-io/phar": "~1.0",
         "appserver-io/build" : "~2.0"
     },
     "config": {

src/META-INF/classes/AppserverIo/Apps/Example/Provisioning/PrepareDatabaseStep.php

@@ -14,14 +14,14 @@
  * @author    Tim Wagner <[email protected]>
  * @copyright 2015 TechDivision GmbH <[email protected]>
  * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- * @link      https://github.com/appserver-io/appserver
+ * @link      https://github.com/appserver-io-apps/example
  * @link      http://www.appserver.io
  */
 
 namespace AppserverIo\Apps\Example\Provisioning;
 
+use AppserverIo\Provisioning\Steps\AbstractStep;
 use AppserverIo\Psr\EnterpriseBeans\Annotations as EPB;
-use AppserverIo\Appserver\Provisioning\Steps\AbstractStep;
 
 /**
  * An step implementation that creates a database, login credentials and dummy
@@ -30,22 +30,32 @@
  * @author    Tim Wagner <[email protected]>
  * @copyright 2015 TechDivision GmbH <[email protected]>
  * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- * @link      https://github.com/appserver-io/appserver
+ * @link      https://github.com/appserver-io-apps/example
  * @link      http://www.appserver.io
  *
  * @EPB\Inject(shared=false)
  */
 class PrepareDatabaseStep extends AbstractStep
 {
-    
+
     /**
      * The user processor instance (a SFB instance).
      *
-     * @var \AppserverIo\Apps\Example\Services\SchemaProcessor
+     * @var \AppserverIo\Apps\Example\Services\SchemaProcessorInterface
      * @EPB\EnterpriseBean(name="SchemaProcessor")
      */
     protected $schemaProcessor;
 
+    /**
+     * Returns the schema processor instance.
+     *
+     * @return \AppserverIo\Apps\Example\Services\SchemaProcessorInterface
+     */
+    protected function getSchemaProcessor()
+    {
+        return $this->schemaProcessor;
+    }
+
     /**
      * Executes the functionality for this step, in this case the execution of
      * the PHP script defined in the step configuration.
@@ -58,15 +68,15 @@ public function execute()
     {
 
         // log a message that provisioning starts
-        \info('Now start to prepare database using SchemaProcessor!');
+        \info(sprintf('Now start to prepare database using "%s"', get_class($this->getSchemaProcessor())));
 
         // create schema, default products + login credentials
-        $this->schemaProcessor->createDatabase();
-        $this->schemaProcessor->createSchema();
-        $this->schemaProcessor->createDefaultProducts();
-        $this->schemaProcessor->createDefaultCredentials();
+        $this->getSchemaProcessor()->createDatabase();
+        $this->getSchemaProcessor()->createSchema();
+        $this->getSchemaProcessor()->createDefaultProducts();
+        $this->getSchemaProcessor()->createDefaultCredentials();
 
         // log a message that provisioning has been successfull
-        \info('Successfully prepared database using SchemaProcessor!');
+        \info(sprintf('Successfully prepared database using "%s"', get_class($this->getSchemaProcessor())));
     }
 }

src/META-INF/classes/AppserverIo/Apps/Example/Services/AbstractPersistenceProcessor.php

@@ -47,38 +47,8 @@ abstract class AbstractPersistenceProcessor extends AbstractProcessor
      *
      * @return \Doctrine\ORM\EntityManagerInterface The initialized Doctrine entity manager
      */
-    public function getEntityManager()
+    protected function getEntityManager()
     {
         return $this->entityManager;
     }
-
-    /**
-     * Close the entity manager's connection before destroying the bean.
-     *
-     * @return void
-     * @EPB\PreDestroy
-     */
-    public function preDestroy()
-    {
-        if ($entityManager = $this->getEntityManager()) {
-            if ($connection = $entityManager->getConnection()) {
-                $connection->close();
-            }
-        }
-    }
-
-    /**
-     * Close the entity manager's connection before re-attaching it to the container.
-     *
-     * @return void
-     * @EPB\PreAttach
-     */
-    public function preAttach()
-    {
-        if ($entityManager = $this->getEntityManager()) {
-            if ($connection = $entityManager->getConnection()) {
-                $connection->close();
-            }
-        }
-    }
 }

src/META-INF/classes/AppserverIo/Apps/Example/Services/AbstractProcessor.php

@@ -106,7 +106,7 @@ public function preAttach()
      *
      * @return \AppserverIo\Psr\Application\ApplicationInterface The application instance
      */
-    public function getApplication()
+    protected function getApplication()
     {
         return $this->application;
     }
@@ -116,7 +116,7 @@ public function getApplication()
      *
      * @return \AppserverIo\Appserver\Core\InitialContext The initial context instance
      */
-    public function getInitialContext()
+    protected function getInitialContext()
     {
         return $this->getApplication()->getInitialContext();
     }
@@ -126,7 +126,7 @@ public function getInitialContext()
      *
      * @return \AppserverIo\Configuration\Interfaces\NodeInterface The system configuration
      */
-    public function getSystemConfiguration()
+    protected function getSystemConfiguration()
     {
         return $this->getInitialContext()->getSystemConfiguration();
     }
@@ -136,7 +136,7 @@ public function getSystemConfiguration()
      *
      * @return array The array with the datasources
      */
-    public function getDatasources()
+    protected function getDatasources()
     {
         return $this->getSystemConfiguration()->getDatasources();
     }

src/META-INF/classes/AppserverIo/Apps/Example/Services/SchemaProcessor.php

@@ -20,12 +20,10 @@
 
 namespace AppserverIo\Apps\Example\Services;
 
-use Doctrine\DBAL\DriverManager;
-use Doctrine\ORM\Tools\SchemaTool;
-use Doctrine\DBAL\Schema\SqliteSchemaManager;
 use Doctrine\Common\Collections\ArrayCollection;
 use AppserverIo\Apps\Example\Entities\Impl\Product;
 use AppserverIo\Psr\EnterpriseBeans\Annotations as EPB;
+use AppserverIo\Console\Server\Services\SchemaProcessorTrait;
 
 /**
  * A singleton session bean implementation that handles the
@@ -43,27 +41,43 @@ class SchemaProcessor extends AbstractPersistenceProcessor implements SchemaProc
 {
 
     /**
-     * The name of the configuration key that contains the database name.
+     * Trait that provides schema managing functionality.
      *
-     * @var string
+     * @var AppserverIo\Console\Server\Services\SchemaProcessorTrait
      */
-    const PARAM_DBNAME = 'dbname';
-
+    use SchemaProcessorTrait;
+    
+    /**
+     * The application instance.
+     *
+     * @var \AppserverIo\Psr\Application\ApplicationInterface
+     * @EPB\Resource(type="ApplicationInterface")
+     */
+    protected $application;
+    
     /**
-     * The DIC provider instance.
+     * The DI provider instance.
      *
-     * @var \AppserverIo\Psr\Di\ProviderInterface $provider
+     * @var \AppserverIo\Psr\Di\ProviderInterface
      * @EPB\Resource(type="ProviderInterface")
      */
-    protected $providerInterface;
-
+    protected $provider;
+    
+    /**
+     * The timer service context instance.
+     *
+     * @var \AppserverIo\Psr\EnterpriseBeans\TimerServiceContextInterface
+     * @EPB\Resource(type="TimerServiceContextInterface")
+     */
+    protected $timerServiceContext;
+    
     /**
-     * The system logger implementation.
+     * The object manager instance.
      *
-     * @var \AppserverIo\Logger\Logger
-     * @EPB\Resource(type="SystemLogger")
+     * @var \AppserverIo\Psr\Di\ObjectManagerInterface
+     * @EPB\Resource(type="ObjectManagerInterface")
      */
-    protected $systemLogger;
+    protected $objectManager;
 
     /**
      * A list with default credentials for login testing.
@@ -83,95 +97,45 @@ class SchemaProcessor extends AbstractPersistenceProcessor implements SchemaProc
         array('appserver_09', 'appserver.i0', array('Customer')),
         array('guest', 'appserver.i0', array('Guest'))
     );
-
+    
     /**
-     * Example method that should be invoked after constructor.
+     * Returns the application instance.
      *
-     * @return void
-     * @EPB\PostConstruct
+     * @return \AppserverIo\Psr\Application\ApplicationInterface The initialized Doctrine entity manager
      */
-    public function initialize()
+    protected function getApplication()
     {
-        \info(
-            sprintf('%s has successfully been invoked by @PostConstruct annotation', __METHOD__)
-        );
+        return $this->application;
     }
-
+    
     /**
-     * Return's the system logger instance.
+     * Returns the DI provider instance.
      *
-     * @return \AppserverIo\Logger\Logger The sytsem logger instance
+     * @return \AppserverIo\Psr\Di\ProviderInterface The DI provider instance
      */
-    public function getSystemLogger()
+    protected function getProvider()
     {
-        return $this->systemLogger;
+        return $this->provider;
     }
-
+    
     /**
-     * Create's the database itself.
+     * Returns the object manager instance.
      *
-     * This quite seems to be a bit strange, because with all databases
-     * other than SQLite, we need to remove the database name from the
-     * connection parameters BEFORE connecting to the database, as
-     * connection to a not existing database fails.
-     *
-     * @return void
+     * @return \AppserverIo\Psr\Di\ObjectManagerInterface The object manager instance
      */
-    public function createDatabase()
+    protected function getObjectManager()
     {
-
-        try {
-            // clone the connection and load the database name
-            $connection = clone $this->getEntityManager()->getConnection();
-            $dbname = $connection->getDatabase();
-
-            // remove the the database name
-            $params = $connection->getParams();
-            if (isset($params[SchemaProcessor::PARAM_DBNAME])) {
-                unset($params[SchemaProcessor::PARAM_DBNAME]);
-            }
-
-            // create a new connection WITHOUT the database name
-            $cn = DriverManager::getConnection($params);
-            $sm = $cn->getDriver()->getSchemaManager($cn);
-
-            // SQLite doesn't support database creation by a method
-            if ($sm instanceof SqliteSchemaManager) {
-                return;
-            }
-
-            // query whether or not the database already exists
-            if (!in_array($dbname, $sm->listDatabases())) {
-                $sm->createDatabase($dbname);
-            }
-        } catch (\Exception $e) {
-            \error($e->__toString());
-        }
+        return $this->objectManager;
     }
-
+    
     /**
-     * Deletes the database schema and creates it new.
-     *
-     * Attention: All data will be lost if this method has been invoked.
+     * Returns the timer service context instance.
      *
-     * @return void
+     * @return \AppserverIo\Psr\EnterpriseBeans\TimerServiceContextInterface The timer service context instance
      */
-    public function createSchema()
+    protected function getTimerServiceContext()
     {
-
-        try {
-            // load the entity manager and the schema tool
-            $entityManager = $this->getEntityManager();
-            $schemaTool = new SchemaTool($entityManager);
-
-            // load the class definitions
-            $classes = $entityManager->getMetadataFactory()->getAllMetadata();
-
-            // create or update the schema
-            $schemaTool->updateSchema($classes);
-        } catch (\Exception $e) {
-            \error($e->__toString());
-        }
+        return $this->timerServiceContext;
     }
 
     /**
@@ -196,7 +160,7 @@ public function createDefaultProducts()
             }
 
             // set user data and save it
-            $product = $this->providerInterface->newInstance($className);
+            $product = $this->getProvider()->newInstance($className);
             $product->setName("Product-$i");
             $product->setStatus(Product::STATUS_ACTIVE);
             $product->setUrlKey("product-$i");
@@ -237,7 +201,7 @@ public function createDefaultCredentials()
             }
 
             // set user data and save it
-            $user = $this->providerInterface->newInstance($className);
+            $user = $this->getProvider()->newInstance($className);
             $user->setEmail(sprintf('%[email protected]', $username));
             $user->setUsername($username);
             $user->setUserLocale('en_US');
@@ -253,7 +217,7 @@ public function createDefaultCredentials()
 
             // create the user's roles
             foreach ($roleNames as $roleName) {
-                $role = $this->providerInterface->newInstance('\AppserverIo\Apps\Example\Entities\Impl\Role');
+                $role = $this->getProvider()->newInstance('\AppserverIo\Apps\Example\Entities\Impl\Role');
                 $role->setUser($user);
                 $role->setName($roleName);
                 $roles->add($role);