Merge pull request #1061 from wagnert/master

Update CHANGELOG.md + ROADMAP.md and set appserver-io + appserver-io-…

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 1.1.4
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Set appserver-io + appserver-io-psr dependencies to patch level
+
 # Version 1.1.4-beta12
 
 ## Bugfixes

ROADMAP.md

@@ -4,13 +4,10 @@ As we're in heavy development it may be, that we've to move some tasks from the
 be aware of that. If you've got ideas or features that definitely have to be in one of the next releases, please contact us. We're 
 always open for new ideas or feedback.
 
-And yes, we have plans for a Community and an Enterprise edition. The Community Edition will provide all functionality needed to develop, 
-run and maintain all kind of web applications. The Enterprise Edition will focus on large software solutions that run on many servers and 
-need advanced features like cluster functionality.
+This is a rough roadmap that gives a good overview what is still available and what will come. For more detailed information about
+implemented features have a look in the CHANGELOG.md or visit our [github](https://github.com/appserver-io) repository.
 
-## Community Edition
-
-### Version 0.5.8 - Application Server + WebSocketServer
+## Version 0.5.8 - Application Server + WebSocketServer
 - [x] Logging with [monolog](https://github.com/Seldaek/monolog>)
 - [x] Generic management API
 - [x] HTTP basic + digest authentication for Servlet Container
@@ -22,13 +19,13 @@ need advanced features like cluster functionality.
 - [x] WebSocket integration
 - [x] Running Magento CE 1.7.x + 1.8.x demo applications
 
-### Version 0.5.9 - Servlet-Engine
+## Version 0.5.9 - Servlet-Engine
 - [x] Windows installer
 - [x] PHAR based deployment
 - [x] SSL Encryption for servlet engine project
 - [x] RPM packages
 
-### Version 0.6.0 - [WebServer](https://github.com/techdivision/TechDivision_WebServer)
+## Version 0.6.0 - [WebServer](https://github.com/appserver.io/webserver)
 - [x] Webserver functionality to handle static content
 - [x] Rewrite functionality for Webserver project
 - [x] Authentication functionality for Webserver project
@@ -43,81 +40,36 @@ need advanced features like cluster functionality.
 - [x] Running TYPO3 6.x demo application over FastCGI
 - [x] Running all type of PHP applications over FastCGI
 
-### Version 0.7 - Application Server
-- [x] Integration of [TechDivision_Server](https://github.com/techdivision/TechDivision_Server) as single point of entry
+## Version 0.7 - Application Server
+- [x] Integration of [server](https://github.com/appserver-io/server) as single point of entry
 
-### Version 0.8 - Persistence-Container
+## Version 0.8 - Persistence-Container
 - [x] Application based context [Issue #178](https://github.com/appserver-io/appserver/issues/178)
 - [x] [Design by Contract](https://github.com/wick-ed/php-by-contract) default integration
 - [x] Stateful, Stateless + Singleton session bean functionality
 - [x] Message bean functionality
 
-### Version 0.9 - Persistence-Container
+## Version 0.9 - Persistence-Container
 - [x] Timer Service [Issue #185](https://github.com/appserver-io/appserver/issues/185)
 
-### Version 1.0 - Persistence-Container + Servlet-Engine
+## Version 1.0.x - Persistence-Container + Servlet-Engine
 - [x] AOP on all methods in Stateful, Stateless + Singleton Session Beans, Message Beans and Servlets [Issue #3](https://github.com/appserver-io/appserver/issues/3)
 - [x] DI for Stateful, Stateless + Singleton Session Beans, Message Beans and Servlets [Issue #4](https://github.com/appserver-io/appserver/issues/4)
-- [ ] Documentation + Tutorials
-- [ ] 100 % Coverage for PHPUnit test suite for appserver project
-
-### Version 1.1
-
-- [ ] Separate configuration files for server, container and application [Issue #192](https://github.com/appserver-io/appserver/issues/192)
+- [x] Separate configuration files for server, container and application [Issue #192](https://github.com/appserver-io/appserver/issues/192)
+- [x] Documentation + Tutorials
+
+## Version 1.1.x
+- [x] PHP 5.6
+- [x] DNS server
+- [x] Webserver auto index module
+- [x] Allow usage of variables in configuration files
+- [x] Seamless doctrine integration 
+- [x] Optimise naming directory for performance
+- [x] Authentication- and Authorization services
+- [ ] Extend Dependency Injection to support simple beans
+
+## Version 1.2.x
+- [ ] PHP 7
+- [ ] HTTP 2
 - [ ] Expose Stateless Session Beans as SOAP Web Service endpoint
-- [ ] Container-Managed Transactions
-- [ ] RPM repository, http://rpm.appserver.io
-
-## Enterprise Edition
-
-Yes, we're thinking about an Enterprise Edition of the PHP application server. Actually we only have identified some features we think
-that they are part of this edition. We're working on a more specific definition of that features and try to priorize them based on the
-communities needs. So, if you've an idea or there is something on your mind for a long time, you think it should be part of an PHP 
-application server, we'll be happy to hear from you. If possible we'll add it on our list, and hopefully, someday your wish come true.
-
-Beside this, we promise, that Community and Enterprise will be the same codebase and developement for the Community code will always be 
-public and maintained with the same enthusiasm as the Enterprise will.
-
-### Requested Features
-
-Below we've defined a list with features we plan to integrate in the EE. Before development will start, we'll priorize this features by community, partners and customers business value.
-
-#### Cluster
-
-This category defines features that will be part of a cluster functionality. The cluster functionality targets systems with HA needs, e. g. ecommerce systems with really high number of transactions.
-
-* Vertical and horizontal clustering
-* Components can be distributed across cluster nodes
-* Nodes get known each other in same network automatically
-* Webapps running on nodes in same network can be executed across all appserver nodes
-* Farming-Deployment, an application deployed on one node will deployed automatically on all nodes within the cluster
-* Hot-Deployment, deploy an application among the cluster without restarting any of the cluster nodes
-* Graphical User Interface
-
-#### Functional
-
-This category covers functional add-on's that enables developers to implement business logic in faster, more reusable und maintanable way. 
-
-#### Snapshots/Backup
-
-Backup tools.
-
-* Webapps can be synchronized between appserver nodes to be executed locally
-* Snapshot functionality for webapps
-
-#### Servers
-
-Category that provides additional services.
-
-* HA Load-Balancing Server
-* SSH Server
-* DNS Server
-* LDAP Server
-* Search Engine
-* Data-Grid, fast key-value store
-
-#### Security
-
-Security relevant tools and services.
-
-* Web Application Firewall (WAF)
+- [ ] 100 % Coverage for PHPUnit test suite for appserver project

build.default.properties

@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.4-beta10
+release.version = 1.1.4
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

composer.json

@@ -4,7 +4,7 @@
     "homepage": "https://github.com/appserver-io/appserver",
     "license": "OSL-3.0",
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0 < 7.0.0",
         "rhumsaa/uuid": "~2.4",
         "react/dns": "0.4.4",
         "react/socket": "0.4.*",
@@ -13,35 +13,35 @@
         "league/event": "2.1.*",
         "crunch/fastcgi" : "2.x-dev",
         "zendframework/zend-diactoros" : "~1.0",
-        "appserver-io-psr/di": "~2.0",
-        "appserver-io-psr/epb": "~3.0",
-        "appserver-io-psr/pms": "~1.0",
-        "appserver-io-psr/mop": "~1.0",
-        "appserver-io-psr/auth": "~2.0",
-        "appserver-io-psr/naming": "~1.0",
-        "appserver-io-psr/servlet": "~3.0",
-        "appserver-io-psr/deployment": "~1.0",
-        "appserver-io-psr/application": "~1.0",
-        "appserver-io-psr/security": "~1.0",
-        "appserver-io/rmi": "~3.0",
-        "appserver-io/http": "~2.0",
-        "appserver-io/lang": "~1.0",
-        "appserver-io/logger": "~1.0",
+        "appserver-io-psr/di": "2.0.*",
+        "appserver-io-psr/epb": "3.0.*",
+        "appserver-io-psr/pms": "1.0.*",
+        "appserver-io-psr/mop": "1.1.*",
+        "appserver-io-psr/auth": "2.0.*",
+        "appserver-io-psr/naming": "1.0.*",
+        "appserver-io-psr/servlet": "3.1.*",
+        "appserver-io-psr/deployment": "1.1.*",
+        "appserver-io-psr/application": "1.3.*",
+        "appserver-io-psr/security": "1.4.*",
+        "appserver-io/rmi": "3.1.*",
+        "appserver-io/http": "2.2.*",
+        "appserver-io/lang": "1.0.*",
+        "appserver-io/logger": "1.0.*",
         "appserver-io/routlt": "2.2.0-beta3",
-        "appserver-io/storage": "~2.0",
-        "appserver-io/messaging": "~2.0",
-        "appserver-io/microcron": "~1.0",
-        "appserver-io/webserver": "~5.0",
-        "appserver-io/dnsserver": "~2.0",
-        "appserver-io/single-app": "~3.0",
-        "appserver-io/properties": "~2.0",
+        "appserver-io/storage": "2.0.*",
+        "appserver-io/messaging": "2.0.*",
+        "appserver-io/microcron": "1.0.*",
+        "appserver-io/webserver": "5.1.*",
+        "appserver-io/dnsserver": "2.0.*",
+        "appserver-io/single-app": "3.0.*",
+        "appserver-io/properties": "2.0.*",
         "appserver-io/concurrency": "0.3.*",
-        "appserver-io/robo-tasks": "~0.1",
-        "appserver-io/description": "~7.0",
-        "appserver-io/authenticator": "~1.0",
-        "appserver-io/configuration": "~2.0",
-        "appserver-io/doppelgaenger": "~1.0",
-        "appserver-io/routlt-project": "~1.0"
+        "appserver-io/robo-tasks": "0.2.*",
+        "appserver-io/description": "7.0.*",
+        "appserver-io/authenticator": "1.0.*",
+        "appserver-io/configuration": "2.0.*",
+        "appserver-io/doppelgaenger": "1.5.*",
+        "appserver-io/routlt-project": "1.2.*"
     },
     "require-dev": {
         "mikey179/vfsStream": "1.*",