Merge pull request #326 from wagnert/master

Refactor README.md for new servlet manager configuration in context.xml

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 # Bugfixes
 
+* Query directories under webapps for WEB-INF or META-INF to make sure we have a valid application
 * Bugfixing invalid servlet init parameter initialization when using @Route annotation on servlets
 * Bugfixing for invalid folder check when try to parse folders defined in context.xml for servlets
 

README.md

@@ -912,9 +912,6 @@ use AppserverIo\Psr\Servlet\ServletConfig;
 use AppserverIo\Psr\Servlet\Http\HttpServlet;
 use AppserverIo\Psr\Servlet\Http\HttpServletRequest;
 use AppserverIo\Psr\Servlet\Http\HttpServletResponse;
-use AppserverIo\MessageQueueClient\MessageQueue;
-use AppserverIo\MessageQueueClient\QueueConnectionFactory;
-use AppserverIo\Psr\MessageQueueProtocol\Utils\PriorityMedium;
 use AppserverIo\Psr\MessageQueueProtocol\Messages\StringMessage;
 
 /**
@@ -1067,7 +1064,7 @@ class HelloWorldServlet extends HttpServlet
 > To make it easy, we can use the `@Resource` annotation to let the container inject a sender
 > instance we can use to send the name of the file containing the data to the `Queue`.
 
-# Timer Service
+# Timer-Service
 
 In most of your projects you have the need to schedule things to be processed in regular intervals
 or at a given date in future. As PHP itself is a scripting language it lacks of such functionality
@@ -1607,7 +1604,12 @@ in `/opt/appserver/etc/appserver/conf.d/context.xml`
       name="ServletManager"
       beanInterface="ServletContext"
       type="AppserverIo\Appserver\ServletEngine\ServletManager"
-      factory="AppserverIo\Appserver\ServletEngine\ServletManagerFactory"/>
+      factory="AppserverIo\Appserver\ServletEngine\ServletManagerFactory">
+      <directories>
+        <directory enforced="true">/WEB-INF/classes</directory>
+        <directory enforced="true">/vendor/appserver-io/routlt/src</directory>
+      </directories>
+    </manager>
 
     <!-- provides functionality to handle HTTP sessions -->
     <manager 

src/AppserverIo/Appserver/Core/GenericDeployment.php

@@ -65,7 +65,13 @@ public function deploy(ContainerInterface $container)
         // gather all the deployed web applications
         foreach (new \FilesystemIterator($container->getAppBase()) as $folder) {
 
-            if ($folder->isDir()) { // check if we've a directory (possible application)
+            // declare META-INF and WEB-INF directory
+            $webInfDir = $folder . DIRECTORY_SEPARATOR . 'WEB-INF';
+            $metaInfDir = $folder . DIRECTORY_SEPARATOR . 'META-INF';
+
+            // check if we've a directory containing a valid application,
+            // at least a WEB-INF or META-INF folder has to be available
+            if ($folder->isDir() && (is_dir($webInfDir) || is_dir($metaInfDir))) {
 
                 // this IS the unique application name
                 $applicationName = $folder->getBasename();
@@ -137,6 +143,17 @@ public function deploy(ContainerInterface $container)
 
                 // add the application to the container
                 $container->addApplication($application);
+
+            } elseif ($folder->isDir()) { // if we found a directory
+
+                // write a log message, that the folder doesn't contain a valid application
+                $this->getInitialContext()->getSystemLogger()->info(
+                    sprintf('Directory %s doesn\'t contain a valid application, so we ignore it!', $folder)
+                );
+
+            } else { // if we found a file only
+
+                // do nothing here, because we only found a file
             }
         }
     }

src/AppserverIo/Appserver/Meta/Composer/Script/Setup.php

@@ -182,7 +182,7 @@ public static function prepareProperties($os, array $contextProperties)
         Setup::$mergedProperties[SetupKeys::OS_IDENTIFIER] = sprintf(
             '%s_%s_%s',
             str_replace(' ', '-', strtolower(Setup::$mergedProperties[SetupKeys::RELEASE_NAME])),
-            Setup::$mergedProperties[SetupKeys::OS_FAMILY],
+            $os,
             Setup::$mergedProperties[SetupKeys::OS_ARCHITECTURE]
         );