Add support for jetty-maven-plugin

emilykok · Jul 5, 2014 · c7c0e28 · c7c0e28
1 parent b958d1e
commit c7c0e28
Show file tree

Hide file tree

Showing 19 changed files with 810 additions and 578 deletions.
diff --git a/README.md b/README.md
@@ -84,6 +84,15 @@ IntelliJ
 Command-line interface
 ======================
 
+Initial:
+
 - git clone https://github.com/ibissource/iaf
-- cd iaf/core
+- cd iaf
 - mvn
+- cd example
+- mvn jetty:run
+
+After modifying a project file:
+
+- ctrl-c
+- cd .. ; mvn clean install ; cd example ; mvn jetty:run
diff --git a/RELEASES.md b/RELEASES.md
@@ -12,21 +12,23 @@ Upcoming
 [Commits](https://github.com/ibissource/iaf/compare/v5.5...HEAD)
 [![Build Status](https://travis-ci.org/ibissource/iaf.png)](https://travis-ci.org/ibissource/iaf)
 
-- ...
+- Add support for jetty-maven-plugin
 
 
 
 5.6
 ---
 
-[Commits](https://github.com/ibissource/iaf/compare/v5_5...v5_6)
+[Commits](https://github.com/ibissource/iaf/compare/v5.5...v5.6)
 [![Build Status](https://travis-ci.org/ibissource/iaf.png?branch=v5.6)](https://travis-ci.org/ibissource/iaf)
 
 - Move missing errorStorage warning from MessageKeeper (at adapter level) and logfile to ConfigurationWarnings (top of console main page).
 - Replace (broken) enforceMQCompliancy on JmsSender with MQSender.
 - Remove FXF 1 and 2 support.
+- Fix Ibis name and DTAP stage in Bootstrap theme.
 - Add theme switch button.
 - Add stream support to FilePipe and FileSender.
+- Add permission rules to FileViewerServlet.
 - Added the possibility for enabling LDAP authentication and authorization without a deployment descriptor
 - Added functionality for unit testing (TestTool)
 - Added some MS SQL support
@@ -45,7 +47,7 @@ Upcoming
 5.5
 ---
 
-[Commits](https://github.com/ibissource/iaf/compare/v5_4...v5_5)
+[Commits](https://github.com/ibissource/iaf/compare/v5.4...v5.5)
 [![Build Status](https://travis-ci.org/ibissource/iaf.png?branch=v5.5)](https://travis-ci.org/ibissource/iaf)
 
 - Also when not transacted don't retrow exception caught in JMS listener (caused connection to be closed and caused possible other threads on the same listener to experience "javax.jms.IllegalStateException: Consumer closed").